Merge.

browser/components/privatebrowsing/src/nsPrivateBrowsingService.js

@@ -40,16 +40,29 @@ Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
 ////////////////////////////////////////////////////////////////////////////////
 //// Utilities
 
-String.prototype.endsWith = function endsWith(aString)
+/**
+ * Returns true if the string passed in is part of the root domain of the
+ * current string.  For example, if this is "www.mozilla.org", and we pass in
+ * "mozilla.org", this will return true.  It would return false the other way
+ * around.
+ */
+String.prototype.hasRootDomain = function hasRootDomain(aDomain)
 {
-  let index = this.indexOf(aString);
-  // If it is not found, we know it doesn't end with it.
+  let index = this.indexOf(aDomain);
+  // If aDomain is not found, we know we do not have it as a root domain.
   if (index == -1)
     return false;
 
-  // Otherwise, we end with the given string iff the index is aString.length
-  // subtracted from our length.
-  return index == (this.length - aString.length);
+  // If the strings are the same, we obviously have a match.
+  if (this == aDomain)
+    return true;
+
+  // Otherwise, we have aDomain as our root domain iff the index of aDomain is
+  // aDomain.length subtracted from our length and (since we do not have an
+  // exact match) the character before the index is a dot or slash.
+  let prevChar = this[index - 1];
+  return (index == (this.length - aDomain.length)) &&
+         (prevChar == "." || prevChar == "/");
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -328,7 +341,7 @@ PrivateBrowsingService.prototype = {
       let enumerator = cm.enumerator;
       while (enumerator.hasMoreElements()) {
         let cookie = enumerator.getNext().QueryInterface(Ci.nsICookie);
-        if (cookie.host.endsWith(aDomain))
+        if (cookie.host.hasRootDomain(aDomain))
           cm.remove(cookie.host, cookie.name, cookie.path, false);
       }
     }
@@ -340,7 +353,7 @@ PrivateBrowsingService.prototype = {
       let enumerator = dm.activeDownloads;
       while (enumerator.hasMoreElements()) {
         let dl = enumerator.getNext().QueryInterface(Ci.nsIDownload);
-        if (dl.source.host.endsWith(aDomain)) {
+        if (dl.source.host.hasRootDomain(aDomain)) {
           dm.cancelDownload(dl.id);
           dm.removeDownload(dl.id);
         }
@@ -382,7 +395,7 @@ PrivateBrowsingService.prototype = {
       try {
         let logins = lm.getAllLogins({});
         for (let i = 0; i < logins.length; i++)
-          if (logins[i].hostname.endsWith(aDomain))
+          if (logins[i].hostname.hasRootDomain(aDomain))
             lm.removeLogin(logins[i]);
       }
       // XXXehsan: is there a better way to do this rather than this
@@ -392,7 +405,7 @@ PrivateBrowsingService.prototype = {
       // Clear any "do not save for this site" for this domain
       let disabledHosts = lm.getAllDisabledHosts({});
       for (let i = 0; i < disabledHosts.length; i++)
-        if (disabledHosts[i].endsWith(aDomain))
+        if (disabledHosts[i].hasRootDomain(aDomain))
           lm.setLoginSavingEnabled(disabledHosts, true);
     }
 
@@ -403,7 +416,7 @@ PrivateBrowsingService.prototype = {
       let enumerator = pm.enumerator;
       while (enumerator.hasMoreElements()) {
         let perm = enumerator.getNext().QueryInterface(Ci.nsIPermission);
-        if (perm.host.endsWith(aDomain))
+        if (perm.host.hasRootDomain(aDomain))
           pm.remove(perm.host, perm.type);
       }
     }
@@ -423,7 +436,8 @@ PrivateBrowsingService.prototype = {
       stmt.bindStringParameter(0, "%" + pattern);
       try {
         while (stmt.executeStep())
-          names.push(stmt.getString(0));
+          if (stmt.getString(0).hasRootDomain(aDomain))
+            names.push(stmt.getString(0));
       }
       finally {
         stmt.finalize();

browser/components/privatebrowsing/test/unit/head_privatebrowsing.js

@@ -45,9 +45,66 @@ const kPrivateBrowsingCancelVoteNotification = "private-browsing-cancel-vote";
 const kEnter = "enter";
 const kExit = "exit";
 
+const NS_APP_USER_PROFILE_50_DIR = "ProfD";
+const NS_APP_HISTORY_50_FILE = "UHist";
+
 function LOG(aMsg) {
   aMsg = ("*** PRIVATEBROWSING TESTS: " + aMsg);
   Cc["@mozilla.org/consoleservice;1"].getService(Ci.nsIConsoleService).
                                       logStringMessage(aMsg);
   print(aMsg);
 }
+
+// If there's no location registered for the profile direcotry, register one now.
+var dirSvc = Cc["@mozilla.org/file/directory_service;1"].getService(Ci.nsIProperties);
+var profileDir = null;
+try {
+  profileDir = dirSvc.get(NS_APP_USER_PROFILE_50_DIR, Ci.nsIFile);
+} catch (e) {}
+if (!profileDir) {
+  // Register our own provider for the profile directory.
+  // It will simply return the current directory.
+  var provider = {
+    getFile: function(prop, persistent) {
+      persistent.value = true;
+      if (prop == NS_APP_USER_PROFILE_50_DIR) {
+        return dirSvc.get("CurProcD", Ci.nsIFile);
+      }
+      if (prop == NS_APP_HISTORY_50_FILE) {
+        var histFile = dirSvc.get("CurProcD", Ci.nsIFile);
+        histFile.append("history.dat");
+        return histFile;
+      }
+      throw Cr.NS_ERROR_FAILURE;
+    },
+    QueryInterface: function(iid) {
+      if (iid.equals(Ci.nsIDirectoryServiceProvider) ||
+          iid.equals(Ci.nsISupports)) {
+        return this;
+      }
+      throw Cr.NS_ERROR_NO_INTERFACE;
+    }
+  };
+  dirSvc.QueryInterface(Ci.nsIDirectoryService).registerProvider(provider);
+}
+
+/**
+ * Removes any files that could make our tests fail.
+ */
+function cleanUp()
+{
+  let files = [
+    "downloads.sqlite",
+    "places.sqlite",
+    "cookies.sqlite",
+    "signons.sqlite",
+  ];
+
+  for (let i = 0; i < files.length; i++) {
+    let file = dirSvc.get("ProfD", Ci.nsIFile);
+    file.append(files[i]);
+    if (file.exists())
+      file.remove(false);
+  }
+}
+cleanUp();

browser/components/privatebrowsing/test/unit/test_removeDataFromDomain.js

@@ -0,0 +1,618 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: sw=2 ts=2 sts=2
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Private Browsing Tests.
+ *
+ * The Initial Developer of the Original Code is
+ * Mozilla Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 2008
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Shawn Wilsher <me@shawnwilsher.com> (Original Author)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either of the GNU General Public License Version 2 or later (the "GPL"),
+ * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+/**
+ * Test added with bug 460086 to test the behavior of the new API that was added
+ * to remove all traces of visiting a site.
+ */
+
+////////////////////////////////////////////////////////////////////////////////
+//// Constants
+
+let pb = Cc["@mozilla.org/privatebrowsing;1"].
+         getService(Ci.nsIPrivateBrowsingService);
+
+const COOKIE_EXPIRY = Math.round(Date.now() / 1000) + 60;
+const COOKIE_NAME = "testcookie";
+const COOKIE_PATH = "/";
+
+const LOGIN_USERNAME = "username";
+const LOGIN_PASSWORD = "password";
+const LOGIN_USERNAME_FIELD = "username_field";
+const LOGIN_PASSWORD_FIELD = "password_field";
+
+const PERMISSION_TYPE = "test-perm";
+const PERMISSION_VALUE = Ci.nsIPermissionManager.ALLOW_ACTION;
+
+const PREFERENCE_NAME = "test-pref";
+
+////////////////////////////////////////////////////////////////////////////////
+//// Utility Functions
+
+/**
+ * Creates an nsIURI object for the given string representation of a URI.
+ *
+ * @param aURIString
+ *        The spec of the URI to create.
+ * @returns an nsIURI representing aURIString.
+ */
+function uri(aURIString)
+{
+  return Cc["@mozilla.org/network/io-service;1"].
+         getService(Ci.nsIIOService).
+         newURI(aURIString, null, null);
+}
+
+/**
+ * Adds a visit to history.
+ *
+ * @param aURI
+ *        The URI to add.
+ */
+function add_visit(aURI)
+{
+  check_visited(aURI, false);
+  let bh = Cc["@mozilla.org/browser/global-history;2"].
+           getService(Ci.nsIBrowserHistory);
+  bh.addPageWithDetails(aURI, aURI.spec, Date.now() * 1000);
+  check_visited(aURI, true);
+}
+
+/**
+ * Checks to ensure a URI string is visited or not.
+ *
+ * @param aURI
+ *        The URI to check.
+ * @param aIsVisited
+ *        True if the URI should be visited, false otherwise.
+ */
+function check_visited(aURI, aIsVisited)
+{
+  let gh = Cc["@mozilla.org/browser/global-history;2"].
+           getService(Ci.nsIGlobalHistory2);
+  let checker = aIsVisited ? do_check_true : do_check_false;
+  checker(gh.isVisited(aURI));
+}
+
+/**
+ * Add a cookie to the cookie service.
+ *
+ * @param aDomain
+ */
+function add_cookie(aDomain)
+{
+  check_cookie_exists(aDomain, false);
+  let cm = Cc["@mozilla.org/cookiemanager;1"].getService(Ci.nsICookieManager2);
+  cm.add(aDomain, COOKIE_PATH, COOKIE_NAME, "", false, false, false,
+         COOKIE_EXPIRY);
+  check_cookie_exists(aDomain, true);
+}
+
+/**
+ * Checks to ensure that a cookie exists or not for a domain.
+ *
+ * @param aDomain
+ *        The domain to check for the cookie.
+ * @param aExists
+ *        True if the cookie should exist, false otherwise.
+ */
+function check_cookie_exists(aDomain, aExists)
+{
+  let cm = Cc["@mozilla.org/cookiemanager;1"].getService(Ci.nsICookieManager2);
+  let cookie = {
+    host: aDomain,
+    name: COOKIE_NAME,
+    path: COOKIE_PATH
+  }
+  let checker = aExists ? do_check_true : do_check_false;
+  checker(cm.cookieExists(cookie));
+}
+
+/**
+ * Adds a download to download history.
+ *
+ * @param aURIString
+ *        The string of the URI to add.
+ * @param aIsActive
+ *        If it should be set to an active state in the database.  This does not
+ *        make it show up in the list of active downloads however!
+ */
+function add_download(aURIString, aIsActive)
+{
+  check_downloaded(aURIString, false);
+  let db = Cc["@mozilla.org/download-manager;1"].
+           getService(Ci.nsIDownloadManager).
+           DBConnection;
+  let stmt = db.createStatement(
+    "INSERT INTO moz_downloads (source, state) " +
+    "VALUES (:source, :state)"
+  );
+  stmt.params.source = aURIString;
+  stmt.params.state = aIsActive ? Ci.nsIDownloadManager.DOWNLOAD_DOWNLOADING :
+                                  Ci.nsIDownloadManager.DOWNLOAD_FINISHED;
+  try {
+    stmt.execute();
+  }
+  finally {
+    stmt.finalize();
+  }
+  check_downloaded(aURIString, true);
+}
+
+/**
+ * Checks to ensure a URI string is in download history or not.
+ *
+ * @param aURIString
+ *        The string of the URI to check.
+ * @param aIsDownloaded
+ *        True if the URI should be downloaded, false otherwise.
+ */
+function check_downloaded(aURIString, aIsDownloaded)
+{
+  let db = Cc["@mozilla.org/download-manager;1"].
+           getService(Ci.nsIDownloadManager).
+           DBConnection;
+  let stmt = db.createStatement(
+    "SELECT * " +
+    "FROM moz_downloads " +
+    "WHERE source = :source"
+  );
+  stmt.params.source = aURIString;
+
+  let checker = aIsDownloaded ? do_check_true : do_check_false;
+  try {
+    checker(stmt.step());
+  }
+  finally {
+    stmt.finalize();
+  }
+}
+
+/**
+ * Adds a disabled host to the login manager.
+ *
+ * @param aHost
+ *        The host to add to the list of disabled hosts.
+ */
+function add_disabled_host(aHost)
+{
+  check_disabled_host(aHost, false);
+  let lm = Cc["@mozilla.org/login-manager;1"].
+           getService(Ci.nsILoginManager);
+  lm.setLoginSavingEnabled(aHost, false);
+  check_disabled_host(aHost, true);
+}
+
+/**
+ * Checks to see if a host is disabled for storing logins or not.
+ *
+ * @param aHost
+ *        The host to check if it is disabled.
+ * @param aIsDisabled
+ *        True if the host should be disabled, false otherwise.
+ */
+function check_disabled_host(aHost, aIsDisabled)
+{
+  let lm = Cc["@mozilla.org/login-manager;1"].
+           getService(Ci.nsILoginManager);
+  let checker = aIsDisabled ? do_check_false : do_check_true;
+  checker(lm.getLoginSavingEnabled(aHost));
+}
+
+/**
+ * Adds a login for the specified host to the login manager.
+ *
+ * @param aHost
+ *        The host to add the login for.
+ */
+function add_login(aHost)
+{
+  check_login_exists(aHost, false);
+  let login = Cc["@mozilla.org/login-manager/loginInfo;1"].
+              createInstance(Ci.nsILoginInfo);
+  login.init(aHost, "", null, LOGIN_USERNAME, LOGIN_PASSWORD,
+             LOGIN_USERNAME_FIELD, LOGIN_PASSWORD_FIELD);
+  let lm = Cc["@mozilla.org/login-manager;1"].
+           getService(Ci.nsILoginManager);
+  lm.addLogin(login);
+  check_login_exists(aHost, true);
+}
+
+/**
+ * Checks to see if a login exists for a host.
+ *
+ * @param aHost
+ *        The host to check for the test login.
+ * @param aExists
+ *        True if the login should exist, false otherwise.
+ */
+function check_login_exists(aHost, aExists)
+{
+  let lm = Cc["@mozilla.org/login-manager;1"].
+           getService(Ci.nsILoginManager);
+  let count = { value: 0 };
+  lm.findLogins(count, aHost, "", null);
+  do_check_eq(count.value, aExists ? 1 : 0);
+}
+
+/**
+ * Adds a permission for the specified URI to the permission manager.
+ *
+ * @param aURI
+ *        The URI to add the test permission for.
+ */
+function add_permission(aURI)
+{
+  check_permission_exists(aURI, false);
+  let pm = Cc["@mozilla.org/permissionmanager;1"].
+           getService(Ci.nsIPermissionManager);
+  pm.add(aURI, PERMISSION_TYPE, PERMISSION_VALUE);
+  check_permission_exists(aURI, true);
+}
+
+/**
+ * Checks to see if a permission exists for the given URI.
+ *
+ * @param aURI
+ *        The URI to check if a permission exists.
+ * @param aExists
+ *        True if the permission should exist, false otherwise.
+ */
+function check_permission_exists(aURI, aExists)
+{
+  let pm = Cc["@mozilla.org/permissionmanager;1"].
+           getService(Ci.nsIPermissionManager);
+  let perm = pm.testExactPermission(aURI, PERMISSION_TYPE);
+  let checker = aExists ? do_check_eq : do_check_neq;
+  checker(perm, PERMISSION_VALUE);
+}
+
+/**
+ * Adds a content preference for the specified URI.
+ *
+ * @param aURI
+ *        The URI to add a preference for.
+ */
+function add_preference(aURI)
+{
+  check_preference_exists(aURI, false);
+  let cp = Cc["@mozilla.org/content-pref/service;1"].
+           getService(Ci.nsIContentPrefService);
+  cp.setPref(aURI, PREFERENCE_NAME, "foo");
+  check_preference_exists(aURI, true);
+}
+
+/**
+ * Checks to see if a preference exists for the given URI.
+ *
+ * @param aURI
+ *        The URI to check if a preference exists.
+ * @param aExists
+ *        True if the permission should exist, false otherwise.
+ */
+function check_preference_exists(aURI, aExists)
+{
+  let cp = Cc["@mozilla.org/content-pref/service;1"].
+           getService(Ci.nsIContentPrefService);
+  let checker = aExists ? do_check_true : do_check_false;
+  checker(cp.hasPref(aURI, PREFERENCE_NAME));
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//// Test Functions
+
+// History
+function test_history_cleared_with_direct_match()
+{
+  const TEST_URI = uri("http://mozilla.org/foo");
+  add_visit(TEST_URI);
+  pb.removeDataFromDomain("mozilla.org");
+  check_visited(TEST_URI, false);
+}
+
+function test_history_cleared_with_subdomain()
+{
+  const TEST_URI = uri("http://www.mozilla.org/foo");
+  add_visit(TEST_URI);
+  pb.removeDataFromDomain("mozilla.org");
+  check_visited(TEST_URI, false);
+}
+
+function test_history_not_cleared_with_uri_contains_domain()
+{
+  const TEST_URI = uri("http://ilovemozilla.org/foo");
+  add_visit(TEST_URI);
+  pb.removeDataFromDomain("mozilla.org");
+  check_visited(TEST_URI, true);
+
+  // Clear history since we left something there from this test.
+  let bh = Cc["@mozilla.org/browser/global-history;2"].
+           getService(Ci.nsIBrowserHistory);
+  bh.removeAllPages();
+}
+
+// Cookie Service
+function test_cookie_cleared_with_direct_match()
+{
+  const TEST_DOMAIN = "mozilla.org";
+  add_cookie(TEST_DOMAIN);
+  pb.removeDataFromDomain("mozilla.org");
+  check_cookie_exists(TEST_DOMAIN, false);
+}
+
+function test_cookie_cleared_with_subdomain()
+{
+  const TEST_DOMAIN = "www.mozilla.org";
+  add_cookie(TEST_DOMAIN);
+  pb.removeDataFromDomain("mozilla.org");
+  check_cookie_exists(TEST_DOMAIN, false);
+}
+
+function test_cookie_not_cleared_with_uri_contains_domain()
+{
+  const TEST_DOMAIN = "ilovemozilla.org";
+  add_cookie(TEST_DOMAIN);
+  pb.removeDataFromDomain("mozilla.org");
+  check_cookie_exists(TEST_DOMAIN, true);
+}
+
+// Download Manager
+function test_download_history_cleared_with_direct_match()
+{
+  const TEST_URI = "http://mozilla.org/foo";
+  add_download(TEST_URI, false);
+  pb.removeDataFromDomain("mozilla.org");
+  check_downloaded(TEST_URI, false);
+}
+
+function test_download_history_cleared_with_subdomain()
+{
+  const TEST_URI = "http://www.mozilla.org/foo";
+  add_download(TEST_URI, false);
+  pb.removeDataFromDomain("mozilla.org");
+  check_downloaded(TEST_URI, false);
+}
+
+function test_download_history_not_cleared_with_active_direct_match()
+{
+  // Tests that downloads marked as active in the db are not deleted from the db
+  const TEST_URI = "http://mozilla.org/foo";
+  add_download(TEST_URI, true);
+  pb.removeDataFromDomain("mozilla.org");
+  check_downloaded(TEST_URI, true);
+
+  // Reset state
+  let db = Cc["@mozilla.org/download-manager;1"].
+           getService(Ci.nsIDownloadManager).
+           DBConnection;
+  db.executeSimpleSQL("DELETE FROM moz_downloads");
+  check_downloaded(TEST_URI, false);
+}
+
+// Login Manager
+function test_login_manager_disabled_hosts_cleared_with_direct_match()
+{
+  const TEST_HOST = "http://mozilla.org";
+  add_disabled_host(TEST_HOST);
+  pb.removeDataFromDomain("mozilla.org");
+  check_disabled_host(TEST_HOST, false);
+}
+
+function test_login_manager_disabled_hosts_cleared_with_subdomain()
+{
+  const TEST_HOST = "http://www.mozilla.org";
+  add_disabled_host(TEST_HOST);
+  pb.removeDataFromDomain("mozilla.org");
+  check_disabled_host(TEST_HOST, false);
+}
+
+function test_login_manager_disabled_hosts_not_cleared_with_uri_contains_domain()
+{
+  const TEST_HOST = "http://ilovemozilla.org";
+  add_disabled_host(TEST_HOST);
+  pb.removeDataFromDomain("mozilla.org");
+  check_disabled_host(TEST_HOST, true);
+
+  // Reset state
+  let lm = Cc["@mozilla.org/login-manager;1"].
+           getService(Ci.nsILoginManager);
+  lm.setLoginSavingEnabled(TEST_HOST, true);
+  check_disabled_host(TEST_HOST, false);
+}
+
+function test_login_manager_logins_cleared_with_direct_match()
+{
+  const TEST_HOST = "http://mozilla.org";
+  add_login(TEST_HOST);
+  pb.removeDataFromDomain("mozilla.org");
+  check_login_exists(TEST_HOST, false);
+}
+
+function test_login_manager_logins_cleared_with_subdomain()
+{
+  const TEST_HOST = "http://www.mozilla.org";
+  add_login(TEST_HOST);
+  pb.removeDataFromDomain("mozilla.org");
+  check_login_exists(TEST_HOST, false);
+}
+
+function tets_login_manager_logins_not_cleared_with_uri_contains_domain()
+{
+  const TEST_HOST = "http://ilovemozilla.org";
+  add_login(TEST_HOST);
+  pb.removeDataFromDomain("mozilla.org");
+  check_login_exists(TEST_HOST, true);
+
+  let lm = Cc["@mozilla.org/login-manager;1"].
+           getService(Ci.nsILoginManager);
+  lm.removeAllLogins();
+  check_login_exists(TEST_HOST, false);
+}
+
+// Permission Manager
+function test_permission_manager_cleared_with_direct_match()
+{
+  const TEST_URI = uri("http://mozilla.org");
+  add_permission(TEST_URI);
+  pb.removeDataFromDomain("mozilla.org");
+  check_permission_exists(TEST_URI, false);
+}
+
+function test_permission_manager_cleared_with_subdomain()
+{
+  const TEST_URI = uri("http://www.mozilla.org");
+  add_permission(TEST_URI);
+  pb.removeDataFromDomain("mozilla.org");
+  check_permission_exists(TEST_URI, false);
+}
+
+function test_permission_manager_not_cleared_with_uri_contains_domain()
+{
+  const TEST_URI = uri("http://ilovemozilla.org");
+  add_permission(TEST_URI);
+  pb.removeDataFromDomain("mozilla.org");
+  check_permission_exists(TEST_URI, true);
+
+  // Reset state
+  let pm = Cc["@mozilla.org/permissionmanager;1"].
+           getService(Ci.nsIPermissionManager);
+  pm.removeAll();
+  check_permission_exists(TEST_URI, false);
+}
+
+// Content Preferences
+function test_content_preferences_cleared_with_direct_match()
+{
+  const TEST_URI = uri("http://mozilla.org");
+  add_preference(TEST_URI);
+  pb.removeDataFromDomain("mozilla.org");
+  check_preference_exists(TEST_URI, false);
+}
+
+function test_content_preferences_cleared_with_subdomain()
+{
+  const TEST_URI = uri("http://www.mozilla.org");
+  add_preference(TEST_URI);
+  pb.removeDataFromDomain("mozilla.org");
+  check_preference_exists(TEST_URI, false);
+}
+
+function test_content_preferecnes_not_cleared_with_uri_contains_domain()
+{
+  const TEST_URI = uri("http://ilovemozilla.org");
+  add_preference(TEST_URI);
+  pb.removeDataFromDomain("mozilla.org");
+  check_preference_exists(TEST_URI, true);
+
+  // Reset state
+  let cp = Cc["@mozilla.org/content-pref/service;1"].
+           getService(Ci.nsIContentPrefService);
+  cp.removePref(TEST_URI, PREFERENCE_NAME);
+  check_preference_exists(TEST_URI, false);
+}
+
+// Cache
+function test_cache_cleared()
+{
+  // Because this test is asynchronous, it should be the last test
+  do_check_eq(tests[tests.length - 1], arguments.callee);
+
+  // NOTE: We could be more extensive with this test and actually add an entry
+  //       to the cache, and then make sure it is gone.  However, we trust that
+  //       the API is well tested, and that when we get the observer
+  //       notification, we have actually cleared the cache.
+  // This seems to happen asynchronously...
+  let os = Cc["@mozilla.org/observer-service;1"].
+           getService(Ci.nsIObserverService);
+  let observer = {
+    observe: function(aSubject, aTopic, aData)
+    {
+      os.removeObserver(observer, "cacheservice:empty-cache");
+      do_test_finished();
+    }
+  };
+  os.addObserver(observer, "cacheservice:empty-cache", false);
+  pb.removeDataFromDomain("mozilla.org");
+  do_test_pending();
+}
+
+let tests = [
+  // History
+  test_history_cleared_with_direct_match,
+  test_history_cleared_with_subdomain,
+  test_history_not_cleared_with_uri_contains_domain,
+
+  // Cookie Service
+  test_cookie_cleared_with_direct_match,
+  test_cookie_cleared_with_subdomain,
+  test_cookie_not_cleared_with_uri_contains_domain,
+
+  // Download Manager
+  // Note: active downloads tested in test_removeDataFromDomain_activeDownloads.js
+  test_download_history_cleared_with_direct_match,
+  test_download_history_cleared_with_subdomain,
+  test_download_history_not_cleared_with_active_direct_match,
+
+  // Login Manager
+  test_login_manager_disabled_hosts_cleared_with_direct_match,
+  test_login_manager_disabled_hosts_cleared_with_subdomain,
+  test_login_manager_disabled_hosts_not_cleared_with_uri_contains_domain,
+  test_login_manager_logins_cleared_with_direct_match,
+  test_login_manager_logins_cleared_with_subdomain,
+  tets_login_manager_logins_not_cleared_with_uri_contains_domain,
+
+  // Permission Manager
+  test_permission_manager_cleared_with_direct_match,
+  test_permission_manager_cleared_with_subdomain,
+  test_permission_manager_not_cleared_with_uri_contains_domain,
+
+  // Content Preferences
+  test_content_preferences_cleared_with_direct_match,
+  test_content_preferences_cleared_with_subdomain,
+  test_content_preferecnes_not_cleared_with_uri_contains_domain,
+
+  // Cache
+  test_cache_cleared,
+];
+
+function run_test()
+{
+  for (let i = 0; i < tests.length; i++)
+    tests[i]();
+}

browser/components/privatebrowsing/test/unit/test_removeDataFromDomain_activeDownloads.js

@@ -0,0 +1,158 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: sw=2 ts=2 sts=2
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Private Browsing Tests.
+ *
+ * The Initial Developer of the Original Code is
+ * Mozilla Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 2008
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Shawn Wilsher <me@shawnwilsher.com> (Original Author)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either of the GNU General Public License Version 2 or later (the "GPL"),
+ * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+/**
+ * Test added with bug 460086 to test the behavior of the new API that was added
+ * to remove all traces of visiting a site.
+ */
+
+////////////////////////////////////////////////////////////////////////////////
+//// Constants
+
+let pb = Cc["@mozilla.org/privatebrowsing;1"].
+         getService(Ci.nsIPrivateBrowsingService);
+
+////////////////////////////////////////////////////////////////////////////////
+//// Utility Functions
+
+/**
+ * Creates an nsIURI object for the given file.
+ *
+ * @param aFile
+ *        The nsIFile of the URI to create.
+ * @returns an nsIURI representing aFile.
+ */
+function uri(aFile)
+{
+  return Cc["@mozilla.org/network/io-service;1"].
+         getService(Ci.nsIIOService).
+         newFileURI(aFile);
+}
+
+/**
+ * Checks to ensure a URI string is in download history or not.
+ *
+ * @param aURIString
+ *        The string of the URI to check.
+ * @param aIsActive
+ *        True if the URI should be actively downloaded, false otherwise.
+ */
+function check_active_download(aURIString, aIsActive)
+{
+  let dm = Cc["@mozilla.org/download-manager;1"].
+           getService(Ci.nsIDownloadManager);
+  let enumerator = dm.activeDownloads;
+  let found = false;
+  while (enumerator.hasMoreElements()) {
+    let dl = enumerator.getNext().QueryInterface(Ci.nsIDownload);
+    if (dl.source.spec == aURIString)
+      found = true;
+  }
+  let checker = aIsActive ? do_check_true : do_check_false;
+  checker(found);
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//// Test Functions
+
+let destFile = dirSvc.get("TmpD", Ci.nsIFile);
+destFile.append("dm-test-file");
+destFile = uri(destFile);
+let data = [
+  { source: "http://mozilla.org/direct_match",
+    target: destFile.spec,
+    removed: true
+  },
+  { source: "http://www.mozilla.org/subdomain",
+    target: destFile.spec,
+    removed: true
+  },
+  { source: "http://ilovemozilla.org/contains_domain",
+    target: destFile.spec,
+    removed: false
+  },
+];
+
+function run_test()
+{
+  // We add this data to the database first, but we cannot instantiate the
+  // download manager service, otherwise these downloads will not be placed in
+  // the active downloads array.
+
+  // Copy the empty downloads database to our profile directory
+  let downloads = do_get_file("toolkit/components/downloads/test/downloads.empty.sqlite");
+  downloads.copyTo(dirSvc.get("ProfD", Ci.nsIFile), "downloads.sqlite");
+
+  // Open the database
+  let ss = Cc["@mozilla.org/storage/service;1"].
+           getService(Ci.mozIStorageService);
+  let file = dirSvc.get("ProfD", Ci.nsIFile);
+  file.append("downloads.sqlite");
+  let db = ss.openDatabase(file);
+
+  // Insert the data
+  let stmt = db.createStatement(
+    "INSERT INTO moz_downloads (source, target, state, autoResume, entityID) " +
+    "VALUES (:source, :target, :state, :autoResume, :entityID)"
+  );
+  for (let i = 0; i < data.length; i++) {
+    stmt.params.source = data[i].source;
+    stmt.params.target = data[i].target;
+    stmt.params.state = Ci.nsIDownloadManager.DOWNLOAD_PAUSED;
+    stmt.params.autoResume = 0; // DONT_RESUME is 0
+    stmt.params.entityID = "foo" // just has to be non-null for our test
+    stmt.execute();
+    stmt.reset();
+  }
+  stmt.finalize();
+  stmt = null;
+  db.close();
+  db = null;
+
+  // Check to make sure it's all there
+  for (let i = 0; i < data.length; i++)
+    check_active_download(data[i].source, true);
+
+  // Dispatch the remove call
+  pb.removeDataFromDomain("mozilla.org");
+
+  // And check our data
+  for (let i = 0; i < data.length; i++)
+    check_active_download(data[i].source, !data[i].removed);
+}

config/rules.mk

@@ -355,6 +355,9 @@ ifdef MOZ_UPDATE_XTERM
 # makes the make -s output easier to read.  Echo -n does not work on all
 # platforms, but we can trick sed into doing it.
 UPDATE_TITLE = sed -e "s!Y!$@ in $(shell $(BUILD_TOOLS)/print-depth-path.sh)/$(dir)!" $(MOZILLA_DIR)/config/xterm.str;
+UPDATE_TITLE_export = sed -e "s!Y!export in $(shell $(BUILD_TOOLS)/print-depth-path.sh)/$*!" $(MOZILLA_DIR)/config/xterm.str;
+UPDATE_TITLE_libs = sed -e "s!Y!libs in $(shell $(BUILD_TOOLS)/print-depth-path.sh)/$*!" $(MOZILLA_DIR)/config/xterm.str;
+UPDATE_TITLE_tools = sed -e "s!Y!tools in $(shell $(BUILD_TOOLS)/print-depth-path.sh)/$*!" $(MOZILLA_DIR)/config/xterm.str;
 endif
 
 LOOP_OVER_DIRS = \
@@ -699,7 +702,7 @@ ifdef PARALLEL_DIRS
 export:: $(PARALLEL_DIRS_export)
 
 $(PARALLEL_DIRS_export): %_export: %/Makefile
-	+$(MAKE) -C $* export
+	+@$(UPDATE_TITLE_export) $(MAKE) -C $* export
 endif
 
 export:: $(SUBMAKEFILES) $(MAKE_DIRS) $(if $(EXPORTS)$(XPIDLSRCS)$(SDK_HEADERS)$(SDK_XPIDLSRCS),$(PUBLIC)) $(if $(SDK_HEADERS)$(SDK_XPIDLSRCS),$(SDK_PUBLIC)) $(if $(XPIDLSRCS),$(IDL_DIR)) $(if $(SDK_XPIDLSRCS),$(SDK_IDL_DIR))
@@ -710,7 +713,7 @@ ifdef PARALLEL_DIRS
 tools:: $(PARALLEL_DIRS_tools)
 
 $(PARALLEL_DIRS_tools): %_tools: %/Makefile
-	+$(MAKE) -C $* tools
+	+@$(UPDATE_TITLE_tools) $(MAKE) -C $* tools
 endif
 
 tools:: $(SUBMAKEFILES) $(MAKE_DIRS)
@@ -749,7 +752,7 @@ ifdef PARALLEL_DIRS
 libs:: $(PARALLEL_DIRS_libs)
 
 $(PARALLEL_DIRS_libs): %_libs: %/Makefile
-	+$(MAKE) -C $* libs
+	+@$(UPDATE_TITLE_libs) $(MAKE) -C $* libs
 endif
 
 libs:: $(SUBMAKEFILES) $(MAKE_DIRS) $(HOST_LIBRARY) $(LIBRARY) $(SHARED_LIBRARY) $(IMPORT_LIBRARY) $(HOST_PROGRAM) $(PROGRAM) $(HOST_SIMPLE_PROGRAMS) $(SIMPLE_PROGRAMS) $(JAVA_LIBRARY)

js/src/config/rules.mk

@@ -355,6 +355,9 @@ ifdef MOZ_UPDATE_XTERM
 # makes the make -s output easier to read.  Echo -n does not work on all
 # platforms, but we can trick sed into doing it.
 UPDATE_TITLE = sed -e "s!Y!$@ in $(shell $(BUILD_TOOLS)/print-depth-path.sh)/$(dir)!" $(MOZILLA_DIR)/config/xterm.str;
+UPDATE_TITLE_export = sed -e "s!Y!export in $(shell $(BUILD_TOOLS)/print-depth-path.sh)/$*!" $(MOZILLA_DIR)/config/xterm.str;
+UPDATE_TITLE_libs = sed -e "s!Y!libs in $(shell $(BUILD_TOOLS)/print-depth-path.sh)/$*!" $(MOZILLA_DIR)/config/xterm.str;
+UPDATE_TITLE_tools = sed -e "s!Y!tools in $(shell $(BUILD_TOOLS)/print-depth-path.sh)/$*!" $(MOZILLA_DIR)/config/xterm.str;
 endif
 
 LOOP_OVER_DIRS = \
@@ -699,7 +702,7 @@ ifdef PARALLEL_DIRS
 export:: $(PARALLEL_DIRS_export)
 
 $(PARALLEL_DIRS_export): %_export: %/Makefile
-	+$(MAKE) -C $* export
+	+@$(UPDATE_TITLE_export) $(MAKE) -C $* export
 endif
 
 export:: $(SUBMAKEFILES) $(MAKE_DIRS) $(if $(EXPORTS)$(XPIDLSRCS)$(SDK_HEADERS)$(SDK_XPIDLSRCS),$(PUBLIC)) $(if $(SDK_HEADERS)$(SDK_XPIDLSRCS),$(SDK_PUBLIC)) $(if $(XPIDLSRCS),$(IDL_DIR)) $(if $(SDK_XPIDLSRCS),$(SDK_IDL_DIR))
@@ -710,7 +713,7 @@ ifdef PARALLEL_DIRS
 tools:: $(PARALLEL_DIRS_tools)
 
 $(PARALLEL_DIRS_tools): %_tools: %/Makefile
-	+$(MAKE) -C $* tools
+	+@$(UPDATE_TITLE_tools) $(MAKE) -C $* tools
 endif
 
 tools:: $(SUBMAKEFILES) $(MAKE_DIRS)
@@ -749,7 +752,7 @@ ifdef PARALLEL_DIRS
 libs:: $(PARALLEL_DIRS_libs)
 
 $(PARALLEL_DIRS_libs): %_libs: %/Makefile
-	+$(MAKE) -C $* libs
+	+@$(UPDATE_TITLE_libs) $(MAKE) -C $* libs
 endif
 
 libs:: $(SUBMAKEFILES) $(MAKE_DIRS) $(HOST_LIBRARY) $(LIBRARY) $(SHARED_LIBRARY) $(IMPORT_LIBRARY) $(HOST_PROGRAM) $(PROGRAM) $(HOST_SIMPLE_PROGRAMS) $(SIMPLE_PROGRAMS) $(JAVA_LIBRARY)

parser/htmlparser/src/nsViewSourceHTML.cpp

@@ -1113,8 +1113,19 @@ void CViewSourceHTML::WriteTextInElement(const nsAString& tagName,
                                          const nsAString& attrName, 
                                          const nsAString& attrValue) {
   // Open the element, supplying the attribute, if any.
-  CStartToken startToken(tagName, tagType);
-  nsCParserStartNode startNode(&startToken, 0/*stack token*/);
+  nsTokenAllocator* theAllocator = mTokenizer->GetTokenAllocator();
+  if (!theAllocator) {
+    return;
+  }
+
+  CStartToken* startToken =
+    static_cast<CStartToken*>
+      (theAllocator->CreateTokenOfType(eToken_start, tagType, tagName));
+  if (!startToken) {
+    return;
+  }
+
+  nsCParserStartNode startNode(startToken, theAllocator);
   if (!attrName.IsEmpty()) {
     AddAttrToNode(startNode, allocator, attrName, attrValue);
   }
@@ -1162,7 +1173,7 @@ void CViewSourceHTML::TrimTokenValue(nsAString::const_iterator& start,
   }
 }
 
-PRBool CViewSourceHTML::IsTokenValueTrimmableCharacter(char ch) {
+PRBool CViewSourceHTML::IsTokenValueTrimmableCharacter(PRUnichar ch) {
   if (ch == ' ') return PR_TRUE;
   if (ch == '\t') return PR_TRUE;
   if (ch == '\r') return PR_TRUE;

parser/htmlparser/src/nsViewSourceHTML.h

@@ -123,7 +123,7 @@ private:
     const nsDependentSubstring TrimTokenValue(const nsAString& tokenValue);
     void TrimTokenValue(nsAString::const_iterator& start, 
                         nsAString::const_iterator& end);
-    PRBool IsTokenValueTrimmableCharacter(char ch);
+    PRBool IsTokenValueTrimmableCharacter(PRUnichar ch);
     nsresult GetBaseURI(nsIURI **result);
     nsresult SetBaseURI(const nsAString& baseSpec);
 

toolkit/mozapps/update/src/nsUpdateService.js.in

@@ -84,6 +84,7 @@ const KEY_UAPPDATA        = "UAppData";
 
 const DIR_UPDATES         = "updates";
 const FILE_UPDATE_STATUS  = "update.status";
+const FILE_UPDATE_VERSION = "update.version";
 const FILE_UPDATE_ARCHIVE = "update.mar";
 const FILE_UPDATE_LOG     = "update.log"
 const FILE_UPDATES_DB     = "updates.xml";
@@ -398,6 +399,28 @@ function writeStatusFile(dir, state) {
   writeStringToFile(statusFile, state);
 }
 
+/**
+#  Writes the update's application version to a file in the patch directory. If
+#  the update doesn't provide application version information via the
+#  extensionVersion attribute the string "null" will be written to the file.
+#  This value is compared during startup (in nsUpdateDriver.cpp) to determine if
+#  the update should be applied. Note that this won't provide protection from
+#  downgrade of the application for the nightly user case where the application
+#  version doesn't change.
+#  @param   dir
+#           The patch directory where the update.version file should be
+#           written.
+#  @param   version
+#           The version value to write. Will be the string "null" when the
+#           update doesn't provide the extensionVersion attribute in the update
+#           xml.
+ */
+function writeVersionFile(dir, version) {
+  var versionFile = dir.clone();
+  versionFile.append(FILE_UPDATE_VERSION);
+  writeStringToFile(versionFile, version);
+}
+
 /**
  * Removes the Updates Directory
  * @param   key
@@ -1086,6 +1109,9 @@ UpdateService.prototype = {
     case "xpcom-shutdown":
       os.removeObserver(this, "xpcom-shutdown");
 
+      // Prevent leaking the downloader (bug 454964)
+      this._downloader = null;
+
       // Release Services
       gApp      = null;
       gPref     = null;
@@ -1225,6 +1251,7 @@ UpdateService.prototype = {
           if (update.errorCode == WRITE_ERROR) {
             prompter.showUpdateError(update);
             writeStatusFile(getUpdatesDir(), update.state = STATE_PENDING);
+            writeVersionFile(getUpdatesDir(), update.extensionVersion);
             return;
           }
         }
@@ -2407,6 +2434,7 @@ Downloader.prototype = {
           // This is a pretty fatal error.  Just bail.
           LOG("Downloader", "_selectPatch - failed to apply complete patch!");
           writeStatusFile(updateDir, STATE_NONE);
+          writeVersionFile(getUpdatesDir(), null);
           return null;
         }
       }
@@ -2632,6 +2660,7 @@ Downloader.prototype = {
 
         // Tell the updater.exe we're ready to apply.
         writeStatusFile(getUpdatesDir(), state);
+        writeVersionFile(getUpdatesDir(), this._update.extensionVersion);
         this._update.installDate = (new Date()).getTime();
         this._update.statusText = updateStrings.GetStringFromName("installPending");
       }

toolkit/xre/nsAppRunner.cpp

@@ -2976,7 +2976,8 @@ XRE_main(int argc, char* argv[], const nsXREAppData* aAppData)
                  dirProvider.GetAppDir(),
                  updRoot,
                  gRestartArgc,
-                 gRestartArgv);
+                 gRestartArgv,
+                 appData.version);
 #endif
 
     nsCOMPtr<nsIProfileLock> profileLock;

toolkit/xre/nsUpdateDriver.cpp

@@ -22,6 +22,7 @@
  * Contributor(s):
  *  Darin Fisher <darin@meer.net>
  *  Ben Turner <mozilla@songbirdnest.com>
+ *  Robert Strong <robert.bugzilla@gmail.com>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -51,6 +52,7 @@
 #include "nsPrintfCString.h"
 #include "prproces.h"
 #include "prlog.h"
+#include "nsVersionComparator.h"
 
 #ifdef XP_MACOSX
 #include "nsILocalFileMac.h"
@@ -222,16 +224,16 @@ GetFile(nsIFile *dir, const nsCSubstring &name, nsCOMPtr<nsILocalFile> &result)
 {
   nsresult rv;
   
-  nsCOMPtr<nsIFile> statusFile;
-  rv = dir->Clone(getter_AddRefs(statusFile));
+  nsCOMPtr<nsIFile> file;
+  rv = dir->Clone(getter_AddRefs(file));
   if (NS_FAILED(rv))
     return PR_FALSE;
 
-  rv = statusFile->AppendNative(name);
+  rv = file->AppendNative(name);
   if (NS_FAILED(rv))
     return PR_FALSE;
 
-  result = do_QueryInterface(statusFile, &rv);
+  result = do_QueryInterface(file, &rv);
   return NS_SUCCEEDED(rv);
 }
 
@@ -274,6 +276,42 @@ SetStatus(nsILocalFile *statusFile, const char *status)
   return PR_TRUE;
 }
 
+static PRBool
+GetVersionFile(nsIFile *dir, nsCOMPtr<nsILocalFile> &result)
+{
+  return GetFile(dir, NS_LITERAL_CSTRING("update.version"), result);
+}
+
+// Compares the current application version with the update's application
+// version.
+static PRBool
+IsOlderVersion(nsILocalFile *versionFile, const char *&appVersion)
+{
+  nsresult rv;
+
+  FILE *fp;
+  rv = versionFile->OpenANSIFileDesc("r", &fp);
+  if (NS_FAILED(rv))
+    return PR_TRUE;
+
+  char buf[32];
+  char *result = fgets(buf, sizeof(buf), fp);
+  fclose(fp);
+  if (!result)
+    return PR_TRUE;
+
+  // If the update xml doesn't provide the application version the file will
+  // contain the string "null" and it is assumed that the update is not older.
+  const char kNull[] = "null";
+  if (strncmp(buf, kNull, sizeof(kNull) - 1) == 0)
+    return PR_FALSE;
+
+  if (NS_CompareVersions(appVersion, result) > 0)
+    return PR_TRUE;
+
+  return PR_FALSE;
+}
+
 static PRBool
 CopyFileIntoUpdateDir(nsIFile *parentDir, const char *leafName, nsIFile *updateDir)
 {
@@ -505,7 +543,7 @@ end:
 
 nsresult
 ProcessUpdates(nsIFile *greDir, nsIFile *appDir, nsIFile *updRootDir,
-               int argc, char **argv)
+               int argc, char **argv, const char *&appVersion)
 {
   nsresult rv;
 
@@ -533,6 +571,16 @@ ProcessUpdates(nsIFile *greDir, nsIFile *appDir, nsIFile *updRootDir,
   for (int i = 0; i < dirEntries.Count(); ++i) {
     nsCOMPtr<nsILocalFile> statusFile;
     if (GetStatusFile(dirEntries[i], statusFile) && IsPending(statusFile)) {
+      nsCOMPtr<nsILocalFile> versionFile;
+      // Remove the update if the update application version file doesn't exist
+      // or if the update's application version is less than the current
+      // application version.
+      if (!GetVersionFile(dirEntries[i], versionFile) ||
+          IsOlderVersion(versionFile, appVersion)) {
+        dirEntries[i]->Remove(PR_TRUE);
+        continue;
+      }
+
       ApplyUpdate(greDir, dirEntries[i], statusFile, appDir, argc, argv);
       break;
     }

toolkit/xre/nsUpdateDriver.h

@@ -22,6 +22,7 @@
  * Contributor(s):
  *  Darin Fisher <darin@meer.net>
  *  Ben Turner <mozilla@songbirdnest.com>
+ *  Robert Strong <robert.bugzilla@gmail.com>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -55,10 +56,15 @@ class nsIFile;
  * The argc and argv passed to this function should be what is needed to
  * relaunch the current process.
  *
+ * The appVersion param passed to this function is the current application's
+ * version and is used to determine if an update's version is older than the
+ * current application version.
+ *
  * This function does not modify appDir.
  */
 NS_HIDDEN_(nsresult) ProcessUpdates(nsIFile *greDir, nsIFile *appDir,
                                     nsIFile *updRootDir,
-                                    int argc, char **argv);
+                                    int argc, char **argv,
+                                    const char *&appVersion);
 
 #endif  // nsUpdateDriver_h__

widget/src/cocoa/nsChildView.mm

@@ -2831,6 +2831,19 @@ NSEvent* gLastDragEvent = nil;
 }
 
 
+- (void)viewWillMoveToWindow:(NSWindow *)newWindow
+{
+  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
+
+  if (!newWindow)
+    HideChildPluginViews(self);
+
+  [super viewWillMoveToWindow:newWindow];
+
+  NS_OBJC_END_TRY_ABORT_BLOCK;
+}
+
+
 - (void)viewWillStartLiveResize
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK;