--- a/browser/components/sessionstore/src/DocumentUtils.jsm
+++ b/browser/components/sessionstore/src/DocumentUtils.jsm
@@ -1,12 +1,14 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+"use strict";
+
 this.EXPORTED_SYMBOLS = [ "DocumentUtils" ];
 
 const Cu = Components.utils;
 const Ci = Components.interfaces;
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource:///modules/sessionstore/XPathGenerator.jsm");
 

--- a/browser/components/sessionstore/src/SessionMigration.jsm
+++ b/browser/components/sessionstore/src/SessionMigration.jsm
@@ -1,12 +1,14 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+"use strict";
+
 this.EXPORTED_SYMBOLS = ["SessionMigration"];
 
 const Cu = Components.utils;
 Cu.import("resource://gre/modules/XPCOMUtils.jsm", this);
 Cu.import("resource://gre/modules/Task.jsm", this);
 Cu.import("resource://gre/modules/osfile.jsm", this);
 
 // An encoder to UTF-8.

--- a/browser/components/sessionstore/src/SessionStorage.jsm
+++ b/browser/components/sessionstore/src/SessionStorage.jsm
@@ -1,12 +1,14 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this file,
 * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+"use strict";
+
 this.EXPORTED_SYMBOLS = ["SessionStorage"];
 
 const Cu = Components.utils;
 
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 
 XPCOMUtils.defineLazyModuleGetter(this, "SessionStore",

--- a/browser/components/sessionstore/src/SessionStore.jsm
+++ b/browser/components/sessionstore/src/SessionStore.jsm
@@ -1,12 +1,14 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+"use strict";
+
 this.EXPORTED_SYMBOLS = ["SessionStore"];
 
 const Cu = Components.utils;
 const Cc = Components.classes;
 const Ci = Components.interfaces;
 const Cr = Components.results;
 
 const STATE_STOPPED = 0;
@@ -299,20 +301,16 @@ let SessionStoreInternal = {
 
   // time in milliseconds when the session was started (saved across sessions),
   // defaults to now if no session was restored or timestamp doesn't exist
   _sessionStartTime: Date.now(),
 
   // states for all currently opened windows
   _windows: {},
 
-  // internal states for all open windows (data we need to associate,
-  // but not write to disk)
-  _internalWindows: {},
-
   // states for all recently closed windows
   _closedWindows: [],
 
   // collection of session states yet to be restored
   _statesToRestore: {},
 
   // counts the number of crashes since the last clean start
   _recentCrashes: 0,
@@ -714,19 +712,16 @@ let SessionStoreInternal = {
       return;
 
     // assign it a unique identifier (timestamp)
     aWindow.__SSi = "window" + Date.now();
 
     // and create its data object
     this._windows[aWindow.__SSi] = { tabs: [], selected: 0, _closedTabs: [], busy: false };
 
-    // and create its internal data object
-    this._internalWindows[aWindow.__SSi] = { hosts: {} }
-
     let isPrivateWindow = false;
     if (PrivateBrowsingUtils.isWindowPrivate(aWindow))
       this._windows[aWindow.__SSi].isPrivate = isPrivateWindow = true;
     if (!this._isWindowLoaded(aWindow))
       this._windows[aWindow.__SSi]._restoring = true;
     if (!aWindow.toolbar.visible)
       this._windows[aWindow.__SSi].isPopup = true;
 
@@ -870,22 +865,22 @@ let SessionStoreInternal = {
   },
 
   /**
    * On window open
    * @param aWindow
    *        Window reference
    */
   onOpen: function ssi_onOpen(aWindow) {
-    var _this = this;
-    aWindow.addEventListener("load", function(aEvent) {
-      aEvent.currentTarget.removeEventListener("load", arguments.callee, false);
-      _this.onLoad(aEvent.currentTarget);
-    }, false);
-    return;
+    let onload = () => {
+      aWindow.removeEventListener("load", onload);
+      this.onLoad(aWindow);
+    };
+
+    aWindow.addEventListener("load", onload);
   },
 
   /**
    * On window close...
    * - remove event listeners from tabs
    * - save all window data
    * @param aWindow
    *        Window reference
@@ -930,19 +925,17 @@ let SessionStoreInternal = {
     if (this._loadState == STATE_RUNNING) { // window not closed during a regular shut-down
       // update all window data for a last time
       this._collectWindowData(aWindow);
 
       if (isFullyLoaded) {
         winData.title = aWindow.content.document.title || tabbrowser.selectedTab.label;
         winData.title = this._replaceLoadingTitle(winData.title, tabbrowser,
                                                   tabbrowser.selectedTab);
-        let windows = {};
-        windows[aWindow.__SSi] = winData;
-        this._updateCookies(windows);
+        this._updateCookies([winData]);
       }
 
 #ifndef XP_MACOSX
       // Until we decide otherwise elsewhere, this window is part of a series
       // of closing windows to quit.
       winData._shouldRestore = true;
 #endif
 
@@ -954,17 +947,16 @@ let SessionStoreInternal = {
         delete winData.busy;
 
         this._closedWindows.unshift(winData);
         this._capClosedWindows();
       }
 
       // clear this window from the list
       delete this._windows[aWindow.__SSi];
-      delete this._internalWindows[aWindow.__SSi];
 
       // save the state without this window to disk
       this.saveStateDelayed();
     }
 
     for (let i = 0; i < tabbrowser.tabs.length; i++) {
       this.onTabRemove(aWindow, tabbrowser.tabs[i], true);
     }
@@ -1050,43 +1042,37 @@ let SessionStoreInternal = {
     this._lastSessionState = null;
     let openWindows = {};
     this._forEachBrowserWindow(function(aWindow) {
       Array.forEach(aWindow.gBrowser.tabs, function(aTab) {
         TabStateCache.delete(aTab);
         delete aTab.linkedBrowser.__SS_data;
         delete aTab.linkedBrowser.__SS_tabStillLoading;
         delete aTab.linkedBrowser.__SS_formDataSaved;
-        delete aTab.linkedBrowser.__SS_hostSchemeData;
         if (aTab.linkedBrowser.__SS_restoreState)
           this._resetTabRestoringState(aTab);
-      });
+      }, this);
       openWindows[aWindow.__SSi] = true;
     });
     // also clear all data about closed tabs and windows
     for (let ix in this._windows) {
       if (ix in openWindows) {
         this._windows[ix]._closedTabs = [];
-      }
-      else {
+      } else {
         delete this._windows[ix];
-        delete this._internalWindows[ix];
       }
     }
     // also clear all data about closed windows
     this._closedWindows = [];
     // give the tabbrowsers a chance to clear their histories first
     var win = this._getMostRecentBrowserWindow();
     if (win)
       win.setTimeout(function() { _this.saveState(true); }, 0);
     else if (this._loadState == STATE_RUNNING)
       this.saveState(true);
-    // Delete the private browsing backed up state, if any
-    if ("_stateBackup" in this)
-      delete this._stateBackup;
 
     this._clearRestoringWindows();
   },
 
   /**
    * On purge of domain data
    * @param aData
    *        String domain data
@@ -1220,17 +1206,16 @@ let SessionStoreInternal = {
     browser.removeEventListener("load", this, true);
 
     let mm = browser.messageManager;
     MESSAGES.forEach(msg => mm.removeMessageListener(msg, this));
 
     delete browser.__SS_data;
     delete browser.__SS_tabStillLoading;
     delete browser.__SS_formDataSaved;
-    delete browser.__SS_hostSchemeData;
 
     // If this tab was in the middle of restoring or still needs to be restored,
     // we need to reset that state. If the tab was restoring, we will attempt to
     // restore the next tab.
     let previousState = browser.__SS_restoreState;
     if (previousState) {
       this._resetTabRestoringState(aTab);
       if (previousState == TAB_STATE_RESTORING)
@@ -1976,21 +1961,20 @@ let SessionStoreInternal = {
     if (history && browser.__SS_data &&
         browser.__SS_data.entries[history.index] &&
         browser.__SS_data.entries[history.index].url == browser.currentURI.spec &&
         history.index < this._sessionhistory_max_entries - 1 && !includePrivateData) {
       tabData = browser.__SS_data;
       tabData.index = history.index + 1;
     }
     else if (history && history.count > 0) {
-      browser.__SS_hostSchemeData = [];
       try {
         for (var j = 0; j < history.count; j++) {
           let entry = this._serializeHistoryEntry(history.getEntryAtIndex(j, false),
-                                                  includePrivateData, aTab.pinned, browser.__SS_hostSchemeData);
+                                                  includePrivateData, aTab.pinned);
           tabData.entries.push(entry);
         }
         // If we make it through the for loop, then we're ok and we should clear
         // any indicator of brokenness.
         delete aTab.__SS_broken_history;
       }
       catch (ex) {
         // In some cases, getEntryAtIndex will throw. This seems to be due to
@@ -2072,33 +2056,22 @@ let SessionStoreInternal = {
    * Get an object that is a serialized representation of a History entry
    * Used for data storage
    * @param aEntry
    *        nsISHEntry instance
    * @param aIncludePrivateData
    *        always return privacy sensitive data (use with care)
    * @param aIsPinned
    *        the tab is pinned and should be treated differently for privacy
-   * @param aHostSchemeData
-   *        an array of objects with host & scheme keys
    * @returns object
    */
   _serializeHistoryEntry:
-    function ssi_serializeHistoryEntry(aEntry, aIncludePrivateData, aIsPinned, aHostSchemeData) {
+    function ssi_serializeHistoryEntry(aEntry, aIncludePrivateData, aIsPinned) {
     var entry = { url: aEntry.URI.spec };
 
-    try {
-      // throwing is expensive, we know that about: pages will throw
-      if (entry.url.indexOf("about:") != 0)
-        aHostSchemeData.push({ host: aEntry.URI.host, scheme: aEntry.URI.scheme });
-    }
-    catch (ex) {
-      // We just won't attempt to get cookies for this entry.
-    }
-
     if (aEntry.title && aEntry.title != entry.url) {
       entry.title = aEntry.title;
     }
     if (aEntry.isSubFrame) {
       entry.subframe = true;
     }
     if (!(aEntry instanceof Ci.nsISHEntry)) {
       return entry;
@@ -2199,17 +2172,17 @@ let SessionStoreInternal = {
         if (child) {
           // don't try to restore framesets containing wyciwyg URLs (cf. bug 424689 and bug 450595)
           if (child.URI.schemeIs("wyciwyg")) {
             children = [];
             break;
           }
 
           children.push(this._serializeHistoryEntry(child, aIncludePrivateData,
-                                                    aIsPinned, aHostSchemeData));
+                                                    aIsPinned));
         }
       }
 
       if (children.length)
         entry.children = children;
     }
 
     return entry;
@@ -2420,18 +2393,18 @@ let SessionStoreInternal = {
     else if (aScheme == "file") {
       aHosts[aHost] = true;
     }
   },
 
   /**
    * Serialize cookie data
    * @param aWindows
-   *        JS object containing window data references
-   *        { id: winData, etc. }
+   *        An array of window data objects
+   *        { tabs: [ ... ], etc. }
    */
   _updateCookies: function ssi_updateCookies(aWindows) {
     function addCookieToHash(aHash, aHost, aPath, aName, aCookie) {
       // lazily build up a 3-dimensional hash, with
       // aHost, aPath, and aName as keys
       if (!aHash[aHost])
         aHash[aHost] = {};
       if (!aHash[aHost][aPath])
@@ -2439,22 +2412,28 @@ let SessionStoreInternal = {
       aHash[aHost][aPath][aName] = aCookie;
     }
 
     var jscookies = {};
     var _this = this;
     // MAX_EXPIRY should be 2^63-1, but JavaScript can't handle that precision
     var MAX_EXPIRY = Math.pow(2, 62);
 
-    for (let [id, window] in Iterator(aWindows)) {
+    for (let window of aWindows) {
       window.cookies = [];
-      let internalWindow = this._internalWindows[id];
-      if (!internalWindow.hosts)
-        return;
-      for (var [host, isPinned] in Iterator(internalWindow.hosts)) {
+
+      // Collect all hosts for the current window.
+      let hosts = {};
+      window.tabs.forEach(function(tab) {
+        tab.entries.forEach(function(entry) {
+          this._extractHostsForCookiesFromEntry(entry, hosts, true, tab.pinned);
+        }, this);
+      }, this);
+
+      for (var [host, isPinned] in Iterator(hosts)) {
         let list;
         try {
           list = Services.cookies.getCookiesFromHost(host);
         }
         catch (ex) {
           debug("getCookiesFromHost failed. Host: " + host);
         }
         while (list && list.hasMoreElements()) {
@@ -2537,30 +2516,34 @@ let SessionStoreInternal = {
         }
         else { // always update the window features (whose change alone never triggers a save operation)
           this._updateWindowFeatures(aWindow);
         }
       });
       DirtyWindows.clear();
     }
 
-    // collect the data for all windows
-    var total = [], windows = {}, ids = [];
+    // An array that at the end will hold all current window data.
+    var total = [];
+    // The ids of all windows contained in 'total' in the same order.
+    var ids = [];
+    // The number of window that are _not_ popups.
     var nonPopupCount = 0;
     var ix;
+
+    // collect the data for all windows
     for (ix in this._windows) {
       if (this._windows[ix]._restoring) // window data is still in _statesToRestore
         continue;
       total.push(this._windows[ix]);
       ids.push(ix);
-      windows[ix] = this._windows[ix];
       if (!this._windows[ix].isPopup)
         nonPopupCount++;
     }
-    this._updateCookies(windows);
+    this._updateCookies(total);
 
     // collect the data for all windows yet to be restored
     for (ix in this._statesToRestore) {
       for each (let winData in this._statesToRestore[ix].windows) {
         total.push(winData);
         if (!winData.isPopup)
           nonPopupCount++;
       }
@@ -2622,48 +2605,34 @@ let SessionStoreInternal = {
   _getWindowState: function ssi_getWindowState(aWindow) {
     if (!this._isWindowLoaded(aWindow))
       return this._statesToRestore[aWindow.__SS_restoreID];
 
     if (this._loadState == STATE_RUNNING) {
       this._collectWindowData(aWindow);
     }
 
-    var winData = this._windows[aWindow.__SSi];
-    let windows = {};
-    windows[aWindow.__SSi] = winData;
+    let windows = [this._windows[aWindow.__SSi]];
     this._updateCookies(windows);
 
-    return { windows: [winData] };
+    return { windows: windows };
   },
 
   _collectWindowData: function ssi_collectWindowData(aWindow) {
     if (!this._isWindowLoaded(aWindow))
       return;
 
     let tabbrowser = aWindow.gBrowser;
     let tabs = tabbrowser.tabs;
     let winData = this._windows[aWindow.__SSi];
     let tabsData = winData.tabs = [];
-    let hosts = this._internalWindows[aWindow.__SSi].hosts = {};
 
     // update the internal state data for this window
     for (let tab of tabs) {
       tabsData.push(this._collectTabData(tab));
-
-      // Since we are only ever called for open
-      // windows during a session, we can call into
-      // _extractHostsForCookiesFromHostScheme directly using data
-      // that is attached to each browser.
-      let hostSchemeData = tab.linkedBrowser.__SS_hostSchemeData || [];
-      for (let j = 0; j < hostSchemeData.length; j++) {
-        this._extractHostsForCookiesFromHostScheme(hostSchemeData[j].host,
-                                                   hostSchemeData[j].scheme,
-                                                   hosts, true, tab.pinned);
-      }
     }
     winData.selected = tabbrowser.mTabBox.selectedIndex + 1;
 
     this._updateWindowFeatures(aWindow);
 
     // Make sure we keep __SS_lastSessionWindowID around for cases like entering
     // or leaving PB mode.
     if (aWindow.__SS_lastSessionWindowID)

--- a/browser/components/sessionstore/src/XPathGenerator.jsm
+++ b/browser/components/sessionstore/src/XPathGenerator.jsm
@@ -1,12 +1,14 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+"use strict";
+
 this.EXPORTED_SYMBOLS = ["XPathGenerator"];
 
 this.XPathGenerator = {
   // these two hashes should be kept in sync
   namespaceURIs:     { "xhtml": "http://www.w3.org/1999/xhtml" },
   namespacePrefixes: { "http://www.w3.org/1999/xhtml": "xhtml" },
 
   /**

--- a/browser/components/sessionstore/src/nsSessionStartup.js
+++ b/browser/components/sessionstore/src/nsSessionStartup.js
@@ -1,12 +1,14 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+"use strict";
+
 /**
  * Session Storage and Restoration
  *
  * Overview
  * This service reads user's session file at startup, and makes a determination
  * as to whether the session should be restored. It will restore the session
  * under the circumstances described below.  If the auto-start Private Browsing
  * mode is active, however, the session is never restored.

--- a/browser/components/sessionstore/src/nsSessionStore.js
+++ b/browser/components/sessionstore/src/nsSessionStore.js
@@ -1,12 +1,14 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+"use strict";
+
 /**
  * Session Storage and Restoration
  *
  * Overview
  * This service keeps track of a user's session, storing the various bits
  * required to return the browser to its current state. The relevant data is
  * stored in memory, and is periodically saved to disk in a file in the
  * profile directory. The service is started at first window load, in

--- a/browser/metro/base/content/ContextCommands.js
+++ b/browser/metro/base/content/ContextCommands.js
@@ -32,69 +32,76 @@ var ContextCommands = {
    * Context menu handlers
    */
 
   // Text specific
 
   cut: function cc_cut() {
     let target = ContextMenuUI.popupState.target;
 
-    if (!target)
+    if (!target) {
       return;
+    }
 
     if (target.localName === "browser") {
       // content
       if (ContextMenuUI.popupState.string) {
         this.sendCommand("cut");
 
         SelectionHelperUI.closeEditSession(true);
       }
     } else {
       // chrome
-      target.editor.cut();
+      CommandUpdater.doCommand("cmd_cut");
     }
 
     target.focus();
   },
 
   copy: function cc_copy() {
     let target = ContextMenuUI.popupState.target;
 
-    if (!target)
+    if (!target) {
       return;
+    }
 
     if (target.localName == "browser") {
       // content
       if (ContextMenuUI.popupState.string) {
         this.sendCommand("copy");
 
         SelectionHelperUI.closeEditSession(true);
       }
     } else if (ContextMenuUI.popupState.string) {
       this.clipboard.copyString(ContextMenuUI.popupState.string, this.docRef);
     } else {
       // chrome
-      target.editor.copy();
+      CommandUpdater.doCommand("cmd_copy");
     }
 
     target.focus();
   },
 
   paste: function cc_paste() {
     let target = ContextMenuUI.popupState.target;
+
+    if (!target) {
+      return;
+    }
+
     if (target.localName == "browser") {
       // content
       let x = ContextMenuUI.popupState.x;
       let y = ContextMenuUI.popupState.y;
       let json = {x: x, y: y, command: "paste" };
       target.messageManager.sendAsyncMessage("Browser:ContextCommand", json);
       SelectionHelperUI.closeEditSession();
     } else {
       // chrome
-      target.editor.paste(Ci.nsIClipboard.kGlobalClipboard);
+      CommandUpdater.doCommand("cmd_paste");
       target.focus();
     }
   },
 
   pasteAndGo: function cc_pasteAndGo() {
     let target = ContextMenuUI.popupState.target;
     target.editor.selectAll();
     target.editor.paste(Ci.nsIClipboard.kGlobalClipboard);

--- a/browser/metro/base/content/bindings/bindings.xml
+++ b/browser/metro/base/content/bindings/bindings.xml
@@ -255,20 +255,16 @@
         <body><![CDATA[
           let selectionStart = aTextbox.selectionStart;
           let selectionEnd = aTextbox.selectionEnd;
 
           let json = { types: ["input-text"], string: "" };
           if (selectionStart != selectionEnd) {
             json.types.push("cut");
             json.types.push("copy");
-            json.string = aTextbox.value.slice(selectionStart, selectionEnd);
-          } else if (aTextbox.value) {
-            json.types.push("copy-all");
-            json.string = aTextbox.value;
           }
 
           if (selectionStart > 0 || selectionEnd < aTextbox.textLength)
             json.types.push("select-all");
 
           let clipboard = Components.classes["@mozilla.org/widget/clipboard;1"].
                                             getService(Ci.nsIClipboard);
           let flavors = ["text/unicode"];

--- a/browser/metro/base/content/bindings/grid.xml
+++ b/browser/metro/base/content/bindings/grid.xml
@@ -795,33 +795,34 @@
       </handler>
     </handlers>
   </binding>
 
   <binding id="richgrid-item">
     <content>
       <html:div anonid="anon-tile" class="tile-content" xbl:inherits="customImage">
         <html:div class="tile-start-container" xbl:inherits="customImage">
-          <html:div class="tile-icon-box"><xul:image anonid="anon-tile-icon" xbl:inherits="src=iconURI"/></html:div>
+          <html:div class="tile-icon-box" anonid="anon-tile-icon-box"><xul:image anonid="anon-tile-icon" xbl:inherits="src=iconURI"/></html:div>
         </html:div>
         <html:div anonid="anon-tile-label" class="tile-desc" xbl:inherits="xbl:text=label"/>
       </html:div>
     </content>
 
     <implementation>
       <property name="isBound" readonly="true" onget="return !!this._icon"/>
       <constructor>
         <![CDATA[
             this.refresh();
         ]]>
       </constructor>
       <property name="_contentBox" onget="return document.getAnonymousElementByAttribute(this, 'class', 'tile-content');"/>
       <property name="_textbox" onget="return document.getAnonymousElementByAttribute(this, 'class', 'tile-desc');"/>
       <property name="_top" onget="return document.getAnonymousElementByAttribute(this, 'class', 'tile-start-container');"/>
       <property name="_icon" onget="return document.getAnonymousElementByAttribute(this, 'anonid', 'anon-tile-icon');"/>
+      <property name="_iconBox" onget="return document.getAnonymousElementByAttribute(this, 'anonid', 'anon-tile-icon-box');"/>
       <property name="_label" onget="return document.getAnonymousElementByAttribute(this, 'anonid', 'anon-tile-label');"/>
       <property name="iconSrc"
                 onset="this._icon.src = val; this.setAttribute('iconURI', val);"
                 onget="return this._icon.src;" />
 
       <property name="selected"
                 onget="return this.hasAttribute('selected');"
                 onset="if (val) this.setAttribute('selected', val); else this.removeAttribute('selected');" />
@@ -871,19 +872,31 @@
         ]]></getter>
       </property>
 
       <property name="color" onget="return this.getAttribute('customColor');">
         <setter><![CDATA[
           if (val) {
             this.setAttribute("customColor", val);
             this._contentBox.style.backgroundColor = val;
+
+            // overridden in tiles.css for non-thumbnail types
+            this._label.style.backgroundColor = val.replace(/rgb\(([^\)]+)\)/, 'rgba($1, 0.8)');
+
+            // Small icons get a border+background-color treatment.
+            // See tiles.css for large icon overrides
+            this._iconBox.style.borderColor = val.replace(/rgb\(([^\)]+)\)/, 'rgba($1, 0.6)');
+            this._iconBox.style.backgroundColor = this.hasAttribute("tintColor") ?
+                                                    this.getAttribute("tintColor") : "#fff";
           } else {
             this.removeAttribute("customColor");
             this._contentBox.style.removeProperty("background-color");
+            this._label.style.removeProperty("background-color");
+            this._iconBox.style.removeProperty("border-color");
+            this._iconBox.style.removeProperty("background-color");
           }
         ]]></setter>
       </property>
 
       <property name="backgroundImage" onget="return this.getAttribute('customImage');">
         <setter><![CDATA[
           if (val) {
             this.setAttribute("customImage", val);

--- a/browser/metro/base/content/bindings/urlbar.xml
+++ b/browser/metro/base/content/bindings/urlbar.xml
@@ -152,17 +152,17 @@
         </body>
       </method>
 
       <method name="_getSelectedValueForClipboard">
         <body>
           <![CDATA[
             // Grab the actual input field's value, not our value, which could include moz-action:
             let inputVal = this.inputField.value;
-            let selectedVal = inputVal.substring(this.selectionStart, this.electionEnd);
+            let selectedVal = inputVal.substring(this.selectionStart, this.selectionEnd);
 
             // If the selection doesn't start at the beginning or doesn't span the full domain or
             // the URL bar is modified, nothing else to do here.
             if (this.selectionStart > 0 || this.valueIsTyped)
               return selectedVal;
 
             // The selection doesn't span the full domain if it doesn't contain a slash and is
             // followed by some character other than a slash.
@@ -480,24 +480,27 @@
             return;
         ]]>
       </handler>
     </handlers>
   </binding>
 
   <binding id="urlbar-autocomplete">
     <content orient="horizontal">
-      <xul:vbox id="results-vbox" flex="1">
-        <xul:label class="meta-section-title" value="&autocompleteResultsHeader.label;"/>
-        <richgrid id="results-richgrid" rows="3" deferlayout="true" anonid="results" seltype="single" flex="1"/>
+      <xul:vbox id="results-vbox" anonid="results-container" flex="1">
+        <xul:label class="meta-section-title"
+                   value="&autocompleteResultsHeader.label;"/>
+        <richgrid id="results-richgrid" anonid="results" rows="3" flex="1"
+                  seltype="single" deferlayout="true"/>
       </xul:vbox>
 
       <xul:vbox id="searches-vbox" flex="1">
-        <xul:label class="meta-section-title" value="&autocompleteSearchesHeader.label;"/>
-        <richgrid id="searches-richgrid" rows="3" deferlayout="true" anonid="searches" seltype="single" flex="1"/>
+        <xul:label anonid="searches-header" class="meta-section-title"/>
+        <richgrid id="searches-richgrid" anonid="searches" rows="3" flex="1"
+                  seltype="single" deferlayout="true"/>
       </xul:vbox>
     </content>
 
     <implementation implements="nsIAutoCompletePopup, nsIObserver">
       <constructor>
         <![CDATA[
           this.hidden = true;
 
@@ -585,17 +588,21 @@
             Elements.urlbarState.removeAttribute("autocomplete");
           ]]>
         </body>
       </method>
 
       <!-- Updating grid content -->
 
       <field name="_grid">null</field>
+
       <field name="_results" readonly="true">document.getAnonymousElementByAttribute(this, 'anonid', 'results');</field>
+      <field name="_resultsContainer" readonly="true">document.getAnonymousElementByAttribute(this, 'anonid', 'results-container');</field>
+
+      <field name="_searchesHeader" readonly="true">document.getAnonymousElementByAttribute(this, 'anonid', 'searches-header');</field>
       <field name="_searches" readonly="true">document.getAnonymousElementByAttribute(this, 'anonid', 'searches');</field>
 
       <property name="_otherGrid" readonly="true">
         <getter>
           <![CDATA[
             if (this._grid == null)
               return null;
 
@@ -615,32 +622,39 @@
 
       <method name="invalidate">
         <body>
           <![CDATA[
             if (!this.popupOpen)
               return;
 
             this.updateResults();
-            this.updateSearchEngineSubtitles();
+            this.updateSearchEngineHeader();
           ]]>
         </body>
       </method>
 
       <!-- Updating grid content: results -->
 
       <method name="updateResults">
         <body>
           <![CDATA[
             if (!this._isGridBound(this._results))
               return;
 
             if (!this.input)
               return;
 
+            let haveNoResults = (this.matchCount == 0);
+            this._resultsContainer.hidden = haveNoResults;
+
+            if (haveNoResults) {
+              return;
+            }
+
             let controller = this.input.controller;
             let lastMatch = this.matchCount - 1;
             let iterCount = Math.max(this._results.itemCount, this.matchCount);
 
             // Swap out existing items for new search hit results
             for (let i = 0; i < iterCount; i++) {
               if (i > lastMatch) {
                 let lastItem = this._results.itemCount - 1;
@@ -701,30 +715,27 @@
               item.setAttribute("iconURI", iconURI);
             }.bind(this));
 
             this._searches.arrangeItems();
           ]]>
         </body>
       </method>
 
-      <method name="updateSearchEngineSubtitles">
+      <method name="updateSearchEngineHeader">
         <body>
           <![CDATA[
             if (!this._isGridBound(this._searches))
               return;
 
             let searchString = this.input.controller.searchString;
-            let label = Strings.browser.formatStringFromName("opensearch.search", [searchString], 1);
+            let label = Strings.browser.formatStringFromName(
+                              "opensearch.search.header", [searchString], 1);
 
-            for (let i = 0, len = this._searches.itemCount; i < len; i++) {
-              let item = this._searches.getItemAtIndex(i);
-              item.setAttribute("label", label);
-              item.refresh && item.refresh();
-            }
+            this._searchesHeader.value = label;
           ]]>
         </body>
       </method>
 
       <!-- Selecting results -->
 
       <method name="selectBy">
         <parameter name="aReverse"/>

--- a/browser/metro/base/content/startui/HistoryView.js
+++ b/browser/metro/base/content/startui/HistoryView.js
@@ -104,17 +104,17 @@ HistoryView.prototype = Util.extend(Obje
     let item = this._set.insertItemAt(aPos || 0, aTitle, aURI, this._inBatch);
     this._setContextActions(item);
     this._updateFavicon(item, aURI);
   },
 
   _setContextActions: function bv__setContextActions(aItem) {
     let uri = aItem.getAttribute("value");
     aItem.setAttribute("data-contextactions", "delete," + (this._pinHelper.isPinned(uri) ? "unpin" : "pin"));
-    if (aItem.refresh) aItem.refresh();
+    if ("refresh" in aItem) aItem.refresh();
   },
 
   _sendNeedsRefresh: function bv__sendNeedsRefresh(){
     // Event sent when all views need to refresh.
     let event = document.createEvent("Events");
     event.initEvent("HistoryNeedsRefresh", true, false);
     window.dispatchEvent(event);
   },
@@ -268,16 +268,18 @@ HistoryView.prototype = Util.extend(Obje
 
   onPageChanged: function(aURI, aWhat, aValue) {
     if (aWhat ==  Ci.nsINavHistoryObserver.ATTRIBUTE_FAVICON) {
       let changedItems = this._set.getItemsByUrl(aURI.spec);
       for (let item of changedItems) {
         let currIcon = item.getAttribute("iconURI");
         if (currIcon != aValue) {
           item.setAttribute("iconURI", aValue);
+          if("refresh" in item)
+            item.refresh();
         }
       }
     }
   },
 
   onDeleteVisits: function (aURI, aVisitTime, aGUID, aReason, aTransitionType) {
     if ((aReason ==  Ci.nsINavHistoryObserver.REASON_DELETED) && !this._inBatch) {
       this.populateGrid(true);

--- a/browser/metro/base/tests/mochiperf/browser_deck_01.js
+++ b/browser/metro/base/tests/mochiperf/browser_deck_01.js
@@ -1,11 +1,13 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
+"use strict";
+
 function test() {
   let testDir = gTestPath.substr(0, gTestPath.lastIndexOf("/"));
   Services.scriptloader.loadSubScript(testDir + "/perfhelpers.js", this);
   runTests();
 }
 
 gTests.push({
   desc: "deck offset",

--- a/browser/metro/base/tests/mochiperf/browser_firstx.js
+++ b/browser/metro/base/tests/mochiperf/browser_firstx.js
@@ -1,11 +1,13 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
+"use strict";
+
 function test() {
   let testDir = gTestPath.substr(0, gTestPath.lastIndexOf("/"));
   Services.scriptloader.loadSubScript(testDir + "/perfhelpers.js", this);
   runTests();
 }
 
 gTests.push({
   desc: "first x metrics",

--- a/browser/metro/base/tests/mochiperf/msgmanagerecho.js
+++ b/browser/metro/base/tests/mochiperf/msgmanagerecho.js
@@ -1,16 +1,18 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /*
  * TestEchoReceiver - receives json data, reserializes it and send it back.
  */ 
 
+"use strict";
+
 var TestEchoReceiver = {
   init: function init() {
     addMessageListener("Test:EchoRequest", this);
   },
 
   receiveMessage: function receiveMessage(aMessage) {
     let json = aMessage.json;
     switch (aMessage.name) {

--- a/browser/metro/base/tests/mochiperf/perfhelpers.js
+++ b/browser/metro/base/tests/mochiperf/perfhelpers.js
@@ -1,11 +1,13 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
+"use strict";
+
 // Misc. constants
 const kInfoHeader = "PERF-TEST | ";
 const kDeclareId = "DECLARE ";
 const kResultsId = "RESULTS ";
 
 // Mochitest log data format version
 const kDataSetVersion = "1";
 

--- a/browser/metro/base/tests/mochitest/browser_selection_urlbar.js
+++ b/browser/metro/base/tests/mochitest/browser_selection_urlbar.js
@@ -129,15 +129,46 @@ gTests.push({
     let editCoords = logicalCoordsForElement(edit);
     SelectionHelperUI.attachEditSession(ChromeSelectionHandler, editCoords.x, editCoords.y);
     edit.blur();
     ok(!SelectionHelperUI.isSelectionUIVisible, "selection no longer enabled");
     clearSelection(edit);
   }
 });
 
+function getClipboardCondition(aExpected) {
+  return () => aExpected == SpecialPowers.getClipboardData("text/unicode");
+}
+
+gTests.push({
+  desc: "bug 894715 - URLs selected by touch are copied with trimming",
+  run: function () {
+    gWindow = window;
+    yield showNavBar();
+
+    let edit = document.getElementById("urlbar-edit");
+    edit.value = "http://www.wikipedia.org/";
+
+    sendElementTap(window, edit);
+    edit.select();
+
+    let panel = ContextMenuUI._menuPopup._panel;
+    let promise = waitForEvent(panel, "popupshown")
+    sendContextMenuClickToElement(window, edit);
+    ok((yield promise), "show context menu");
+
+    let copy = document.getElementById("context-copy");
+    ok(!copy.hidden, "copy menu item is visible")
+
+    let condition = getClipboardCondition("http://www.wikipedia.org/");
+    let promise = waitForCondition(condition);
+    sendElementTap(window, copy);
+    ok((yield promise), "copy text onto clipboard")
+  }
+})
+
 function test() {
   if (!isLandscapeMode()) {
     todo(false, "browser_selection_tests need landscape mode to run.");
     return;
   }
   runTests();
 }

--- a/browser/metro/base/tests/unit/test_util_extend.js
+++ b/browser/metro/base/tests/unit/test_util_extend.js
@@ -1,8 +1,10 @@
+"use strict";
+
 load('Util.js');
 
 function run_test() {
   do_print("Testing Util.extend");
   
   do_print("Check if function is defined");
   do_check_true(!!Util.extend);
 

--- a/browser/metro/locales/en-US/chrome/browser.dtd
+++ b/browser/metro/locales/en-US/chrome/browser.dtd
@@ -8,17 +8,16 @@
 <!ENTITY urlbar.accesskey      "d">
 
 <!ENTITY back.label            "Back">
 <!ENTITY forward.label         "Forward">
 <!ENTITY newtab.label          "New Tab">
 <!ENTITY closetab.label        "Close Tab">
 
 <!ENTITY autocompleteResultsHeader.label  "Your Results">
-<!ENTITY autocompleteSearchesHeader.label "Internet Searches">
 
 <!ENTITY appbarErrorConsole.label   "Open error console">
 <!ENTITY appbarJSShell.label        "Open JavaScript shell">
 <!ENTITY appbarFindInPage2.label    "Find in page">
 <!ENTITY appbarViewOnDesktop2.label "View on desktop">
 
 <!ENTITY topSitesHeader.label        "Top Sites">
 <!ENTITY bookmarksHeader.label       "Bookmarks">

--- a/browser/metro/locales/en-US/chrome/browser.properties
+++ b/browser/metro/locales/en-US/chrome/browser.properties
@@ -123,18 +123,19 @@ offlineApps.wantsTo=%S wants to store da
 
 # IndexedDB Quota increases
 indexedDBQuota.allow=Allow
 indexedDBQuota.wantsTo=%S wants to store a lot of data on your device for offline use.
 
 tabs.emptyTabTitle=New Tab
 
 # Open Search
-# LOCALIZATION NOTE (opensearch.search): %S is the word or phrase typed by the user
-opensearch.search=Search: %S
+# LOCALIZATION NOTE (opensearch.search.header): %S is the word or phrase
+# typed by the user in the urlbar to search
+opensearch.search.header=Search for “%S” on:
 
 # Check for Updates in the About Panel - button labels and accesskeys
 # LOCALIZATION NOTE - all of the following update buttons labels will only be
 # displayed one at a time. So, if a button is displayed nothing else will
 # be displayed alongside of the button. The button when displayed is located
 # directly under the Firefox version in the about dialog (see bug 596813 for
 # screenshots).
 update.checkInsideButton.label=Check for Updates

--- a/browser/metro/modules/View.jsm
+++ b/browser/metro/modules/View.jsm
@@ -53,16 +53,23 @@ View.prototype = {
       aIconUri = makeURI(aIconUri);
     }
     aItem.iconSrc = aIconUri.spec;
     let faviconURL = (PlacesUtils.favicons.getFaviconLinkForIcon(aIconUri)).spec;
     let xpFaviconURI = makeURI(faviconURL.replace("moz-anno:favicon:",""));
     let successAction = function(foreground, background) {
       aItem.style.color = foreground; //color text
       aItem.setAttribute("customColor", background);
+      let matteColor =  0xffffff; // white
+      let alpha = 0.04; // the tint weight
+      let [,r,g,b] = background.match(/rgb\((\d+),(\d+),(\d+)/);
+      // get the rgb value that represents this color at given opacity over a white matte
+      let tintColor = ColorUtils.addRgbColors(matteColor, ColorUtils.createDecimalColorWord(r,g,b,alpha));
+      aItem.setAttribute("tintColor", ColorUtils.convertDecimalToRgbColor(tintColor));
+
       if (aItem.refresh) {
         aItem.refresh();
       }
     };
     let failureAction = function() {};
     ColorUtils.getForegroundAndBackgroundIconColors(xpFaviconURI, successAction, failureAction);
   }
 

--- a/browser/metro/theme/browser.css
+++ b/browser/metro/theme/browser.css
@@ -444,17 +444,17 @@ documenttab[selected] .documenttab-selec
 #navbar {
   visibility: visible;
 }
 #navbar:not([hiding]):not([visible]) > #toolbar-overlay {
   visibility: hidden;
 }
 
 .circularprogressindicator-progressRing {
-  margin: 0 @toolbar_horizontal_spacing@;
+  margin: -2px 18px;
   pointer-events:none;
   position: absolute;
 }
 
 /* Progress meter ---------------------------------------------------------- */
 
 #progress-container {
   display: block;

index f0a4dbfdf948a8227a3076f6fa4876ee4b36b210..44de3fb173079de5bf89e9b94977d43f3e930e50
GIT binary patch
literal 363
zc%17D@N?(olHy`uVBq!ia0vp^Iv~u!1|;QLq8Nb`TavfC3&Vd9T(EcfWS|IVfk$L9
z1A}ZE2s6em5^e+vvX^-Jy0YKp;1uQ3?A@~=9Vqm})5S3);_%y<rv(oiaJZZeoA@dy
zW|g=2Io0+Uk<XEgpE@?T*SdLlD6k)ndmsGu?q|h7&6#|jZPQCGDD0ThXmxNY>l((W
zOJ*V`{e6z?er@`J`TnCKFN=A5q=ML9UzrpX(Y|cTVX3VXLxX-k|L}s}IKgz{zoG>;
zo7{Ytgc&(Kxu~^^D_5pla+*i`{4EZ<OLing7^s?kV7qrf`Uc;fg)?|0E-dnp=sMY3
zw8KdEU&i9IcO5IYJM4Hk@ux)S{#l#D92W8)i%*a0ck4<lot_<fGhXJ*mx3Q%ja##}
zM=d^(l@b4A*TWME+_S8v%;dDoeRGt}Us~tfof%xe8Em3@ohN<|s|1DtgQu&X%Q~lo
FCIA^ulwkk>

--- a/browser/metro/theme/platform.css
+++ b/browser/metro/theme/platform.css
@@ -572,33 +572,32 @@ arrowbox {
 
 .meta-section {
   margin: 0 @metro_spacing_large@;
 }
 
 .meta-section-title {
   font-size: @metro_font_large@;
   font-weight: 100;
-  display: none;
   cursor: default;
 }
 
 #start-container[viewstate="snapped"] {
   padding-top: 0;
 }
 
 #start-container[viewstate="snapped"] .meta-section-title,
 #start-container[viewstate="snapped"] richgrid {
   margin-top: @metro_spacing_xnormal@;
   padding: 0;
 }
 
-#start-container[viewstate="snapped"] .meta-section-title.narrow-title,
-#start-container:not([viewstate="snapped"]) .meta-section-title.wide-title {
-  display: block;
+#start-container:not([viewstate="snapped"]) .meta-section-title.narrow-title,
+#start-container[viewstate="snapped"] .meta-section-title.wide-title {
+  display: none;
 }
 
 .meta-section:not([expanded]) > .meta-section-title.narrow-title:-moz-locale-dir(ltr):after {
   content: ">";
 }
 
 .meta-section:not([expanded]) > .meta-section-title.narrow-title:-moz-locale-dir(rtl):before {
   content: "<";

--- a/browser/metro/theme/tiles.css
+++ b/browser/metro/theme/tiles.css
@@ -57,71 +57,98 @@ richgriditem {
   transition: 300ms height ease-out,
               150ms opacity ease-out,
               100ms transform ease-out;
 }
 
 .tile-content {
   display: block;
   position: absolute;
-  background-color: #fff;
+  /* background-color colors the tile-edge,
+     and will normally be overridden with a favicon-based color */
+  background-color: #ccc;
   background-origin: padding-box;
   /* content positioning within the grid "cell"
      gives us the gutters/spacing between tiles */
   top: 2px; right: 6px; bottom: 10px; left: 6px;
   border: @metro_border_thin@ solid @tile_border_color@;
   box-shadow: 0 0 5px 0 rgba(0, 0, 0, 0.1);
   transition: 150ms transform ease-out;
 }
 
 .tile-start-container {
   position: absolute;
   top: 0;
   bottom: 0;
   right: 0;
-  left: 20px;
-  background: hsla(0,2%,98%,.95);
+  left: 10px;
   padding: 8px;
+  background-color: #fff;
 }
 
 richgriditem:not([tiletype="thumbnail"]) .tile-start-container {
   background-image: none!important;
 }
 
 .tile-icon-box {
-  display: inline-block;
-  padding: 4px;
-  background: #fff;
+  position: absolute;
+  top: 50%;
+  margin-top: -17px;
+  padding: 8px;
+  /* default color, may be overriden by a favicon-based color */
+  background-color: white;
+  border: 1px solid #ccc;
+  border-radius: 1px;
   opacity: 1.0;
 }
 
 .tile-icon-box > image {
+  display: block;
+  width: 16px;
+  height: 16px;
+  list-style-image: url("chrome://browser/skin/images/identity-icons-generic.png");
+}
+
+/* for larger favicons (which includes the fallback icon) */
+richgriditem:not([iconURI]) .tile-icon-box,
+richgriditem[iconURI=""] .tile-icon-box,
+richgriditem[iconsize="large"] .tile-icon-box {
+  background-color: transparent!important;
+  border-color: transparent!important;
+  padding: 4px;
+}
+
+richgriditem[iconsize="large"] .tile-icon-box > image,
+.tile-icon-box > image[src=""] {
   width: 24px;
   height: 24px;
-  list-style-image: url("chrome://browser/skin/images/identity-icons-generic.png");
 }
 
 .tile-desc {
   display: block;
   position: absolute;
-  bottom: 0;
+  top: 6px;
+  left: 52px; /* label goes to the right of the favicon */
   right: 0;
-  left: 20px; /* the colored bar in the default tile is the background color peeking through */
-  z-index: 1;
-  padding: 4px 8px;
+  padding: 1em 6px 6px 12px;
   color: #333;
   margin: 0;
   -moz-margin-start: 0;
   display: block;
-  font-size: 20px;
+  font-size: 16px;
   overflow: hidden;
   white-space: nowrap;
   text-overflow: ellipsis;
 }
 
+richgriditem:not([tiletype="thumbnail"]) .tile-desc {
+  background-color: transparent!important;
+}
+
+
 richgriditem.collapsed {
   height: 0!important;
   overflow: hidden;
   opacity: 0;
 }
 
 richgriditem.collapsed > .tile-content {
   transform: scaleY(0);
@@ -142,40 +169,46 @@ richgriditem[tiletype="thumbnail"] {
   width: @grid_double_column_width@;
   height: @grid_double_row_height@;
   -moz-box-pack: end;
   padding: 0px;
   color: #1a1a1a;
 }
 
 richgriditem[tiletype="thumbnail"] .tile-desc {
-  background: transparent;
-  margin: 0px;
+  margin: 0;
+  top: auto;
+  bottom: 0;
   left: 0;
+  padding: 4px 8px 4px 56px;
 }
 
 richgriditem[tiletype="thumbnail"] > .tile-content > .tile-desc {
   /* ensure thumbnail labels get their color from the parent richgriditem element */
   color: inherit;
 }
 
-/* put the image in place of the icon if there is an image background */
+/* thumbnail tiles use a screenshot thumbnail as the background */
 richgriditem[tiletype="thumbnail"] > .tile-content > .tile-start-container {
   background-size: cover;
   background-position: top left;
   background-repeat: no-repeat;
   position: absolute;
   top: 0;
-  bottom: 32px; /* TODO: should be some em value? */;
+  bottom: 0;
   right: 0;
   left: 0;
-  background-color: hsla(0,2%,98%,.95);
 }
 richgriditem[tiletype="thumbnail"] .tile-icon-box {
-  visibility: collapse;
+  top: auto;
+  left: 10px;
+  bottom: 6px;
+  margin-top: 0;
+  z-index: 1;
+  box-shadow: 0px 0px 2px 2px rgba(0, 0, 0, 0.05), 0px 2px 0px rgba(0, 0, 0, 0.1);
 }
 
 /* selected tile indicator */
 richgriditem[selected] > .tile-content::after {
   content: "";
   pointer-events: none;
   display: block;
   position: absolute;
@@ -257,35 +290,17 @@ richgriditem[bending] > .tile-content {
 
   richgriditem {
     width: @grid_double_column_width@;
     overflow: hidden;
     height: @compactgrid_row_height@;
   }
 
   .tile-desc {
-    top: 0;
-    left: 44px; /* label goes to the right of the favicon */
-    right: 0;
-    padding: 8px;
-  }
-
-  .tile-start-container {
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    right: 0;
-    left: 6px;
-    background: #fff;
-    padding: 8px;
-  }
-  .tile-icon-box {
-    padding: 2px;
-    background: #fff;
-    opacity: 1.0;
+    padding: 0.5em 4px 4px 4px;
   }
 
   .tile-content {
     left: 0;
     right: 0;
   }
 
   richgriditem {

--- a/toolkit/components/passwordmgr/test/test_basic_form.html
+++ b/toolkit/components/passwordmgr/test/test_basic_form.html
@@ -3,45 +3,44 @@
 <head>
   <title>Test for Login Manager</title>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>  
   <script type="text/javascript" src="pwmgr_common.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body>
 Login Manager test: simple form fill
+
+<script>
+commonInit();
+SimpleTest.waitForExplicitFinish();
+
+/** Test for Login Manager: form fill, multiple forms. **/
+
+function startTest() {
+  is($_(1, "uname").value, "testuser", "Checking for filled username");
+  is($_(1, "pword").value, "testpass", "Checking for filled password");
+
+  SimpleTest.finish();
+}
+
+window.onload = startTest;
+</script>
+
 <p id="display"></p>
 
 <div id="content" style="display: none">
 
   <form id="form1" action="formtest.js">
     <p>This is form 1.</p>
     <input  type="text"       name="uname">
     <input  type="password"   name="pword">
 
     <button type="submit">Submit</button>
     <button type="reset"> Reset </button>
   </form>
 
 </div>
 
-<pre id="test">
-<script class="testbody" type="text/javascript">
-commonInit();
-/** Test for Login Manager: form fill, multiple forms. **/
-
-// Make sure that all forms in a document are processed.
-
-function startTest() {
-  is($_(1, "uname").value, "testuser", "Checking for filled username");
-  is($_(1, "pword").value, "testpass", "Checking for filled password");
-
-  SimpleTest.finish();
-}
-
-window.onload = startTest;
-
-SimpleTest.waitForExplicitFinish();
-</script>
-</pre>
+<pre id="test"></pre>
 </body>
 </html>
 

--- a/toolkit/components/passwordmgr/test/test_basic_form_2.html
+++ b/toolkit/components/passwordmgr/test/test_basic_form_2.html
@@ -3,16 +3,26 @@
 <head>
   <title>Test for Login Manager</title>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>  
   <script type="text/javascript" src="pwmgr_common.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body>
 Login Manager test: simple form fill with autofillForms disabled
+<script>
+commonInit();
+SimpleTest.waitForExplicitFinish();
+
+var pwmgr = SpecialPowers.Cc["@mozilla.org/login-manager;1"]
+                         .getService(SpecialPowers.Ci.nsILoginManager);
+// Assume that the pref starts out true, so set to false
+SpecialPowers.setBoolPref("signon.autofillForms", false);
+</script>
+
 <p id="display"></p>
 
 <div id="content" style="display: block">
 
   <form id="form1" action="formtest.js">
     <p>This is form 1.</p>
     <input  type="text"       name="uname">
     <input  type="password"   name="pword">
@@ -23,47 +33,33 @@ Login Manager test: simple form fill wit
 
 </div>
 
 <pre id="test">
 <script class="testbody" type="text/javascript">
 
 /** Test for Login Manager: simple form fill with autofillForms disabled **/
 
-commonInit();
-
-netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
-
-var pwmgr = Components.classes["@mozilla.org/login-manager;1"].
-            getService(Components.interfaces.nsILoginManager);
-var prefs = Components.classes["@mozilla.org/preferences-service;1"].
-            getService(Components.interfaces.nsIPrefService);
-prefs = prefs.getBranch("signon.");
-// Assume that the pref starts out true, so set to false
-prefs.setBoolPref("autofillForms", false);
-
 function startTest(){
   netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
   // Ensure the form is empty at start
   is($_(1, "uname").value, "", "Checking for blank username");
   is($_(1, "pword").value, "", "Checking for blank password");
 
   // Call the public method, check return value
   is(pwmgr.fillForm(document.getElementById("form1")), true,
      "Checking return value of fillForm");
 
   // Check that the form was filled
   is($_(1, "uname").value, "testuser", "Checking for filled username");
   is($_(1, "pword").value, "testpass", "Checking for filled password");
 
   // Reset pref (since we assumed it was true to start)
-  prefs.setBoolPref("autofillForms", true);
+  SpecialPowers.setBoolPref("signon.autofillForms", true);
 
   SimpleTest.finish();
 }
-
 window.onload = startTest;
 
-SimpleTest.waitForExplicitFinish();
 </script>
 </pre>
 </body>
 </html>

--- a/toolkit/components/passwordmgr/test/test_basic_form_autocomplete.html
+++ b/toolkit/components/passwordmgr/test/test_basic_form_autocomplete.html
@@ -4,96 +4,24 @@
   <title>Test for Login Manager</title>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>  
   <script type="text/javascript" src="/tests/SimpleTest/EventUtils.js"></script>
   <script type="text/javascript" src="pwmgr_common.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body>
 Login Manager test: multiple login autocomplete
-<p id="display"></p>
 
-<!-- we presumably can't hide the content for this test. -->
-<div id="content">
-
-  <!-- form1 tests multiple matching logins -->
-  <form id="form1" action="http://autocomplete:8888/formtest.js" onsubmit="return false;">
-    <input  type="text"       name="uname">
-    <input  type="password"   name="pword">
-    <button type="submit">Submit</button>
-  </form>
-
-  <!-- other forms test single logins, with autocomplete=off set -->
-  <form id="form2" action="http://autocomplete2" onsubmit="return false;">
-    <input  type="text"       name="uname">
-    <input  type="password"   name="pword" autocomplete="off">
-    <button type="submit">Submit</button>
-  </form>
-
-  <form id="form3" action="http://autocomplete2" onsubmit="return false;">
-    <input  type="text"       name="uname" autocomplete="off">
-    <input  type="password"   name="pword">
-    <button type="submit">Submit</button>
-  </form>
-
-  <form id="form4" action="http://autocomplete2" onsubmit="return false;" autocomplete="off">
-    <input  type="text"       name="uname">
-    <input  type="password"   name="pword">
-    <button type="submit">Submit</button>
-  </form>
-
-  <form id="form5" action="http://autocomplete2" onsubmit="return false;">
-    <input  type="text"       name="uname" autocomplete="off">
-    <input  type="password"   name="pword" autocomplete="off">
-    <button type="submit">Submit</button>
-  </form>
-
-  <!-- control -->
-  <form id="form6" action="http://autocomplete2" onsubmit="return false;">
-    <input  type="text"       name="uname">
-    <input  type="password"   name="pword">
-    <button type="submit">Submit</button>
-  </form>
-
-  <!-- This form will be manipulated to insert a different username field. -->
-  <form id="form7" action="http://autocomplete3" onsubmit="return false;">
-    <input  type="text"       name="uname">
-    <input  type="password"   name="pword">
-    <button type="submit">Submit</button>
-  </form>
-
-  <!-- test for no autofill after onblur with blank username -->
-  <form id="form8" action="http://autocomplete4" onsubmit="return false;">
-    <input  type="text"       name="uname">
-    <input  type="password"   name="pword">
-    <button type="submit">Submit</button>
-  </form>
-
-  <!-- test autocomplete dropdown -->
-  <form id="form9" action="http://autocomplete5" onsubmit="return false;">
-    <input  type="text"       name="uname">
-    <input  type="password"   name="pword">
-    <button type="submit">Submit</button>
-  </form>
-</div>
-
-<pre id="test">
-<script class="testbody" type="text/javascript">
-
-/** Test for Login Manager: multiple login autocomplete. **/
-
+<script>
 commonInit();
-
-var uname = $_(1, "uname");
-var pword = $_(1, "pword");
-const shiftModifier = Components.interfaces.nsIDOMEvent.SHIFT_MASK;
+SimpleTest.waitForExplicitFinish();
 
 // Get the pwmgr service
-var pwmgr = SpecialPowers.wrap(Components).classes["@mozilla.org/login-manager;1"]
-                         .getService(Components.interfaces.nsILoginManager);
+var pwmgr = SpecialPowers.Cc["@mozilla.org/login-manager;1"]
+                         .getService(SpecialPowers.Ci.nsILoginManager);
 ok(pwmgr != null, "nsLoginManager service");
 
 // Create some logins just for this form, since we'll be deleting them.
 var nsLoginInfo =
 SpecialPowers.wrap(Components).Constructor("@mozilla.org/login-manager/loginInfo;1",
                           Components.interfaces.nsILoginInfo, "init");
 ok(nsLoginInfo != null, "nsLoginInfo constructor");
 
@@ -159,16 +87,92 @@ try {
     pwmgr.addLogin(login6B);
     pwmgr.addLogin(login7);
     pwmgr.addLogin(login8A);
     pwmgr.addLogin(login8B);
 } catch (e) {
     ok(false, "addLogin threw: " + e);
 }
 
+</script>
+<p id="display"></p>
+
+<!-- we presumably can't hide the content for this test. -->
+<div id="content">
+
+  <!-- form1 tests multiple matching logins -->
+  <form id="form1" action="http://autocomplete:8888/formtest.js" onsubmit="return false;">
+    <input  type="text"       name="uname">
+    <input  type="password"   name="pword">
+    <button type="submit">Submit</button>
+  </form>
+
+  <!-- other forms test single logins, with autocomplete=off set -->
+  <form id="form2" action="http://autocomplete2" onsubmit="return false;">
+    <input  type="text"       name="uname">
+    <input  type="password"   name="pword" autocomplete="off">
+    <button type="submit">Submit</button>
+  </form>
+
+  <form id="form3" action="http://autocomplete2" onsubmit="return false;">
+    <input  type="text"       name="uname" autocomplete="off">
+    <input  type="password"   name="pword">
+    <button type="submit">Submit</button>
+  </form>
+
+  <form id="form4" action="http://autocomplete2" onsubmit="return false;" autocomplete="off">
+    <input  type="text"       name="uname">
+    <input  type="password"   name="pword">
+    <button type="submit">Submit</button>
+  </form>
+
+  <form id="form5" action="http://autocomplete2" onsubmit="return false;">
+    <input  type="text"       name="uname" autocomplete="off">
+    <input  type="password"   name="pword" autocomplete="off">
+    <button type="submit">Submit</button>
+  </form>
+
+  <!-- control -->
+  <form id="form6" action="http://autocomplete2" onsubmit="return false;">
+    <input  type="text"       name="uname">
+    <input  type="password"   name="pword">
+    <button type="submit">Submit</button>
+  </form>
+
+  <!-- This form will be manipulated to insert a different username field. -->
+  <form id="form7" action="http://autocomplete3" onsubmit="return false;">
+    <input  type="text"       name="uname">
+    <input  type="password"   name="pword">
+    <button type="submit">Submit</button>
+  </form>
+
+  <!-- test for no autofill after onblur with blank username -->
+  <form id="form8" action="http://autocomplete4" onsubmit="return false;">
+    <input  type="text"       name="uname">
+    <input  type="password"   name="pword">
+    <button type="submit">Submit</button>
+  </form>
+
+  <!-- test autocomplete dropdown -->
+  <form id="form9" action="http://autocomplete5" onsubmit="return false;">
+    <input  type="text"       name="uname">
+    <input  type="password"   name="pword">
+    <button type="submit">Submit</button>
+  </form>
+</div>
+
+<pre id="test">
+<script class="testbody" type="text/javascript">
+
+/** Test for Login Manager: multiple login autocomplete. **/
+
+
+var uname = $_(1, "uname");
+var pword = $_(1, "pword");
+const shiftModifier = Components.interfaces.nsIDOMEvent.SHIFT_MASK;
 
 // Restore the form to the default state.
 function restoreForm() {
     uname.value = "";
     pword.value = "";
     uname.focus();
 }
 
@@ -807,15 +811,13 @@ function startTest() {
     // shouldn't reach into browser internals like this and
     // shouldn't assume ID is consistent across products
     autocompletePopup = chromeWin.document.getElementById("PopupAutoComplete");
     ok(autocompletePopup, "Got autocomplete popup");
     runTest(1);
 }
 
 window.onload = startTest;
-
-SimpleTest.waitForExplicitFinish();
 </script>
 </pre>
 </body>
 </html>
 

--- a/toolkit/components/passwordmgr/test/test_basic_form_html5.html
+++ b/toolkit/components/passwordmgr/test/test_basic_form_html5.html
@@ -3,16 +3,49 @@
 <head>
   <title>Test for Login Manager</title>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>  
   <script type="text/javascript" src="pwmgr_common.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body>
 Login Manager test: html5 input types (email, tel, url, etc.)
+<script>
+commonInit();
+SimpleTest.waitForExplicitFinish();
+
+const Ci = SpecialPowers.Ci;
+const Cc = SpecialPowers.Cc;
+pwmgr = Cc["@mozilla.org/login-manager;1"].
+        getService(Ci.nsILoginManager);
+
+login1  = Cc["@mozilla.org/login-manager/loginInfo;1"].
+           createInstance(Ci.nsILoginInfo);
+login2  = Cc["@mozilla.org/login-manager/loginInfo;1"].
+           createInstance(Ci.nsILoginInfo);
+login3  = Cc["@mozilla.org/login-manager/loginInfo;1"].
+           createInstance(Ci.nsILoginInfo);
+login4  = Cc["@mozilla.org/login-manager/loginInfo;1"].
+           createInstance(Ci.nsILoginInfo);
+
+login1.init("http://mochi.test:8888", "http://bug600551-1", null,
+            "testuser@example.com", "testpass1", "", "");
+login2.init("http://mochi.test:8888", "http://bug600551-2", null,
+            "555-555-5555", "testpass2", "", "");
+login3.init("http://mochi.test:8888", "http://bug600551-3", null,
+            "http://mozilla.org", "testpass3", "", "");
+login4.init("http://mochi.test:8888", "http://bug600551-4", null,
+            "123456789", "testpass4", "", "");
+
+pwmgr.addLogin(login1);
+pwmgr.addLogin(login2);
+pwmgr.addLogin(login3);
+pwmgr.addLogin(login4);
+</script>
+
 <p id="display"></p>
 <div id="content" style="display: none">
 
   <form id="form1" action="http://bug600551-1">
     <input  type="email"    name="uname">
     <input  type="password" name="pword">
     <button type="submit">Submit</button>
   </form>
@@ -94,48 +127,16 @@ Login Manager test: html5 input types (e
 
 </div>
 <pre id="test">
 <script class="testbody" type="text/javascript">
 
 /* Test for Login Manager: 600551
   (Password manager not working with input type=email)
  */
-commonInit();
-
-netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
-
-const Ci = Components.interfaces;
-const Cc = Components.classes;
-pwmgr = Cc["@mozilla.org/login-manager;1"].
-        getService(Ci.nsILoginManager);
-
-login1  = Cc["@mozilla.org/login-manager/loginInfo;1"].
-           createInstance(Ci.nsILoginInfo);
-login2  = Cc["@mozilla.org/login-manager/loginInfo;1"].
-           createInstance(Ci.nsILoginInfo);
-login3  = Cc["@mozilla.org/login-manager/loginInfo;1"].
-           createInstance(Ci.nsILoginInfo);        
-login4  = Cc["@mozilla.org/login-manager/loginInfo;1"].
-           createInstance(Ci.nsILoginInfo);
-
-login1.init("http://mochi.test:8888", "http://bug600551-1", null,
-            "testuser@example.com", "testpass1", "", "");
-login2.init("http://mochi.test:8888", "http://bug600551-2", null,
-            "555-555-5555", "testpass2", "", "");
-login3.init("http://mochi.test:8888", "http://bug600551-3", null,
-            "http://mozilla.org", "testpass3", "", "");
-login4.init("http://mochi.test:8888", "http://bug600551-4", null,
-            "123456789", "testpass4", "", "");
-
-pwmgr.addLogin(login1);
-pwmgr.addLogin(login2);
-pwmgr.addLogin(login3);
-pwmgr.addLogin(login4);
-
 function startTest() {
   netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
 
   checkForm(1, "testuser@example.com", "testpass1");
   checkForm(2, "555-555-5555", "testpass2");
   checkForm(3, "http://mozilla.org", "testpass3");
   checkForm(4, "123456789", "testpass4");
   
@@ -161,15 +162,12 @@ function startTest() {
   pwmgr.removeLogin(login2);
   pwmgr.removeLogin(login3);
   pwmgr.removeLogin(login4);
  
   SimpleTest.finish();
 }
 
 window.onload = startTest;
-
-SimpleTest.waitForExplicitFinish();
-
 </script>
 </pre>
 </body>
 </html>

--- a/toolkit/components/passwordmgr/test/test_basic_form_observer_autocomplete.html
+++ b/toolkit/components/passwordmgr/test/test_basic_form_observer_autocomplete.html
@@ -3,53 +3,55 @@
 <head>
   <title>Test for Login Manager</title>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>  
   <script type="text/javascript" src="pwmgr_common.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body>
 Login Manager test: simple form with autocomplete off and notifying observers & normal form
+<script>
+const Cc = SpecialPowers.Cc;
+const Ci = SpecialPowers.Ci;
+netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
+const Cu = Components.utils;
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+
+commonInit();
+SimpleTest.waitForExplicitFinish();
+</script>
+
 <p id="display"></p>
 
 <div id="content" style="display: block">
 
   <form id="form1" action="formtest.js" autocomplete="off">
     <p>This is form 1.</p>
     <input  type="text"       name="uname">
     <input  type="password"   name="pword">
 
     <button type="submit">Submit</button>
     <button type="reset"> Reset </button>
   </form>
-  
+
   <form id="form2" action="formtest.js">
     <p>This is form 2.</p>
     <input  type="text"       name="uname">
     <input  type="password"   name="pword">
 
     <button type="submit">Submit</button>
     <button type="reset"> Reset </button>
   </form>
 
 </div>
 
 <pre id="test">
 <script class="testbody" type="text/javascript">
 
 /** Test for Login Manager: simple form with autocomplete off and notifying observers & normal form **/
-
-commonInit();
-netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
-const Cc = Components.classes;
-const Ci = Components.interfaces;
-const Cu = Components.utils;
-
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-
 var TestObserver = {
   receivedNotification1 : false,
   receivedNotification2 : false,
   data1 : "",
   data2 : "",
   QueryInterface : XPCOMUtils.generateQI([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
   observe : function (subject, topic, data) {
     netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
@@ -94,14 +96,12 @@ function startTest(){
 
   // Remove the observer
   os.removeObserver(TestObserver, "passwordmgr-found-form");
 
   SimpleTest.finish();
 }
 
 window.onload = startTest;
-
-SimpleTest.waitForExplicitFinish();
 </script>
 </pre>
 </body>
 </html>

--- a/toolkit/components/passwordmgr/test/test_basic_form_observer_autofillForms.html
+++ b/toolkit/components/passwordmgr/test/test_basic_form_observer_autofillForms.html
@@ -3,16 +3,31 @@
 <head>
   <title>Test for Login Manager</title>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>  
   <script type="text/javascript" src="pwmgr_common.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body>
 Login Manager test: simple form with autofillForms disabled and notifying observers
+<script>
+commonInit();
+SimpleTest.waitForExplicitFinish();
+
+const Cc = SpecialPowers.Cc;
+const Ci = SpecialPowers.Ci;
+netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
+const Cu = Components.utils;
+
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+
+// Assume that the pref starts out true, so set to false
+SpecialPowers.setBoolPref("signon.autofillForms", false);
+</script>
+
 <p id="display"></p>
 
 <div id="content" style="display: block">
 
   <form id="form1" action="formtest.js">
     <p>This is form 1.</p>
     <input  type="text"       name="uname">
     <input  type="password"   name="pword">
@@ -23,30 +38,16 @@ Login Manager test: simple form with aut
 
 </div>
 
 <pre id="test">
 <script class="testbody" type="text/javascript">
 
 /** Test for Login Manager: simple form with autofillForms disabled and notifying observers **/
 
-commonInit();
-netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
-const Cc = Components.classes;
-const Ci = Components.interfaces;
-const Cu = Components.utils;
-
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-
-var prefs = Cc["@mozilla.org/preferences-service;1"].
-            getService(Ci.nsIPrefService);
-prefs = prefs.getBranch("signon.");
-// Assume that the pref starts out true, so set to false
-prefs.setBoolPref("autofillForms", false);
-
 var TestObserver = {
   receivedNotificationFoundForm : false,
   receivedNotificationFoundLogins : false,
   dataFoundForm : "",
   dataFoundLogins : null,
   QueryInterface : XPCOMUtils.generateQI([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
   observe : function (subject, topic, data) {
     netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
@@ -87,24 +88,22 @@ function startTest(){
   is(TestObserver.dataFoundLogins.get("passwordField"), $_(1, "pword"), "Checking password field is correct");
   is(TestObserver.dataFoundLogins.get("foundLogins").constructor.name, "Array", "Checking foundLogins is array");
   is(TestObserver.dataFoundLogins.get("foundLogins").length, 1, "Checking foundLogins contains one login");
   ok(TestObserver.dataFoundLogins.get("selectedLogin").QueryInterface(Ci.nsILoginInfo), "Checking selectedLogin is nsILoginInfo");
   ok(TestObserver.dataFoundLogins.get("selectedLogin").equals(TestObserver.dataFoundLogins.get("foundLogins")[0]),
      "Checking selectedLogin is found login");
 
   // Reset pref (since we assumed it was true to start)
-  prefs.setBoolPref("autofillForms", true);
+  SpecialPowers.setBoolPref("signon.autofillForms", true);
 
   // Remove the observer
   os.removeObserver(TestObserver, "passwordmgr-found-form");
   os.removeObserver(TestObserver, "passwordmgr-found-logins");
 
   SimpleTest.finish();
 }
 
 window.onload = startTest;
-
-SimpleTest.waitForExplicitFinish();
 </script>
 </pre>
 </body>
 </html>

--- a/toolkit/components/passwordmgr/test/test_basic_form_observer_foundLogins.html
+++ b/toolkit/components/passwordmgr/test/test_basic_form_observer_foundLogins.html
@@ -3,29 +3,80 @@
 <head>
   <title>Test for Login Manager</title>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>  
   <script type="text/javascript" src="pwmgr_common.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body>
 Login Manager test: notifying observers of passwordmgr-found-logins
+<script>
+commonInit();
+SimpleTest.waitForExplicitFinish();
+
+const Cc = SpecialPowers.Cc;
+const Ci = SpecialPowers.Ci;
+netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
+const Cu = Components.utils;
+
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+
+// Configure the login manager with two logins for one of the forms
+// so we can do a multiple logins test.
+var nsLoginInfo =
+  new Components.Constructor("@mozilla.org/login-manager/loginInfo;1",
+                             Components.interfaces.nsILoginInfo);
+var login1 = new nsLoginInfo();
+login1.init("http://mochi.test:8888", "http://www.example.com", null,
+            "testuser1", "testpass1", "uname", "pword");
+var login2 = new nsLoginInfo();
+login2.init("http://mochi.test:8888", "http://www.example.com", null,
+            "testuser2", "testpass2", "uname", "pword");
+var pwmgr = Cc["@mozilla.org/login-manager;1"].
+            getService(Ci.nsILoginManager);
+pwmgr.addLogin(login1);
+pwmgr.addLogin(login2);
+
+var TestObserver = {
+  results: {},
+  QueryInterface : XPCOMUtils.generateQI([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
+  observe : function (subject, topic, data) {
+    netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
+    if (topic == "passwordmgr-found-logins") {
+      var formInfo = subject.QueryInterface(Ci.nsIPropertyBag2);
+      var id = formInfo.get("passwordField").form.id;
+      this.results[id].receivedNotification = true;
+      this.results[id].data = formInfo;
+    }
+  }
+};
+
+// Initialize the object that stores the results of notifications.
+for (var formID of ["form1", "form2", "form3", "form4", "form5"])
+  TestObserver.results[formID] = { receivedNotification: false, data: null };
+
+// Add the observer
+var os = Cc["@mozilla.org/observer-service;1"].
+         getService(Ci.nsIObserverService);
+os.addObserver(TestObserver, "passwordmgr-found-logins", false);
+</script>
+
 <p id="display"></p>
 
 <div id="content" style="display: block">
 
   <form id="form1" action="formtest.js">
     <p>This is form 1.</p>
     <input  type="text"       name="uname">
     <input  type="password"   name="pword">
 
     <button type="submit">Submit</button>
     <button type="reset"> Reset </button>
   </form>
-  
+
   <form id="form2" action="formtest.js">
     <p>This is form 2.</p>
     <input  type="text"       name="uname" value="existing">
     <input  type="password"   name="pword">
 
     <button type="submit">Submit</button>
     <button type="reset"> Reset </button>
   </form>
@@ -59,63 +110,16 @@ Login Manager test: notifying observers 
 
 </div>
 
 <pre id="test">
 <script class="testbody" type="text/javascript">
 
 /** Test for Login Manager: notifying observers of passwordmgr-found-logins **/
 
-commonInit();
-netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
-const Cc = Components.classes;
-const Ci = Components.interfaces;
-const Cu = Components.utils;
-
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-
-// Configure the login manager with two logins for one of the forms
-// so we can do a multiple logins test.
-var nsLoginInfo =
-  new Components.Constructor("@mozilla.org/login-manager/loginInfo;1",
-                             Components.interfaces.nsILoginInfo);
-var login1 = new nsLoginInfo();
-login1.init("http://mochi.test:8888", "http://www.example.com", null,
-            "testuser1", "testpass1", "uname", "pword");
-var login2 = new nsLoginInfo();
-login2.init("http://mochi.test:8888", "http://www.example.com", null,
-            "testuser2", "testpass2", "uname", "pword");
-var pwmgr = Cc["@mozilla.org/login-manager;1"].
-            getService(Ci.nsILoginManager);
-pwmgr.addLogin(login1);
-pwmgr.addLogin(login2);
-
-var TestObserver = {
-  results: {},
-  QueryInterface : XPCOMUtils.generateQI([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
-  observe : function (subject, topic, data) {
-    netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
-    if (topic == "passwordmgr-found-logins") {
-      var formInfo = subject.QueryInterface(Ci.nsIPropertyBag2);
-      var id = formInfo.get("passwordField").form.id;
-      this.results[id].receivedNotification = true;
-      this.results[id].data = formInfo;
-    }
-  }
-};
-
-// Initialize the object that stores the results of notifications.
-for (var formID of ["form1", "form2", "form3", "form4", "form5"])
-  TestObserver.results[formID] = { receivedNotification: false, data: null };
-
-// Add the observer
-var os = Cc["@mozilla.org/observer-service;1"].
-         getService(Ci.nsIObserverService);
-os.addObserver(TestObserver, "passwordmgr-found-logins", false);
-
 function startTest(){
   netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
 
   // Test notification of a form that was filled.
   is(TestObserver.results["form1"].receivedNotification, true, "Checking observer was notified");
   is(TestObserver.results["form1"].data.get("didntFillReason"), null, "Checking didntFillReason is null");
   is(TestObserver.results["form1"].data.get("usernameField"), $_(1, "uname"), "Checking username field is correct");
   is(TestObserver.results["form1"].data.get("passwordField"), $_(1, "pword"), "Checking password field is correct");
@@ -176,14 +180,12 @@ function startTest(){
   // Remove the logins added for the multiple logins test.
   pwmgr.removeLogin(login1);
   pwmgr.removeLogin(login2);
 
   SimpleTest.finish();
 }
 
 window.onload = startTest;
-
-SimpleTest.waitForExplicitFinish();
 </script>
 </pre>
 </body>
 </html>

--- a/toolkit/components/passwordmgr/test/test_basic_form_pwonly.html
+++ b/toolkit/components/passwordmgr/test/test_basic_form_pwonly.html
@@ -3,16 +3,49 @@
 <head>
   <title>Test for Login Manager</title>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>  
   <script type="text/javascript" src="pwmgr_common.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body>
 Login Manager test: forms and logins without a username.
+<script>
+commonInit();
+SimpleTest.waitForExplicitFinish();
+
+var pwmgr = SpecialPowers.Cc["@mozilla.org/login-manager;1"]
+                         .getService(SpecialPowers.Ci.nsILoginManager);
+
+var nsLoginInfo = new Components.Constructor("@mozilla.org/login-manager/loginInfo;1", Components.interfaces.nsILoginInfo);
+ok(nsLoginInfo != null, "nsLoginInfo constructor");
+
+// pwlogin1 uses a unique formSubmitURL, to check forms where no other logins
+// will apply. pwlogin2 uses the normal formSubmitURL, so that we can test
+// forms with a mix of username and non-username logins that might apply.
+//
+// Note: pwlogin2 is deleted at the end of the test.
+
+pwlogin1 = new nsLoginInfo();
+pwlogin2 = new nsLoginInfo();
+
+pwlogin1.init("http://mochi.test:8888", "http://mochi.test:1111", null,
+    "", "1234", "uname", "pword");
+
+pwlogin2.init("http://mochi.test:8888", "http://mochi.test:8888", null,
+    "", "1234", "uname", "pword");
+
+try {
+    pwmgr.addLogin(pwlogin1);
+    pwmgr.addLogin(pwlogin2);
+} catch (e) {
+    ok(false, "addLogin threw: " + e);
+}
+
+</script>
 <p id="display"></p>
 
 <div id="content" style="display: none">
 
 
 <!-- simple form: no username field, 1 password field -->
 <form id='form1' action='http://mochi.test:1111/formtest.js'> 1
     <input type='password' name='pname' value=''>
@@ -149,18 +182,16 @@ password-only, the other is username+pas
 
 
 </div>
 
 <pre id="test">
 <script class="testbody" type="text/javascript">
 
 /** Test for Login Manager: password-only logins **/
-
-commonInit();
 function startTest() {
 
     checkForm(1, "1234");
     checkForm(2, "1234", "");
     checkForm(3, "1234", "", "");
     checkUnmodifiedForm(4);
 
     checkForm(5, "", "1234");
@@ -176,55 +207,14 @@ function startTest() {
     checkUnmodifiedForm(12);
     checkUnmodifiedForm(13);
 
     netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
     pwmgr.removeLogin(pwlogin2);
     SimpleTest.finish();
 }
 
-
-netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
-
-// Get the pwmgr service
-var Cc_pwmgr = Components.classes["@mozilla.org/login-manager;1"];
-ok(Cc_pwmgr != null, "Access Cc[@mozilla.org/login-manager;1]");
-
-var Ci_pwmgr = Components.interfaces.nsILoginManager;
-ok(Ci_pwmgr != null, "Access Ci.nsILoginManager");
-
-var pwmgr = Cc_pwmgr.getService(Ci_pwmgr);
-ok(pwmgr != null, "pwmgr getService()");
-
-
-var nsLoginInfo = new Components.Constructor("@mozilla.org/login-manager/loginInfo;1", Components.interfaces.nsILoginInfo);
-ok(nsLoginInfo != null, "nsLoginInfo constructor");
-
-// pwlogin1 uses a unique formSubmitURL, to check forms where no other logins
-// will apply. pwlogin2 uses the normal formSubmitURL, so that we can test
-// forms with a mix of username and non-username logins that might apply.
-//
-// Note: pwlogin2 is deleted at the end of the test.
-
-pwlogin1 = new nsLoginInfo();
-pwlogin2 = new nsLoginInfo();
-
-pwlogin1.init("http://mochi.test:8888", "http://mochi.test:1111", null,
-    "", "1234", "uname", "pword");
-
-pwlogin2.init("http://mochi.test:8888", "http://mochi.test:8888", null,
-    "", "1234", "uname", "pword");
-
-try {
-    pwmgr.addLogin(pwlogin1);
-    pwmgr.addLogin(pwlogin2);
-} catch (e) {
-    ok(false, "addLogin threw: " + e);
-}
-
 window.onload = startTest;
-
-SimpleTest.waitForExplicitFinish();
 </script>
 </pre>
 </body>
 </html>
 

--- a/toolkit/components/passwordmgr/test/test_bug_227640.html
+++ b/toolkit/components/passwordmgr/test/test_bug_227640.html
@@ -3,19 +3,27 @@
 <head>
   <title>Test for Login Manager</title>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>  
   <script type="text/javascript" src="pwmgr_common.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body>
 Login Manager test: 227640
+<script>
+commonInit();
+SimpleTest.waitForExplicitFinish();
+
+var pwmgr = SpecialPowers.Cc["@mozilla.org/login-manager;1"]
+                         .getService(SpecialPowers.Ci.nsILoginManager);
+</script>
+
 <p id="display"></p>
 <div id="content" style="display: none">
-  
+
   <!-- no autocomplete for password field -->
   <form id="form1" onsubmit="return checkSubmit(1)" method="get">
     <input  type="text"       name="uname" value="">
     <input  type="password"   name="pword" value="" autocomplete=off>
 
     <button type="submit">Submit</button>
     <button type="reset"> Reset </button>
   </form>
@@ -142,17 +150,16 @@ Login Manager test: 227640
   </form>
 
 </div>
 <pre id="test">
 <script class="testbody" type="text/javascript">
 
 /** Test for Login Manager: 227640 (password is saved even when the
     password field has autocomplete="off") **/
-commonInit();
 
 // This test ensures that pwmgr does not save a username or password when
 // autocomplete=off is present.
 
 var numStartingLogins = 0;
 var numSubmittedForms = 0;
 
 function startTest() {
@@ -225,31 +232,14 @@ function getFormSubmitButton(formNum) {
 // Counts the number of logins currently stored by password manager.
 function countLogins() {
   netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
 
   var logins = pwmgr.getAllLogins();
 
   return logins.length;
 }
-
-// Get the pwmgr service
-netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
-
-var Cc_pwmgr = Components.classes["@mozilla.org/login-manager;1"];
-ok(Cc_pwmgr != null, "Access Cc[@mozilla.org/login-manager;1]");
-
-var Ci_pwmgr = Components.interfaces.nsILoginManager;
-ok(Ci_pwmgr != null, "Access Ci.nsILoginManager");
-
-var pwmgr = Cc_pwmgr.getService(Ci_pwmgr);
-ok(pwmgr != null, "pwmgr getService()");
-
-
 window.onload = startTest;
-
-SimpleTest.waitForExplicitFinish();
-
 </script>
 </pre>
 </body>
 </html>
 

--- a/toolkit/components/passwordmgr/test/test_bug_427033.html
+++ b/toolkit/components/passwordmgr/test/test_bug_427033.html
@@ -3,71 +3,49 @@
 <head>
   <title>Test for Login Manager</title>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>  
   <script type="text/javascript" src="pwmgr_common.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body>
 Login Manager test: form with JS submit action
+<script>
+SimpleTest.waitForExplicitFinish();
+var pwmgr = SpecialPowers.Cc["@mozilla.org/login-manager;1"]
+                         .getService(SpecialPowers.Ci.nsILoginManager);
+var jslogin = SpecialPowers.Cc["@mozilla.org/login-manager/loginInfo;1"]
+                           .createInstance(SpecialPowers.Ci.nsILoginInfo);
+jslogin.init("http://mochi.test:8888", "javascript:", null,
+              "jsuser", "jspass123", "uname", "pword");
+pwmgr.addLogin(jslogin);
+
+/** Test for Login Manager: JS action URL **/
+
+function startTest() {
+    checkForm(1, "jsuser", "jspass123");
+
+    pwmgr.removeLogin(jslogin);
+    SimpleTest.finish();
+}
+
+window.onload = startTest;
+</script>
+
 <p id="display"></p>
 
 <div id="content" style="display: none">
 
 
 <form id='form1' action='javascript:alert("never shows")'> 1
     <input name="uname">
     <input name="pword" type="password">
 
     <button type='submit'>Submit</button>
     <button type='reset'> Reset </button>
 </form>
 
 </div>
 
-<pre id="test">
-<script class="testbody" type="text/javascript">
-
-/** Test for Login Manager: JS action URL **/
-
-function startTest() {
-
-    checkForm(1, "jsuser", "jspass123");
-
-    netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
-    pwmgr.removeLogin(jslogin);
-    SimpleTest.finish();
-}
-
-
-netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
-
-// Get the pwmgr service
-var Cc_pwmgr = Components.classes["@mozilla.org/login-manager;1"];
-ok(Cc_pwmgr != null, "Access Cc[@mozilla.org/login-manager;1]");
-
-var Ci_pwmgr = Components.interfaces.nsILoginManager;
-ok(Ci_pwmgr != null, "Access Ci.nsILoginManager");
-
-var pwmgr = Cc_pwmgr.getService(Ci_pwmgr);
-ok(pwmgr != null, "pwmgr getService()");
-
-var jslogin = Components.classes["@mozilla.org/login-manager/loginInfo;1"].
-              createInstance(Components.interfaces.nsILoginInfo);
-ok(jslogin != null, "create a login");
-
-jslogin.init("http://mochi.test:8888", "javascript:", null,
-              "jsuser", "jspass123", "uname", "pword");
-
-try {
-    pwmgr.addLogin(jslogin);
-} catch (e) {
-    ok(false, "addLogin threw: " + e);
-}
-
-window.onload = startTest;
-
-SimpleTest.waitForExplicitFinish();
-</script>
-</pre>
+<pre id="test"></pre>
 </body>
 </html>
 

--- a/toolkit/components/passwordmgr/test/test_bug_444968.html
+++ b/toolkit/components/passwordmgr/test/test_bug_444968.html
@@ -3,16 +3,55 @@
 <head>
   <title>Test for Login Manager</title>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>  
   <script type="text/javascript" src="pwmgr_common.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body>
 Login Manager test: 444968
+<script>
+commonInit();
+SimpleTest.waitForExplicitFinish();
+
+const Ci = SpecialPowers.Ci;
+const Cc = SpecialPowers.Cc;
+pwmgr = Cc["@mozilla.org/login-manager;1"].
+        getService(Ci.nsILoginManager);
+
+login1A  = Cc["@mozilla.org/login-manager/loginInfo;1"].
+           createInstance(Ci.nsILoginInfo);
+login1B  = Cc["@mozilla.org/login-manager/loginInfo;1"].
+           createInstance(Ci.nsILoginInfo);
+login2A  = Cc["@mozilla.org/login-manager/loginInfo;1"].
+           createInstance(Ci.nsILoginInfo);
+login2B  = Cc["@mozilla.org/login-manager/loginInfo;1"].
+           createInstance(Ci.nsILoginInfo);
+login2C  = Cc["@mozilla.org/login-manager/loginInfo;1"].
+           createInstance(Ci.nsILoginInfo);
+
+login1A.init("http://mochi.test:8888", "http://bug444968-1", null,
+            "testuser1A", "testpass1A", "", "");
+login1B.init("http://mochi.test:8888", "http://bug444968-1", null,
+            "", "testpass1B", "", "");
+
+login2A.init("http://mochi.test:8888", "http://bug444968-2", null,
+            "testuser2A", "testpass2A", "", "");
+login2B.init("http://mochi.test:8888", "http://bug444968-2", null,
+            "", "testpass2B", "", "");
+login2C.init("http://mochi.test:8888", "http://bug444968-2", null,
+            "testuser2C", "testpass2C", "", "");
+
+pwmgr.addLogin(login1A);
+pwmgr.addLogin(login1B);
+pwmgr.addLogin(login2A);
+pwmgr.addLogin(login2B);
+pwmgr.addLogin(login2C);
+</script>
+
 <p id="display"></p>
 <div id="content" style="display: none">
   <!-- first 3 forms have matching user+pass and pass-only logins -->
 
   <!-- user+pass form. -->
   <form id="form1" action="http://bug444968-1">
     <input  type="text"     name="uname">
     <input  type="password" name="pword">
@@ -64,75 +103,32 @@ Login Manager test: 444968
 
 </div>
 <pre id="test">
 <script class="testbody" type="text/javascript">
 
 /* Test for Login Manager: 444968 (password-only forms should prefer a
  * password-only login when present )
  */
-commonInit();
-
-netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
-
-const Ci = Components.interfaces;
-const Cc = Components.classes;
-pwmgr = Cc["@mozilla.org/login-manager;1"].
-        getService(Ci.nsILoginManager);
-
-login1A  = Cc["@mozilla.org/login-manager/loginInfo;1"].
-           createInstance(Ci.nsILoginInfo);
-login1B  = Cc["@mozilla.org/login-manager/loginInfo;1"].
-           createInstance(Ci.nsILoginInfo);
-login2A  = Cc["@mozilla.org/login-manager/loginInfo;1"].
-           createInstance(Ci.nsILoginInfo);
-login2B  = Cc["@mozilla.org/login-manager/loginInfo;1"].
-           createInstance(Ci.nsILoginInfo);
-login2C  = Cc["@mozilla.org/login-manager/loginInfo;1"].
-           createInstance(Ci.nsILoginInfo);
-
-login1A.init("http://mochi.test:8888", "http://bug444968-1", null,
-            "testuser1A", "testpass1A", "", "");
-login1B.init("http://mochi.test:8888", "http://bug444968-1", null,
-            "", "testpass1B", "", "");
-
-login2A.init("http://mochi.test:8888", "http://bug444968-2", null,
-            "testuser2A", "testpass2A", "", "");
-login2B.init("http://mochi.test:8888", "http://bug444968-2", null,
-            "", "testpass2B", "", "");
-login2C.init("http://mochi.test:8888", "http://bug444968-2", null,
-            "testuser2C", "testpass2C", "", "");
-
-pwmgr.addLogin(login1A);
-pwmgr.addLogin(login1B);
-pwmgr.addLogin(login2A);
-pwmgr.addLogin(login2B);
-pwmgr.addLogin(login2C);
-
 function startTest() {
-  netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
-
   checkForm(1, "testuser1A", "testpass1A");
   checkForm(2, "testpass1B");
   checkForm(3, "testuser1A", "testpass1A");
 
   checkUnmodifiedForm(4); // 2 logins match
   checkForm(5, "testpass2B");
   checkForm(6, "testuser2A", "testpass2A");
   checkForm(7, "testuser2C", "testpass2C");
 
   pwmgr.removeLogin(login1A);
   pwmgr.removeLogin(login1B);
   pwmgr.removeLogin(login2A);
   pwmgr.removeLogin(login2B);
   pwmgr.removeLogin(login2C);
- 
+
   SimpleTest.finish();
 }
 
 window.onload = startTest;
-
-SimpleTest.waitForExplicitFinish();
-
 </script>
 </pre>
 </body>
 </html>

--- a/toolkit/components/passwordmgr/test/test_master_password.html
+++ b/toolkit/components/passwordmgr/test/test_master_password.html
@@ -4,28 +4,54 @@
   <title>Test for Login Manager</title>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <script type="text/javascript" src="pwmgr_common.js"></script>
   <script type="text/javascript" src="prompt_common.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body>
 Login Manager test: master password.
+<script>
+commonInit();
+SimpleTest.waitForExplicitFinish();
+
+var pwmgr   = SpecialPowers.Cc["@mozilla.org/login-manager;1"]
+                           .getService(SpecialPowers.Ci.nsILoginManager);
+var pwcrypt = SpecialPowers.Cc["@mozilla.org/login-manager/crypto/SDR;1"]
+                           .getService(Ci.nsILoginManagerCrypto);
+
+var nsLoginInfo = new Components.Constructor("@mozilla.org/login-manager/loginInfo;1", Ci.nsILoginInfo);
+
+var exampleCom = "http://example.com/tests/toolkit/components/passwordmgr/test/";
+var exampleOrg = "http://example.org/tests/toolkit/components/passwordmgr/test/";
+
+var login1 = new nsLoginInfo();
+var login2 = new nsLoginInfo();
+
+login1.init("http://example.com", "http://example.com", null,
+            "user1", "pass1", "uname", "pword");
+login2.init("http://example.org", "http://example.org", null,
+            "user2", "pass2", "uname", "pword");
+
+pwmgr.addLogin(login1);
+pwmgr.addLogin(login2);
+</script>
+
 <p id="display"></p>
 
 <div id="content" style="display: none">
 <iframe id="iframe1"></iframe>
 <iframe id="iframe2"></iframe>
 </div>
 
 <pre id="test">
 <script class="testbody" type="text/javascript">
-
-commonInit();
 var testNum = 1;
+var iframe1 = document.getElementById("iframe1");
+var iframe2 = document.getElementById("iframe2");
 
 /*
  * handleDialog
  *
  * Invoked a short period of time after calling startCallbackTimer(), and
  * allows testing the actual auth dialog while it's being displayed. Tests
  * should call startCallbackTimer() each time the auth dialog is expected (the
  * timer is a one-shot).
@@ -74,18 +100,22 @@ function handleDialog(doc, testNum) {
             dialog.acceptDialog();
         else
             dialog.cancelDialog();
     }
 
     ok(true, "handleDialog done");
     didDialog = true;
 
-    if (testNum == 4)
+    if (testNum == 3)
+        SimpleTest.executeSoon(checkTest3);
+    else if (testNum == 4)
         checkTest4A();
+    else if (testNum == 5)
+        SimpleTest.executeSoon(checkTest4C);
 }
 
 
 function startTest1() {
     netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
 
     ok(pwcrypt.isLoggedIn, "should be initially logged in (no MP)");
     enableMasterPassword();
@@ -114,22 +144,16 @@ function startTest1() {
     ok(didDialog, "handleDialog was invoked");
     ok(failedAsExpected, "getAllLogins should have thrown");
     is(logins, null, "shouldn't have gotten logins");
     ok(!pwcrypt.isLoggedIn, "should still be logged out");
 
     // --- Test 3 ---
     // Load a single iframe to trigger a MP
     testNum++;
-
-    // Note that because DOMContentLoaded is dispatched synchronously, the
-    // document's load event is blocked until after the MP entry (because
-    // pwmgr's listener doesn't return until after it processes the form,
-    // which is blocked waiting on a MP entry).
-    iframe1.onload = checkTest3;
     iframe1.src = exampleCom + "subtst_master_pass.html";
     startCallbackTimer();
 }
 
 function checkTest3() {
     ok(true, "checkTest3 starting");
     ok(didDialog, "handleDialog was invoked");
 
@@ -142,17 +166,16 @@ function checkTest3() {
     ok(pwcrypt.isLoggedIn, "should be logged in");
     logoutMasterPassword();
     ok(!pwcrypt.isLoggedIn, "should be logged out");
 
 
     // --- Test 4 ---
     // first part of loading 2 MP-triggering iframes
     testNum++;
-    iframe1.onload = checkTest4C;
     iframe1.src = exampleOrg + "subtst_master_pass.html";
     // start the callback, but we'll not enter the MP, just call checkTest4A
     startCallbackTimer();
 }
 
 function checkTest4A() {
     ok(true, "checkTest4A starting");
     ok(didDialog, "handleDialog was invoked");
@@ -165,17 +188,19 @@ function checkTest4A() {
 
 
     ok(!pwcrypt.isLoggedIn, "should be logged out");
 
     // XXX check that there's 1 MP window open
 
     // Load another iframe with a login form
     // This should detect that there's already a pending MP prompt, and not
-    // put up a second one. The load event will fire.
+    // put up a second one. The load event will fire (note that when pwmgr is
+    // driven from DOMContentLoaded, if that blocks due to prompting for a MP,
+    // the load even will also be blocked until the prompt is dismissed).
     iframe2.onload = checkTest4B;
     iframe2.src = exampleCom + "subtst_master_pass.html";
 }
 
 function checkTest4B() {
     ok(true, "checkTest4B starting");
     // iframe2 should load without having triggered a MP prompt (because one
     // is already waiting)
@@ -191,17 +216,16 @@ function checkTest4B() {
 
     // Ok, now enter the MP. The MP prompt is already up, but we'll just reuse startCallBackTimer.
     // --- Test 5 ---
     testNum++;
     startCallbackTimer();
 }
 
 function checkTest4C() {
-    // iframe1 finally loads after the MP entry.
     ok(true, "checkTest4C starting");
     ok(didDialog, "handleDialog was invoked");
 
     // We shouldn't have to worry about iframe1's load event racing with
     // filling of iframe2's data. We notify observers synchronously, so
     // iframe2's observer will process iframe2 before iframe1 even finishes
     // processing the form (which is blocking its load event).
     ok(pwcrypt.isLoggedIn, "should be logged in");
@@ -227,48 +251,14 @@ function finishTest() {
     disableMasterPassword();
     ok(pwcrypt.isLoggedIn, "should be logged in");
 
     pwmgr.removeLogin(login1);
     pwmgr.removeLogin(login2);
     SimpleTest.finish();
 }
 
-
-netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
-
-// Get the pwmgr service
-var pwmgr = Cc["@mozilla.org/login-manager;1"].
-            getService(Ci.nsILoginManager);
-ok(pwmgr != null, "pwmgr getService()");
-
-var pwcrypt = Cc["@mozilla.org/login-manager/crypto/SDR;1"].
-             getService(Ci.nsILoginManagerCrypto);
-ok(pwcrypt != null, "pwcrypt getService()");
-
-var nsLoginInfo = new Components.Constructor("@mozilla.org/login-manager/loginInfo;1", Ci.nsILoginInfo);
-ok(nsLoginInfo != null, "nsLoginInfo constructor");
-
-var exampleCom = "http://example.com/tests/toolkit/components/passwordmgr/test/";
-var exampleOrg = "http://example.org/tests/toolkit/components/passwordmgr/test/";
-
-var login1 = new nsLoginInfo();
-var login2 = new nsLoginInfo();
-
-login1.init("http://example.com", "http://example.com", null,
-            "user1", "pass1", "uname", "pword");
-login2.init("http://example.org", "http://example.org", null,
-            "user2", "pass2", "uname", "pword");
-
-pwmgr.addLogin(login1);
-pwmgr.addLogin(login2);
-
-var iframe1 = document.getElementById("iframe1");
-var iframe2 = document.getElementById("iframe2");
-
 window.onload = startTest1;
-
-SimpleTest.waitForExplicitFinish();
 </script>
 </pre>
 </body>
 </html>
 

--- a/toolkit/components/passwordmgr/test/test_master_password_cleanup.html
+++ b/toolkit/components/passwordmgr/test/test_master_password_cleanup.html
@@ -6,18 +6,16 @@
   <script type="text/javascript" src="pwmgr_common.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body>
 Login Manager test: master password cleanup
 <p id="display"></p>
 
 <div id="content" style="display: none">
-<iframe id="iframe1"></iframe>
-<iframe id="iframe2"></iframe>
 </div>
 
 <pre id="test">
 <script class="testbody" type="text/javascript">
 
 
 /*
  * The entire purpose of this test is to make sure that, if the previous master

--- a/toolkit/components/passwordmgr/test/test_maxforms_1.html
+++ b/toolkit/components/passwordmgr/test/test_maxforms_1.html
@@ -7,18 +7,20 @@
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body>
 Test limiting number of forms filled.
 
 <p id="display"></p>
 <div id="content" style="display: none"></div>
 
+<script>
+commonInit();
+SimpleTest.waitForExplicitFinish();
 
-<script>
 var FORMS_TO_CREATE = 39;
 
 function createForm(id) {
     var template1 = "<form id='form"
     var template2 = "'><input name='u'><input type='password' name='p'></form>\n";
     return id + template1 + id + template2;
 }
 
@@ -29,17 +31,16 @@ for (var i = 1; i <= FORMS_TO_CREATE; i+
 
 var theDiv = document.getElementById("content");
 theDiv.innerHTML = formsHtml;
 </script>
 
 
 <pre id="test">
 <script class="testbody" type="text/javascript">
-commonInit();
 /** Test for Login Manager: form fill, multiple forms. **/
 
 function startTest() {
   for (var i = 1; i <= FORMS_TO_CREATE; i++) {
     if (true) {
       is($_(i, "u").value, "testuser", "Checking for filled username in form " + i);
       is($_(i, "p").value, "testpass", "Checking for filled password in form " + i);
     } else {
@@ -47,15 +48,12 @@ function startTest() {
       is($_(i, "p").value, "", "Checking for unfilled password in form " + i);
     }
   }
 
   SimpleTest.finish();
 }
 
 window.onload = startTest;
-
-SimpleTest.waitForExplicitFinish();
 </script>
 </pre>
 </body>
 </html>
-

--- a/toolkit/components/passwordmgr/test/test_maxforms_2.html
+++ b/toolkit/components/passwordmgr/test/test_maxforms_2.html
@@ -7,18 +7,20 @@
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body>
 Test limiting number of forms filled.
 
 <p id="display"></p>
 <div id="content" style="display: none"></div>
 
+<script>
+commonInit();
+SimpleTest.waitForExplicitFinish();
 
-<script>
 var FORMS_TO_CREATE = 40;
 
 function createForm(id) {
     var template1 = "<form id='form"
     var template2 = "'><input name='u'><input type='password' name='p'></form>\n";
     return id + template1 + id + template2;
 }
 
@@ -29,17 +31,16 @@ for (var i = 1; i <= FORMS_TO_CREATE; i+
 
 var theDiv = document.getElementById("content");
 theDiv.innerHTML = formsHtml;
 </script>
 
 
 <pre id="test">
 <script class="testbody" type="text/javascript">
-commonInit();
 /** Test for Login Manager: form fill, multiple forms. **/
 
 function startTest() {
   for (var i = 1; i <= FORMS_TO_CREATE; i++) {
     if (true) {
       is($_(i, "u").value, "testuser", "Checking for filled username in form " + i);
       is($_(i, "p").value, "testpass", "Checking for filled password in form " + i);
     } else {
@@ -47,15 +48,12 @@ function startTest() {
       is($_(i, "p").value, "", "Checking for unfilled password in form " + i);
     }
   }
 
   SimpleTest.finish();
 }
 
 window.onload = startTest;
-
-SimpleTest.waitForExplicitFinish();
 </script>
 </pre>
 </body>
 </html>
-

--- a/toolkit/components/passwordmgr/test/test_maxforms_3.html
+++ b/toolkit/components/passwordmgr/test/test_maxforms_3.html
@@ -7,18 +7,20 @@
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body>
 Test limiting number of forms filled.
 
 <p id="display"></p>
 <div id="content" style="display: none"></div>
 
+<script>
+commonInit();
+SimpleTest.waitForExplicitFinish();
 
-<script>
 var FORMS_TO_CREATE = 41;
 
 function createForm(id) {
     var template1 = "<form id='form"
     var template2 = "'><input name='u'><input type='password' name='p'></form>\n";
     return id + template1 + id + template2;
 }
 
@@ -29,17 +31,16 @@ for (var i = 1; i <= FORMS_TO_CREATE; i+
 
 var theDiv = document.getElementById("content");
 theDiv.innerHTML = formsHtml;
 </script>
 
 
 <pre id="test">
 <script class="testbody" type="text/javascript">
-commonInit();
 /** Test for Login Manager: form fill, multiple forms. **/
 
 function startTest() {
   for (var i = 1; i <= FORMS_TO_CREATE; i++) {
     if (i != 21) {
       is($_(i, "u").value, "testuser", "Checking for filled username in form " + i);
       is($_(i, "p").value, "testpass", "Checking for filled password in form " + i);
     } else {
@@ -47,15 +48,12 @@ function startTest() {
       is($_(i, "p").value, "", "Checking for unfilled password in form " + i);
     }
   }
 
   SimpleTest.finish();
 }
 
 window.onload = startTest;
-
-SimpleTest.waitForExplicitFinish();
 </script>
 </pre>
 </body>
 </html>
-

--- a/toolkit/mozapps/extensions/DeferredSave.jsm
+++ b/toolkit/mozapps/extensions/DeferredSave.jsm
@@ -68,32 +68,36 @@ function DeferredSave(aPath, aDataProvid
   this._path = aPath;
   this._dataProvider = aDataProvider;
 
   this._timer = null;
 
   // Some counters for telemetry
   // The total number of times the file was written
   this.totalSaves = 0;
+
   // The number of times the data became dirty while
   // another save was in progress
   this.overlappedSaves = 0;
 
+  // Error returned by the most recent write (if any)
+  this._lastError = null;
+
   if (aDelay && (aDelay > 0))
     this._delay = aDelay;
   else
     this._delay = DEFAULT_SAVE_DELAY_MS;
 }
 
 DeferredSave.prototype = {
   get dirty() {
     return this._pending || this.writeInProgress;
   },
 
-  get error() {
+  get lastError() {
     return this._lastError;
   },
 
   // Start the pending timer if data is dirty
   _startTimer: function() {
     if (!this._pending) {
       return;
     }

--- a/toolkit/mozapps/extensions/Makefile.in
+++ b/toolkit/mozapps/extensions/Makefile.in
@@ -10,17 +10,17 @@ VPATH     = @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 ifeq (,$(filter aurora beta release esr,$(MOZ_UPDATE_CHANNEL)))
 DEFINES += -DMOZ_COMPATIBILITY_NIGHTLY=1
 endif
 
 # This is used in multiple places, so is defined here to avoid it getting
 # out of sync.
-DEFINES += -DMOZ_EXTENSIONS_DB_SCHEMA=14
+DEFINES += -DMOZ_EXTENSIONS_DB_SCHEMA=15
 
 # Additional debugging info is exposed in debug builds, or by setting the
 # MOZ_EM_DEBUG environment variable when building.
 ifneq (,$(MOZ_EM_DEBUG))
 DEFINES += -DMOZ_EM_DEBUG=1
 else ifdef MOZ_DEBUG
 DEFINES += -DMOZ_EM_DEBUG=1
 endif

--- a/toolkit/mozapps/extensions/XPIProvider.jsm
+++ b/toolkit/mozapps/extensions/XPIProvider.jsm
@@ -73,17 +73,17 @@ const URI_EXTENSION_STRINGS           = 
 
 const STRING_TYPE_NAME                = "type.%ID%.name";
 
 const DIR_EXTENSIONS                  = "extensions";
 const DIR_STAGE                       = "staged";
 const DIR_XPI_STAGE                   = "staged-xpis";
 const DIR_TRASH                       = "trash";
 
-const FILE_DATABASE                   = "extensions.sqlite";
+const FILE_DATABASE                   = "extensions.json";
 const FILE_OLD_CACHE                  = "extensions.cache";
 const FILE_INSTALL_MANIFEST           = "install.rdf";
 const FILE_XPI_ADDONS_LIST            = "extensions.ini";
 
 const KEY_PROFILEDIR                  = "ProfD";
 const KEY_APPDIR                      = "XCurProcD";
 const KEY_TEMPDIR                     = "TmpD";
 const KEY_APP_DISTRIBUTION            = "XREAppDist";
@@ -115,17 +115,22 @@ const PROP_LOCALE_SINGLE = ["name", "des
 const PROP_LOCALE_MULTI  = ["developers", "translators", "contributors"];
 const PROP_TARGETAPP     = ["id", "minVersion", "maxVersion"];
 
 // Properties that should be migrated where possible from an old database. These
 // shouldn't include properties that can be read directly from install.rdf files
 // or calculated
 const DB_MIGRATE_METADATA= ["installDate", "userDisabled", "softDisabled",
                             "sourceURI", "applyBackgroundUpdates",
-                            "releaseNotesURI", "isForeignInstall", "syncGUID"];
+                            "releaseNotesURI", "foreignInstall", "syncGUID"];
+// Properties to cache and reload when an addon installation is pending
+const PENDING_INSTALL_METADATA =
+    ["syncGUID", "targetApplications", "userDisabled", "softDisabled",
+     "existingAddonID", "sourceURI", "releaseNotesURI", "installDate",
+     "updateDate", "applyBackgroundUpdates", "compatibilityOverrides"];
 
 // Note: When adding/changing/removing items here, remember to change the
 // DB schema version to ensure changes are picked up ASAP.
 const STATIC_BLOCKLIST_PATTERNS = [
   { creator: "Mozilla Corp.",
     level: Ci.nsIBlocklistService.STATE_BLOCKED,
     blockID: "i162" },
   { creator: "Mozilla.org",
@@ -164,22 +169,25 @@ const MSG_JAR_FLUSH = "AddonJarFlush";
 var gGlobalScope = this;
 
 /**
  * Valid IDs fit this pattern.
  */
 var gIDTest = /^(\{[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}\}|[a-z0-9-\._]*\@[a-z0-9-\._]+)$/i;
 
 ["LOG", "WARN", "ERROR"].forEach(function(aName) {
-  this.__defineGetter__(aName, function logFuncGetter() {
-    Components.utils.import("resource://gre/modules/AddonLogging.jsm");
-
-    LogManager.getLogger("addons.xpi", this);
-    return this[aName];
-  })
+  Object.defineProperty(this, aName, {
+    get: function logFuncGetter() {
+      Components.utils.import("resource://gre/modules/AddonLogging.jsm");
+
+      LogManager.getLogger("addons.xpi", this);
+      return this[aName];
+    },
+    configurable: true
+  });
 }, this);
 
 
 const LAZY_OBJECTS = ["XPIDatabase"];
 
 var gLazyObjectsLoaded = false;
 
 function loadLazyObjects() {
@@ -192,19 +200,22 @@ function loadLazyObjects() {
     delete gGlobalScope[name];
     gGlobalScope[name] = scope[name];
   }
   gLazyObjectsLoaded = true;
   return scope;
 }
 
 for (let name of LAZY_OBJECTS) {
-  gGlobalScope.__defineGetter__(name, function lazyObjectGetter() {
-    let objs = loadLazyObjects();
-    return objs[name];
+  Object.defineProperty(gGlobalScope, name, {
+    get: function lazyObjectGetter() {
+      let objs = loadLazyObjects();
+      return objs[name];
+    },
+    configurable: true
   });
 }
 
 
 function findMatchingStaticBlocklistItem(aAddon) {
   for (let item of STATIC_BLOCKLIST_PATTERNS) {
     if ("creator" in item && typeof item.creator == "string") {
       if ((aAddon.defaultLocale && aAddon.defaultLocale.creator == item.creator) ||
@@ -493,16 +504,19 @@ function findClosestLocale(aLocales) {
 }
 
 /**
  * Sets the userDisabled and softDisabled properties of an add-on based on what
  * values those properties had for a previous instance of the add-on. The
  * previous instance may be a previous install or in the case of an application
  * version change the same add-on.
  *
+ * NOTE: this may modify aNewAddon in place; callers should save the database if
+ * necessary
+ *
  * @param  aOldAddon
  *         The previous instance of the add-on
  * @param  aNewAddon
  *         The new instance of the add-on
  * @param  aAppVersion
  *         The optional application version to use when checking the blocklist
  *         or undefined to use the current application
  * @param  aPlatformVersion
@@ -579,21 +593,18 @@ function isUsableAddon(aAddon) {
 
   return true;
 }
 
 function isAddonDisabled(aAddon) {
   return aAddon.appDisabled || aAddon.softDisabled || aAddon.userDisabled;
 }
 
-this.__defineGetter__("gRDF", function gRDFGetter() {
-  delete this.gRDF;
-  return this.gRDF = Cc["@mozilla.org/rdf/rdf-service;1"].
-                     getService(Ci.nsIRDFService);
-});
+XPCOMUtils.defineLazyServiceGetter(this, "gRDF", "@mozilla.org/rdf/rdf-service;1",
+                                   Ci.nsIRDFService);
 
 function EM_R(aProperty) {
   return gRDF.GetResource(PREFIX_NS_EM + aProperty);
 }
 
 /**
  * Converts an RDF literal, resource or integer into a string.
  *
@@ -689,18 +700,21 @@ function loadManifestFromRDF(aUri, aStre
       }
     }
 
     PROP_LOCALE_SINGLE.forEach(function(aProp) {
       locale[aProp] = getRDFProperty(aDs, aSource, aProp);
     });
 
     PROP_LOCALE_MULTI.forEach(function(aProp) {
-      locale[aProp] = getPropertyArray(aDs, aSource,
-                                       aProp.substring(0, aProp.length - 1));
+      // Don't store empty arrays
+      let props = getPropertyArray(aDs, aSource,
+                                   aProp.substring(0, aProp.length - 1));
+      if (props.length > 0)
+        locale[aProp] = props;
     });
 
     return locale;
   }
 
   let rdfParser = Cc["@mozilla.org/rdf/xml-parser;1"].
                   createInstance(Ci.nsIRDFXMLParser)
   let ds = Cc["@mozilla.org/rdf/datasource;1?name=in-memory-datasource"].
@@ -1316,29 +1330,34 @@ function recursiveRemove(aFile) {
  * Returns the timestamp of the most recently modified file in a directory,
  * or simply the file's own timestamp if it is not a directory.
  *
  * @param  aFile
  *         A non-null nsIFile object
  * @return Epoch time, as described above. 0 for an empty directory.
  */
 function recursiveLastModifiedTime(aFile) {
-  if (aFile.isFile())
-    return aFile.lastModifiedTime;
-
-  if (aFile.isDirectory()) {
-    let entries = aFile.directoryEntries.QueryInterface(Ci.nsIDirectoryEnumerator);
-    let entry, time;
-    let maxTime = aFile.lastModifiedTime;
-    while ((entry = entries.nextFile)) {
-      time = recursiveLastModifiedTime(entry);
-      maxTime = Math.max(time, maxTime);
-    }
-    entries.close();
-    return maxTime;
+  try {
+    if (aFile.isFile())
+      return aFile.lastModifiedTime;
+
+    if (aFile.isDirectory()) {
+      let entries = aFile.directoryEntries.QueryInterface(Ci.nsIDirectoryEnumerator);
+      let entry, time;
+      let maxTime = aFile.lastModifiedTime;
+      while ((entry = entries.nextFile)) {
+        time = recursiveLastModifiedTime(entry);
+        maxTime = Math.max(time, maxTime);
+      }
+      entries.close();
+      return maxTime;
+    }
+  }
+  catch (e) {
+    WARN("Problem getting last modified time for " + aFile.path, e);
   }
 
   // If the file is something else, just ignore it.
   return 0;
 }
 
 /**
  * Gets a snapshot of directory entries.
@@ -1743,17 +1762,17 @@ var XPIProvider = {
                                          this.defaultSkin);
     this.selectedSkin = this.currentSkin;
     this.applyThemeChange();
 
     this.minCompatibleAppVersion = Prefs.getCharPref(PREF_EM_MIN_COMPAT_APP_VERSION,
                                                      null);
     this.minCompatiblePlatformVersion = Prefs.getCharPref(PREF_EM_MIN_COMPAT_PLATFORM_VERSION,
                                                           null);
-    this.enabledAddons = [];
+    this.enabledAddons = "";
 
     Services.prefs.addObserver(PREF_EM_MIN_COMPAT_APP_VERSION, this, false);
     Services.prefs.addObserver(PREF_EM_MIN_COMPAT_PLATFORM_VERSION, this, false);
 
     let flushCaches = this.checkForChanges(aAppChanged, aOldAppVersion,
                                            aOldPlatformVersion);
 
     // Changes to installed extensions may have changed which theme is selected
@@ -1860,21 +1879,23 @@ var XPIProvider = {
 
     // This is needed to allow xpcshell tests to simulate a restart
     this.extensionsActive = false;
 
     // Remove URI mappings again
     delete this._uriMappings;
 
     if (gLazyObjectsLoaded) {
-      XPIDatabase.shutdown(function shutdownCallback() {
-        Services.obs.notifyObservers(null, "xpi-provider-shutdown", null);
+      XPIDatabase.shutdown(function shutdownCallback(saveError) {
+        LOG("Notifying XPI shutdown observers");
+        Services.obs.notifyObservers(null, "xpi-provider-shutdown", saveError);
       });
     }
     else {
+      LOG("Notifying XPI shutdown observers");
       Services.obs.notifyObservers(null, "xpi-provider-shutdown", null);
     }
   },
 
   /**
    * Applies any pending theme change to the preferences.
    */
   applyThemeChange: function XPI_applyThemeChange() {
@@ -1922,17 +1943,17 @@ var XPIProvider = {
     }
 
     // Ensure any changes to the add-ons list are flushed to disk
     XPIDatabase.writeAddonsList();
     Services.prefs.setBoolPref(PREF_PENDING_OPERATIONS, false);
   },
 
   /**
-   * Persists changes to XPIProvider.bootstrappedAddons to it's store (a pref).
+   * Persists changes to XPIProvider.bootstrappedAddons to its store (a pref).
    */
   persistBootstrappedAddons: function XPI_persistBootstrappedAddons() {
     Services.prefs.setCharPref(PREF_BOOTSTRAP_ADDONS,
                                JSON.stringify(this.bootstrappedAddons));
   },
 
   /**
    * Adds a list of currently active add-ons to the next crash report.
@@ -2482,17 +2503,17 @@ var XPIProvider = {
       try {
         // If not load it
         if (!newAddon) {
           let file = aInstallLocation.getLocationForID(aOldAddon.id);
           newAddon = loadManifestFromFile(file);
           applyBlocklistChanges(aOldAddon, newAddon);
 
           // Carry over any pendingUninstall state to add-ons modified directly
-          // in the profile. This is impoprtant when the attempt to remove the
+          // in the profile. This is important when the attempt to remove the
           // add-on in processPendingFileChanges failed and caused an mtime
           // change to the add-ons files.
           newAddon.pendingUninstall = aOldAddon.pendingUninstall;
         }
 
         // The ID in the manifest that was loaded must match the ID of the old
         // add-on.
         if (newAddon.id != aOldAddon.id)
@@ -2513,41 +2534,43 @@ var XPIProvider = {
       }
 
       // Set the additional properties on the new AddonInternal
       newAddon._installLocation = aInstallLocation;
       newAddon.updateDate = aAddonState.mtime;
       newAddon.visible = !(newAddon.id in visibleAddons);
 
       // Update the database
-      XPIDatabase.updateAddonMetadata(aOldAddon, newAddon, aAddonState.descriptor);
-      if (newAddon.visible) {
-        visibleAddons[newAddon.id] = newAddon;
+      let newDBAddon = XPIDatabase.updateAddonMetadata(aOldAddon, newAddon,
+                                                       aAddonState.descriptor);
+      if (newDBAddon.visible) {
+        visibleAddons[newDBAddon.id] = newDBAddon;
         // Remember add-ons that were changed during startup
         AddonManagerPrivate.addStartupChange(AddonManager.STARTUP_CHANGE_CHANGED,
-                                             newAddon.id);
+                                             newDBAddon.id);
 
         // If this was the active theme and it is now disabled then enable the
         // default theme
-        if (aOldAddon.active && isAddonDisabled(newAddon))
+        if (aOldAddon.active && isAddonDisabled(newDBAddon))
           XPIProvider.enableDefaultTheme();
 
         // If the new add-on is bootstrapped and active then call its install method
-        if (newAddon.active && newAddon.bootstrap) {
+        if (newDBAddon.active && newDBAddon.bootstrap) {
           // Startup cache must be flushed before calling the bootstrap script
           flushStartupCache();
 
-          let installReason = Services.vc.compare(aOldAddon.version, newAddon.version) < 0 ?
+          let installReason = Services.vc.compare(aOldAddon.version, newDBAddon.version) < 0 ?
                               BOOTSTRAP_REASONS.ADDON_UPGRADE :
                               BOOTSTRAP_REASONS.ADDON_DOWNGRADE;
 
           let file = Cc["@mozilla.org/file/local;1"].createInstance(Ci.nsIFile);
           file.persistentDescriptor = aAddonState.descriptor;
-          XPIProvider.callBootstrapMethod(newAddon.id, newAddon.version, newAddon.type, file,
-                                          "install", installReason, { oldVersion: aOldAddon.version });
+          XPIProvider.callBootstrapMethod(newDBAddon.id, newDBAddon.version,
+                                          newDBAddon.type, file, "install",
+                                          installReason, { oldVersion: aOldAddon.version });
           return false;
         }
 
         return true;
       }
 
       return false;
     }
@@ -2564,21 +2587,20 @@ var XPIProvider = {
      * @param  aAddonState
      *         The new state of the add-on
      * @return a boolean indicating if flushing caches is required to complete
      *         changing this add-on
      */
     function updateDescriptor(aInstallLocation, aOldAddon, aAddonState) {
       LOG("Add-on " + aOldAddon.id + " moved to " + aAddonState.descriptor);
 
-      aOldAddon._descriptor = aAddonState.descriptor;
+      aOldAddon.descriptor = aAddonState.descriptor;
       aOldAddon.visible = !(aOldAddon.id in visibleAddons);
-
-      // Update the database
-      XPIDatabase.setAddonDescriptor(aOldAddon, aAddonState.descriptor);
+      XPIDatabase.saveChanges();
+
       if (aOldAddon.visible) {
         visibleAddons[aOldAddon.id] = aOldAddon;
 
         if (aOldAddon.bootstrap && aOldAddon.active) {
           let bootstrap = oldBootstrappedAddons[aOldAddon.id];
           bootstrap.descriptor = aAddonState.descriptor;
           XPIProvider.bootstrappedAddons[aOldAddon.id] = bootstrap;
         }
@@ -2625,78 +2647,65 @@ var XPIProvider = {
             file.persistentDescriptor = aAddonState.descriptor;
             XPIProvider.callBootstrapMethod(aOldAddon.id, aOldAddon.version, aOldAddon.type, file,
                                             "install",
                                             BOOTSTRAP_REASONS.ADDON_INSTALL);
 
             // If it should be active then mark it as active otherwise unload
             // its scope
             if (!isAddonDisabled(aOldAddon)) {
-              aOldAddon.active = true;
-              XPIDatabase.updateAddonActive(aOldAddon);
+              XPIDatabase.updateAddonActive(aOldAddon, true);
             }
             else {
               XPIProvider.unloadBootstrapScope(newAddon.id);
             }
           }
           else {
             // Otherwise a restart is necessary
             changed = true;
           }
         }
       }
 
       // App version changed, we may need to update the appDisabled property.
       if (aUpdateCompatibility) {
-        // Create a basic add-on object for the new state to save reproducing
-        // the applyBlocklistChanges code
-        let newAddon = new AddonInternal();
-        newAddon.id = aOldAddon.id;
-        newAddon.syncGUID = aOldAddon.syncGUID;
-        newAddon.version = aOldAddon.version;
-        newAddon.type = aOldAddon.type;
-        newAddon.appDisabled = !isUsableAddon(aOldAddon);
-
-        // Sync the userDisabled flag to the selectedSkin
-        if (aOldAddon.type == "theme")
-          newAddon.userDisabled = aOldAddon.internalName != XPIProvider.selectedSkin;
-
-        applyBlocklistChanges(aOldAddon, newAddon, aOldAppVersion,
+        let wasDisabled = isAddonDisabled(aOldAddon);
+        let wasAppDisabled = aOldAddon.appDisabled;
+        let wasUserDisabled = aOldAddon.userDisabled;
+        let wasSoftDisabled = aOldAddon.softDisabled;
+
+        // This updates the addon's JSON cached data in place
+        applyBlocklistChanges(aOldAddon, aOldAddon, aOldAppVersion,
                               aOldPlatformVersion);
-
-        let wasDisabled = isAddonDisabled(aOldAddon);
-        let isDisabled = isAddonDisabled(newAddon);
+        aOldAddon.appDisabled = !isUsableAddon(aOldAddon);
+
+        let isDisabled = isAddonDisabled(aOldAddon);
 
         // If either property has changed update the database.
-        if (newAddon.appDisabled != aOldAddon.appDisabled ||
-            newAddon.userDisabled != aOldAddon.userDisabled ||
-            newAddon.softDisabled != aOldAddon.softDisabled) {
+        if (wasAppDisabled != aOldAddon.appDisabled ||
+            wasUserDisabled != aOldAddon.userDisabled ||
+            wasSoftDisabled != aOldAddon.softDisabled) {
           LOG("Add-on " + aOldAddon.id + " changed appDisabled state to " +
-              newAddon.appDisabled + ", userDisabled state to " +
-              newAddon.userDisabled + " and softDisabled state to " +
-              newAddon.softDisabled);
-          XPIDatabase.setAddonProperties(aOldAddon, {
-            appDisabled: newAddon.appDisabled,
-            userDisabled: newAddon.userDisabled,
-            softDisabled: newAddon.softDisabled
-          });
+              aOldAddon.appDisabled + ", userDisabled state to " +
+              aOldAddon.userDisabled + " and softDisabled state to " +
+              aOldAddon.softDisabled);
+          XPIDatabase.saveChanges();
         }
 
         // If this is a visible add-on and it has changed disabled state then we
         // may need a restart or to update the bootstrap list.
         if (aOldAddon.visible && wasDisabled != isDisabled) {
           // Remember add-ons that became disabled or enabled by the application
           // change
           let change = isDisabled ? AddonManager.STARTUP_CHANGE_DISABLED
                                   : AddonManager.STARTUP_CHANGE_ENABLED;
           AddonManagerPrivate.addStartupChange(change, aOldAddon.id);
           if (aOldAddon.bootstrap) {
             // Update the add-ons active state
-            aOldAddon.active = !isDisabled;
-            XPIDatabase.updateAddonActive(aOldAddon);
+            XPIDatabase.updateAddonActive(aOldAddon, !isDisabled);
           }
           else {
             changed = true;
           }
         }
       }
 
       if (aOldAddon.visible && aOldAddon.active && aOldAddon.bootstrap) {
@@ -2708,27 +2717,25 @@ var XPIProvider = {
       }
 
       return changed;
     }
 
     /**
      * Called when an add-on has been removed.
      *
-     * @param  aInstallLocation
-     *         The install location containing the add-on
      * @param  aOldAddon
      *         The AddonInternal as it appeared the last time the application
      *         ran
      * @return a boolean indicating if flushing caches is required to complete
      *         changing this add-on
      */
-    function removeMetadata(aInstallLocation, aOldAddon) {
+    function removeMetadata(aOldAddon) {
       // This add-on has disappeared
-      LOG("Add-on " + aOldAddon.id + " removed from " + aInstallLocation);
+      LOG("Add-on " + aOldAddon.id + " removed from " + aOldAddon.location);
       XPIDatabase.removeAddonMetadata(aOldAddon);
 
       // Remember add-ons that were uninstalled during startup
       if (aOldAddon.visible) {
         AddonManagerPrivate.addStartupChange(AddonManager.STARTUP_CHANGE_UNINSTALLED,
                                              aOldAddon.id);
       }
       else if (AddonManager.getStartupChanges(AddonManager.STARTUP_CHANGE_INSTALLED)
@@ -2881,95 +2888,84 @@ var XPIProvider = {
           else
             newAddon.userDisabled = true;
         }
       }
       else {
         newAddon.active = (newAddon.visible && !isAddonDisabled(newAddon))
       }
 
-      try {
-        // Update the database.
-        XPIDatabase.addAddonMetadata(newAddon, aAddonState.descriptor);
-      }
-      catch (e) {
-        // Failing to write the add-on into the database is non-fatal, the
-        // add-on will just be unavailable until we try again in a subsequent
-        // startup
-        ERROR("Failed to add add-on " + aId + " in " + aInstallLocation.name +
-              " to database", e);
-        return false;
-      }
-
-      if (newAddon.visible) {
+      let newDBAddon = XPIDatabase.addAddonMetadata(newAddon, aAddonState.descriptor);
+
+      if (newDBAddon.visible) {
         // Remember add-ons that were first detected during startup.
         if (isDetectedInstall) {
           // If a copy from a higher priority location was removed then this
           // add-on has changed
           if (AddonManager.getStartupChanges(AddonManager.STARTUP_CHANGE_UNINSTALLED)
-                          .indexOf(newAddon.id) != -1) {
+                          .indexOf(newDBAddon.id) != -1) {
             AddonManagerPrivate.addStartupChange(AddonManager.STARTUP_CHANGE_CHANGED,
-                                                 newAddon.id);
+                                                 newDBAddon.id);
           }
           else {
             AddonManagerPrivate.addStartupChange(AddonManager.STARTUP_CHANGE_INSTALLED,
-                                                 newAddon.id);
+                                                 newDBAddon.id);
           }
         }
 
         // Note if any visible add-on is not in the application install location
-        if (newAddon._installLocation.name != KEY_APP_GLOBAL)
+        if (newDBAddon._installLocation.name != KEY_APP_GLOBAL)
           XPIProvider.allAppGlobal = false;
 
-        visibleAddons[newAddon.id] = newAddon;
+        visibleAddons[newDBAddon.id] = newDBAddon;
 
         let installReason = BOOTSTRAP_REASONS.ADDON_INSTALL;
         let extraParams = {};
 
         // If we're hiding a bootstrapped add-on then call its uninstall method
-        if (newAddon.id in oldBootstrappedAddons) {
-          let oldBootstrap = oldBootstrappedAddons[newAddon.id];
+        if (newDBAddon.id in oldBootstrappedAddons) {
+          let oldBootstrap = oldBootstrappedAddons[newDBAddon.id];
           extraParams.oldVersion = oldBootstrap.version;
-          XPIProvider.bootstrappedAddons[newAddon.id] = oldBootstrap;
+          XPIProvider.bootstrappedAddons[newDBAddon.id] = oldBootstrap;
 
           // If the old version is the same as the new version, or we're
           // recovering from a corrupt DB, don't call uninstall and install
           // methods.
           if (sameVersion || !isNewInstall)
             return false;
 
-          installReason = Services.vc.compare(oldBootstrap.version, newAddon.version) < 0 ?
+          installReason = Services.vc.compare(oldBootstrap.version, newDBAddon.version) < 0 ?
                           BOOTSTRAP_REASONS.ADDON_UPGRADE :
                           BOOTSTRAP_REASONS.ADDON_DOWNGRADE;
 
           let oldAddonFile = Cc["@mozilla.org/file/local;1"].
                              createInstance(Ci.nsIFile);
           oldAddonFile.persistentDescriptor = oldBootstrap.descriptor;
 
-          XPIProvider.callBootstrapMethod(newAddon.id, oldBootstrap.version,
+          XPIProvider.callBootstrapMethod(newDBAddon.id, oldBootstrap.version,
                                           oldBootstrap.type, oldAddonFile, "uninstall",
-                                          installReason, { newVersion: newAddon.version });
-          XPIProvider.unloadBootstrapScope(newAddon.id);
+                                          installReason, { newVersion: newDBAddon.version });
+          XPIProvider.unloadBootstrapScope(newDBAddon.id);
 
           // If the new add-on is bootstrapped then we must flush the caches
           // before calling the new bootstrap script
-          if (newAddon.bootstrap)
+          if (newDBAddon.bootstrap)
             flushStartupCache();
         }
 
-        if (!newAddon.bootstrap)
+        if (!newDBAddon.bootstrap)
           return true;
 
         // Visible bootstrapped add-ons need to have their install method called
         let file = Cc["@mozilla.org/file/local;1"].createInstance(Ci.nsIFile);
         file.persistentDescriptor = aAddonState.descriptor;
-        XPIProvider.callBootstrapMethod(newAddon.id, newAddon.version, newAddon.type, file,
+        XPIProvider.callBootstrapMethod(newDBAddon.id, newDBAddon.version, newDBAddon.type, file,
                                         "install", installReason, extraParams);
-        if (!newAddon.active)
-          XPIProvider.unloadBootstrapScope(newAddon.id);
+        if (!newDBAddon.active)
+          XPIProvider.unloadBootstrapScope(newDBAddon.id);
       }
 
       return false;
     }
 
     let changed = false;
     let knownLocations = XPIDatabase.getInstallLocations();
 
@@ -2984,19 +2980,18 @@ var XPIProvider = {
     aState.reverse().forEach(function(aSt) {
 
       // We can't include the install location directly in the state as it has
       // to be cached as JSON.
       let installLocation = this.installLocationsByName[aSt.name];
       let addonStates = aSt.addons;
 
       // Check if the database knows about any add-ons in this install location.
-      let pos = knownLocations.indexOf(installLocation.name);
-      if (pos >= 0) {
-        knownLocations.splice(pos, 1);
+      if (knownLocations.has(installLocation.name)) {
+        knownLocations.delete(installLocation.name);
         let addons = XPIDatabase.getAddonsInLocation(installLocation.name);
         // Iterate through the add-ons installed the last time the application
         // ran
         addons.forEach(function(aOldAddon) {
           // If a version of this add-on has been installed in an higher
           // priority install location then count it as changed
           if (AddonManager.getStartupChanges(AddonManager.STARTUP_CHANGE_INSTALLED)
                           .indexOf(aOldAddon.id) != -1) {
@@ -3029,30 +3024,30 @@ var XPIProvider = {
             // add-ons in the application directory when the application version
             // has changed
             if (aOldAddon.id in aManifests[installLocation.name] ||
                 aOldAddon.updateDate != addonState.mtime ||
                 (aUpdateCompatibility && installLocation.name == KEY_APP_GLOBAL)) {
               changed = updateMetadata(installLocation, aOldAddon, addonState) ||
                         changed;
             }
-            else if (aOldAddon._descriptor != addonState.descriptor) {
+            else if (aOldAddon.descriptor != addonState.descriptor) {
               changed = updateDescriptor(installLocation, aOldAddon, addonState) ||
                         changed;
             }
             else {
               changed = updateVisibilityAndCompatibility(installLocation,
                                                          aOldAddon, addonState) ||
                         changed;
             }
             if (aOldAddon.visible && aOldAddon._installLocation.name != KEY_APP_GLOBAL)
               XPIProvider.allAppGlobal = false;
           }
           else {
-            changed = removeMetadata(installLocation.name, aOldAddon) || changed;
+            changed = removeMetadata(aOldAddon) || changed;
           }
         }, this);
       }
 
       // All the remaining add-ons in this install location must be new.
 
       // Get the migration data for this install location.
       let locMigrateData = {};
@@ -3063,22 +3058,22 @@ var XPIProvider = {
                               locMigrateData[id]) || changed;
       }
     }, this);
 
     // The remaining locations that had add-ons installed in them no longer
     // have any add-ons installed in them, or the locations no longer exist.
     // The metadata for the add-ons that were in them must be removed from the
     // database.
-    knownLocations.forEach(function(aLocation) {
-      let addons = XPIDatabase.getAddonsInLocation(aLocation);
+    for (let location of knownLocations) {
+      let addons = XPIDatabase.getAddonsInLocation(location);
       addons.forEach(function(aOldAddon) {
-        changed = removeMetadata(aLocation, aOldAddon) || changed;
+        changed = removeMetadata(aOldAddon) || changed;
       }, this);
-    }, this);
+    }
 
     // Tell Telemetry what we found
     AddonManagerPrivate.recordSimpleMeasure("modifiedUnpacked", modifiedUnpacked);
     if (modifiedUnpacked > 0)
       AddonManagerPrivate.recordSimpleMeasure("modifiedExceptInstallRDF", modifiedExManifest);
     AddonManagerPrivate.recordSimpleMeasure("modifiedXPI", modifiedXPI);
 
     // Cache the new install location states
@@ -3187,18 +3182,16 @@ var XPIProvider = {
       // If the state has changed then we must update the database
       let cache = Prefs.getCharPref(PREF_INSTALL_CACHE, null);
       updateDatabase = cache != JSON.stringify(state);
     }
 
     // If the database doesn't exist and there are add-ons installed then we
     // must update the database however if there are no add-ons then there is
     // no need to update the database.
-    // Avoid using XPIDatabase.dbFileExists, as that code is lazy-loaded,
-    // and we want to avoid loading it until absolutely necessary.
     let dbFile = FileUtils.getFile(KEY_PROFILEDIR, [FILE_DATABASE], true);
     if (!dbFile.exists())
       updateDatabase = state.length > 0;
 
     if (!updateDatabase) {
       let bootstrapDescriptors = [this.bootstrappedAddons[b].descriptor
                                   for (b in this.bootstrappedAddons)];
 
@@ -3211,85 +3204,72 @@ var XPIProvider = {
       });
 
       if (bootstrapDescriptors.length > 0) {
         WARN("Bootstrap state is invalid (missing add-ons: " + bootstrapDescriptors.toSource() + ")");
         updateDatabase = true;
       }
     }
 
-    // Catch any errors during the main startup and rollback the database changes
-    let transationBegun = false;
+    // Catch and log any errors during the main startup
     try {
       let extensionListChanged = false;
       // If the database needs to be updated then open it and then update it
       // from the filesystem
       if (updateDatabase || hasPendingChanges) {
-        XPIDatabase.beginTransaction();
-        transationBegun = true;
-        XPIDatabase.openConnection(false, true);
-
+        XPIDatabase.syncLoadDB(false);
         try {
           extensionListChanged = this.processFileChanges(state, manifests,
                                                          aAppChanged,
                                                          aOldAppVersion,
                                                          aOldPlatformVersion);
         }
         catch (e) {
-          ERROR("Error processing file changes", e);
+          ERROR("Failed to process extension changes at startup", e);
         }
       }
       AddonManagerPrivate.recordSimpleMeasure("installedUnpacked", this.unpackedAddons);
 
       if (aAppChanged) {
         // When upgrading the app and using a custom skin make sure it is still
         // compatible otherwise switch back the default
         if (this.currentSkin != this.defaultSkin) {
-          if (!transationBegun) {
-            XPIDatabase.beginTransaction();
-            transationBegun = true;
-          }
           let oldSkin = XPIDatabase.getVisibleAddonForInternalName(this.currentSkin);
           if (!oldSkin || isAddonDisabled(oldSkin))
             this.enableDefaultTheme();
         }
 
         // When upgrading remove the old extensions cache to force older
         // versions to rescan the entire list of extensions
-        let oldCache = FileUtils.getFile(KEY_PROFILEDIR, [FILE_OLD_CACHE], true);
-        if (oldCache.exists())
-          oldCache.remove(true);
+        try {
+          let oldCache = FileUtils.getFile(KEY_PROFILEDIR, [FILE_OLD_CACHE], true);
+          if (oldCache.exists())
+            oldCache.remove(true);
+        }
+        catch (e) {
+          WARN("Unable to remove old extension cache " + oldCache.path, e);
+        }
       }
 
       // If the application crashed before completing any pending operations then
       // we should perform them now.
       if (extensionListChanged || hasPendingChanges) {
         LOG("Updating database with changes to installed add-ons");
-        if (!transationBegun) {
-          XPIDatabase.beginTransaction();
-          transationBegun = true;
-        }
         XPIDatabase.updateActiveAddons();
-        XPIDatabase.commitTransaction();
         XPIDatabase.writeAddonsList();
         Services.prefs.setBoolPref(PREF_PENDING_OPERATIONS, false);
         Services.prefs.setCharPref(PREF_BOOTSTRAP_ADDONS,
                                    JSON.stringify(this.bootstrappedAddons));
         return true;
       }
 
       LOG("No changes found");
-      if (transationBegun)
-        XPIDatabase.commitTransaction();
     }
     catch (e) {
-      ERROR("Error during startup file checks, rolling back any database " +
-            "changes", e);
-      if (transationBegun)
-        XPIDatabase.rollbackTransaction();
+      ERROR("Error during startup file checks", e);
     }
 
     // Check that the add-ons list still exists
     let addonsList = FileUtils.getFile(KEY_PROFILEDIR, [FILE_XPI_ADDONS_LIST],
                                        true);
     if (addonsList.exists() == (state.length == 0)) {
       LOG("Add-ons list is invalid, rebuilding");
       XPIDatabase.writeAddonsList();
@@ -3460,17 +3440,17 @@ var XPIProvider = {
    */
   getAddonsWithOperationsByTypes:
   function XPI_getAddonsWithOperationsByTypes(aTypes, aCallback) {
     XPIDatabase.getVisibleAddonsWithPendingOperations(aTypes,
       function getAddonsWithOpsByTypes_getVisibleAddonsWithPendingOps(aAddons) {
       let results = [createWrapper(a) for each (a in aAddons)];
       XPIProvider.installs.forEach(function(aInstall) {
         if (aInstall.state == AddonManager.STATE_INSTALLED &&
-            !(aInstall.addon instanceof DBAddonInternal))
+            !(aInstall.addon.inDatabase))
           results.push(createWrapper(aInstall.addon));
       });
       aCallback(results);
     });
   },
 
   /**
    * Called to get the current AddonInstalls, optionally limiting to a list of
@@ -3668,17 +3648,17 @@ var XPIProvider = {
   observe: function XPI_observe(aSubject, aTopic, aData) {
     switch (aData) {
     case PREF_EM_MIN_COMPAT_APP_VERSION:
     case PREF_EM_MIN_COMPAT_PLATFORM_VERSION:
       this.minCompatibleAppVersion = Prefs.getCharPref(PREF_EM_MIN_COMPAT_APP_VERSION,
                                                        null);
       this.minCompatiblePlatformVersion = Prefs.getCharPref(PREF_EM_MIN_COMPAT_PLATFORM_VERSION,
                                                             null);
-      this.updateAllAddonDisabledStates();
+      this.updateAddonAppDisabledStates();
       break;
     }
   },
 
   /**
    * Tests whether enabling an add-on will require a restart.
    *
    * @param  aAddon
@@ -3778,17 +3758,17 @@ var XPIProvider = {
     // restarting
     if (Services.appinfo.inSafeMode)
       return false;
 
     // Add-ons that are already installed don't require a restart to install.
     // This wouldn't normally be called for an already installed add-on (except
     // for forming the operationsRequiringRestart flags) so is really here as
     // a safety measure.
-    if (aAddon instanceof DBAddonInternal)
+    if (aAddon.inDatabase)
       return false;
 
     // If we have an AddonInstall for this add-on then we can see if there is
     // an existing installed add-on with the same ID
     if ("_install" in aAddon && aAddon._install) {
       // If there is an existing installed add-on and uninstalling it would
       // require a restart then installing the update will also require a
       // restart
@@ -3987,57 +3967,46 @@ var XPIProvider = {
       }
 
       LOG("Calling bootstrap method " + aMethod + " on " + aId + " version " +
           aVersion);
       try {
         this.bootstrapScopes[aId][aMethod](params, aReason);
       }
       catch (e) {
-        WARN("Exception running bootstrap method " + aMethod + " on " +
-             aId, e);
+        WARN("Exception running bootstrap method " + aMethod + " on " + aId, e);
       }
     }
     finally {
       if (aMethod == "shutdown") {
         LOG("Removing manifest for " + aFile.path);
         Components.manager.removeBootstrappedManifestLocation(aFile);
       }
     }
   },
 
   /**
-   * Updates the appDisabled property for all add-ons.
-   */
-  updateAllAddonDisabledStates: function XPI_updateAllAddonDisabledStates() {
-    let addons = XPIDatabase.getAddons();
-    addons.forEach(function(aAddon) {
-      this.updateAddonDisabledState(aAddon);
-    }, this);
-  },
-
-  /**
    * Updates the disabled state for an add-on. Its appDisabled property will be
-   * calculated and if the add-on is changed appropriate notifications will be
-   * sent out to the registered AddonListeners.
+   * calculated and if the add-on is changed the database will be saved and
+   * appropriate notifications will be sent out to the registered AddonListeners.
    *
    * @param  aAddon
    *         The DBAddonInternal to update
    * @param  aUserDisabled
    *         Value for the userDisabled property. If undefined the value will
    *         not change
    * @param  aSoftDisabled
    *         Value for the softDisabled property. If undefined the value will
    *         not change. If true this will force userDisabled to be true
    * @throws if addon is not a DBAddonInternal
    */
   updateAddonDisabledState: function XPI_updateAddonDisabledState(aAddon,
                                                                   aUserDisabled,
                                                                   aSoftDisabled) {
-    if (!(aAddon instanceof DBAddonInternal))
+    if (!(aAddon.inDatabase))
       throw new Error("Can only update addon states for installed addons.");
     if (aUserDisabled !== undefined && aSoftDisabled !== undefined) {
       throw new Error("Cannot change userDisabled and softDisabled at the " +
                       "same time");
     }
 
     if (aUserDisabled === undefined) {
       aUserDisabled = aAddon.userDisabled;
@@ -4100,18 +4069,17 @@ var XPIProvider = {
       }
       else {
         needsRestart = this.enableRequiresRestart(aAddon);
         AddonManagerPrivate.callAddonListeners("onEnabling", wrapper,
                                                needsRestart);
       }
 
       if (!needsRestart) {
-        aAddon.active = !isDisabled;
-        XPIDatabase.updateAddonActive(aAddon);
+        XPIDatabase.updateAddonActive(aAddon, !isDisabled);
         if (isDisabled) {
           if (aAddon.bootstrap) {
             let file = aAddon._installLocation.getLocationForID(aAddon.id);
             this.callBootstrapMethod(aAddon.id, aAddon.version, aAddon.type, file, "shutdown",
                                      BOOTSTRAP_REASONS.ADDON_DISABLE);
             this.unloadBootstrapScope(aAddon.id);
           }
           AddonManagerPrivate.callAddonListeners("onDisabled", wrapper);
@@ -4137,17 +4105,17 @@ var XPIProvider = {
    * uninstall if not.
    *
    * @param  aAddon
    *         The DBAddonInternal to uninstall
    * @throws if the addon cannot be uninstalled because it is in an install
    *         location that does not allow it
    */
   uninstallAddon: function XPI_uninstallAddon(aAddon) {
-    if (!(aAddon instanceof DBAddonInternal))
+    if (!(aAddon.inDatabase))
       throw new Error("Can only uninstall installed addons.");
 
     if (aAddon._installLocation.locked)
       throw new Error("Cannot uninstall addons from locked install locations");
 
     if ("_hasResourceCache" in aAddon)
       aAddon._hasResourceCache = new Map();
 
@@ -4179,18 +4147,17 @@ var XPIProvider = {
     // Reveal the highest priority add-on with the same ID
     function revealAddon(aAddon) {
       XPIDatabase.makeAddonVisible(aAddon);
 
       let wrappedAddon = createWrapper(aAddon);
       AddonManagerPrivate.callAddonListeners("onInstalling", wrappedAddon, false);
 
       if (!isAddonDisabled(aAddon) && !XPIProvider.enableRequiresRestart(aAddon)) {
-        aAddon.active = true;
-        XPIDatabase.updateAddonActive(aAddon);
+        XPIDatabase.updateAddonActive(aAddon, true);
       }
 
       if (aAddon.bootstrap) {
         let file = aAddon._installLocation.getLocationForID(aAddon.id);
         XPIProvider.callBootstrapMethod(aAddon.id, aAddon.version, aAddon.type, file,
                                         "install", BOOTSTRAP_REASONS.ADDON_INSTALL);
 
         if (aAddon.active) {
@@ -4250,17 +4217,17 @@ var XPIProvider = {
 
   /**
    * Cancels the pending uninstall of an add-on.
    *
    * @param  aAddon
    *         The DBAddonInternal to cancel uninstall for
    */
   cancelUninstallAddon: function XPI_cancelUninstallAddon(aAddon) {
-    if (!(aAddon instanceof DBAddonInternal))
+    if (!(aAddon.inDatabase))
       throw new Error("Can only cancel uninstall for installed addons.");
 
     cleanStagingDir(aAddon._installLocation.getStagingDir(), [aAddon.id]);
 
     XPIDatabase.setAddonProperties(aAddon, {
       pendingUninstall: false
     });
 
@@ -5239,17 +5206,17 @@ AddonInstall.prototype = {
         this.file.copyTo(this.installLocation.getStagingDir(),
                          this.addon.id + ".xpi");
       }
 
       if (requiresRestart) {
         // Point the add-on to its extracted files as the xpi may get deleted
         this.addon._sourceBundle = stagedAddon;
 
-        // Cache the AddonInternal as it may have updated compatibiltiy info
+        // Cache the AddonInternal as it may have updated compatibility info
         let stagedJSON = stagedAddon.clone();
         stagedJSON.leafName = this.addon.id + ".json";
         if (stagedJSON.exists())
           stagedJSON.remove(true);
         let stream = Cc["@mozilla.org/network/file-output-stream;1"].
                      createInstance(Ci.nsIFileOutputStream);
         let converter = Cc["@mozilla.org/intl/converter-output-stream;1"].
                         createInstance(Ci.nsIConverterOutputStream);
@@ -5308,78 +5275,73 @@ AddonInstall.prototype = {
                                             this.existingAddon.type, file,
                                             "uninstall", reason,
                                             { newVersion: this.addon.version });
             XPIProvider.unloadBootstrapScope(this.existingAddon.id);
             flushStartupCache();
           }
 
           if (!isUpgrade && this.existingAddon.active) {
-            this.existingAddon.active = false;
-            XPIDatabase.updateAddonActive(this.existingAddon);
+            XPIDatabase.updateAddonActive(this.existingAddon, false);
           }
         }
 
         // Install the new add-on into its final location
         let existingAddonID = this.existingAddon ? this.existingAddon.id : null;
         let file = this.installLocation.installAddon(this.addon.id, stagedAddon,
                                                      existingAddonID);
         cleanStagingDir(stagedAddon.parent, []);
 
         // Update the metadata in the database
         this.addon._sourceBundle = file;
         this.addon._installLocation = this.installLocation;
-        this.addon.updateDate = recursiveLastModifiedTime(file);
+        this.addon.updateDate = recursiveLastModifiedTime(file); // XXX sync recursive scan
         this.addon.visible = true;
         if (isUpgrade) {
-          XPIDatabase.updateAddonMetadata(this.existingAddon, this.addon,
-                                          file.persistentDescriptor);
+          this.addon =  XPIDatabase.updateAddonMetadata(this.existingAddon, this.addon,
+                                                        file.persistentDescriptor);
         }
         else {
           this.addon.installDate = this.addon.updateDate;
           this.addon.active = (this.addon.visible && !isAddonDisabled(this.addon))
-          XPIDatabase.addAddonMetadata(this.addon, file.persistentDescriptor);
+          this.addon = XPIDatabase.addAddonMetadata(this.addon, file.persistentDescriptor);
+        }
+
+        let extraParams = {};
+        if (this.existingAddon) {
+          extraParams.oldVersion = this.existingAddon.version;
+        }
+
+        if (this.addon.bootstrap) {
+          XPIProvider.callBootstrapMethod(this.addon.id, this.addon.version,
+                                          this.addon.type, file, "install",
+                                          reason, extraParams);
         }
 
-        // Retrieve the new DBAddonInternal for the add-on we just added
-        let self = this;
-        XPIDatabase.getAddonInLocation(this.addon.id, this.installLocation.name,
-                                       function startInstall_getAddonInLocation(a) {
-          self.addon = a;
-          let extraParams = {};
-          if (self.existingAddon) {
-            extraParams.oldVersion = self.existingAddon.version;
-          }
-
-          if (self.addon.bootstrap) {
-            XPIProvider.callBootstrapMethod(self.addon.id, self.addon.version,
-                                            self.addon.type, file, "install",
+        AddonManagerPrivate.callAddonListeners("onInstalled",
+                                               createWrapper(this.addon));
+
+        LOG("Install of " + this.sourceURI.spec + " completed.");
+        this.state = AddonManager.STATE_INSTALLED;
+        AddonManagerPrivate.callInstallListeners("onInstallEnded",
+                                                 this.listeners, this.wrapper,
+                                                 createWrapper(this.addon));
+
+        if (this.addon.bootstrap) {
+          if (this.addon.active) {
+            XPIProvider.callBootstrapMethod(this.addon.id, this.addon.version,
+                                            this.addon.type, file, "startup",
                                             reason, extraParams);
           }
-
-          AddonManagerPrivate.callAddonListeners("onInstalled",
-                                                 createWrapper(self.addon));
-
-          LOG("Install of " + self.sourceURI.spec + " completed.");
-          self.state = AddonManager.STATE_INSTALLED;
-          AddonManagerPrivate.callInstallListeners("onInstallEnded",
-                                                   self.listeners, self.wrapper,
-                                                   createWrapper(self.addon));
-
-          if (self.addon.bootstrap) {
-            if (self.addon.active) {
-              XPIProvider.callBootstrapMethod(self.addon.id, self.addon.version,
-                                              self.addon.type, file, "startup",
-                                              reason, extraParams);
-            }
-            else {
-              XPIProvider.unloadBootstrapScope(self.addon.id);
-            }
+          else {
+            // XXX this makes it dangerous to do many things in onInstallEnded
+            // listeners because important cleanup hasn't been done yet
+            XPIProvider.unloadBootstrapScope(this.addon.id);
           }
-        });
+        }
       }
     }
     catch (e) {
       WARN("Failed to install", e);
       if (stagedAddon.exists())
         recursiveRemove(stagedAddon);
       this.state = AddonManager.STATE_INSTALL_FAILED;
       this.error = AddonManager.ERROR_FILE_ACCESS;
@@ -5744,40 +5706,33 @@ UpdateChecker.prototype = {
     this.callListener("onNoCompatibilityUpdateAvailable", createWrapper(this.addon));
     this.callListener("onNoUpdateAvailable", createWrapper(this.addon));
     this.callListener("onUpdateFinished", createWrapper(this.addon), aError);
   }
 };
 
 /**
  * The AddonInternal is an internal only representation of add-ons. It may
- * have come from the database (see DBAddonInternal below) or an install
- * manifest.
+ * have come from the database (see DBAddonInternal in XPIProviderUtils.jsm)
+ * or an install manifest.
  */
 function AddonInternal() {
 }
 
 AddonInternal.prototype = {
   _selectedLocale: null,
   active: false,
   visible: false,
   userDisabled: false,
   appDisabled: false,
   softDisabled: false,
   sourceURI: null,
   releaseNotesURI: null,
   foreignInstall: false,
 
-  get isForeignInstall() {
-    return this.foreignInstall;
-  },
-  set isForeignInstall(aVal) {
-    this.foreignInstall = aVal;
-  },
-
   get selectedLocale() {
     if (this._selectedLocale)
       return this._selectedLocale;
     let locale = findClosestLocale(this.locales);
     this._selectedLocale = locale ? locale : this.defaultLocale;
     return this._selectedLocale;
   },
 
@@ -5962,103 +5917,29 @@ AddonInternal.prototype = {
    * When an add-on install is pending its metadata will be cached in a file.
    * This method reads particular properties of that metadata that may be newer
    * than that in the install manifest, like compatibility information.
    *
    * @param  aObj
    *         A JS object containing the cached metadata
    */
   importMetadata: function AddonInternal_importMetaData(aObj) {
-    ["syncGUID", "targetApplications", "userDisabled", "softDisabled",
-     "existingAddonID", "sourceURI", "releaseNotesURI", "installDate",
-     "updateDate", "applyBackgroundUpdates", "compatibilityOverrides"]
-    .forEach(function(aProp) {
+    PENDING_INSTALL_METADATA.forEach(function(aProp) {
       if (!(aProp in aObj))
         return;
 
       this[aProp] = aObj[aProp];
     }, this);
 
     // Compatibility info may have changed so update appDisabled
     this.appDisabled = !isUsableAddon(this);
   }
 };
 
 /**
- * The DBAddonInternal is a special AddonInternal that has been retrieved from
- * the database. Add-ons retrieved synchronously only have the basic metadata
- * the rest is filled out synchronously when needed. Asynchronously read add-ons
- * have all data available.
- */
-function DBAddonInternal() {
-  this.__defineGetter__("targetApplications", function DBA_targetApplicationsGetter() {
-    delete this.targetApplications;
-    return this.targetApplications = XPIDatabase._getTargetApplications(this);
-  });
-
-  this.__defineGetter__("targetPlatforms", function DBA_targetPlatformsGetter() {
-    delete this.targetPlatforms;
-    return this.targetPlatforms = XPIDatabase._getTargetPlatforms(this);
-  });
-
-  this.__defineGetter__("locales", function DBA_localesGetter() {
-    delete this.locales;
-    return this.locales = XPIDatabase._getLocales(this);
-  });
-
-  this.__defineGetter__("defaultLocale", function DBA_defaultLocaleGetter() {
-    delete this.defaultLocale;
-    return this.defaultLocale = XPIDatabase._getDefaultLocale(this);
-  });
-
-  this.__defineGetter__("pendingUpgrade", function DBA_pendingUpgradeGetter() {
-    delete this.pendingUpgrade;
-    for (let install of XPIProvider.installs) {
-      if (install.state == AddonManager.STATE_INSTALLED &&
-          !(install.addon instanceof DBAddonInternal) &&
-          install.addon.id == this.id &&
-          install.installLocation == this._installLocation) {
-        return this.pendingUpgrade = install.addon;
-      }
-    };
-  });
-}
-
-DBAddonInternal.prototype = {
-  applyCompatibilityUpdate: function DBA_applyCompatibilityUpdate(aUpdate, aSyncCompatibility) {
-    let changes = [];
-    this.targetApplications.forEach(function(aTargetApp) {
-      aUpdate.targetApplications.forEach(function(aUpdateTarget) {
-        if (aTargetApp.id == aUpdateTarget.id && (aSyncCompatibility ||
-            Services.vc.compare(aTargetApp.maxVersion, aUpdateTarget.maxVersion) < 0)) {
-          aTargetApp.minVersion = aUpdateTarget.minVersion;
-          aTargetApp.maxVersion = aUpdateTarget.maxVersion;
-          changes.push(aUpdateTarget);
-        }
-      });
-    });
-    try {
-      XPIDatabase.updateTargetApplications(this, changes);
-    }
-    catch (e) {
-      // A failure just means that we discard the compatibility update
-      ERROR("Failed to update target application info in the database for " +
-            "add-on " + this.id, e);
-      return;
-    }
-    XPIProvider.updateAddonDisabledState(this);
-  }
-}
-
-DBAddonInternal.prototype.__proto__ = AddonInternal.prototype;
-// Make it accessible to XPIDatabase.
-XPIProvider.DBAddonInternal = DBAddonInternal;
-
-
-/**
  * Creates an AddonWrapper for an AddonInternal.
  *
  * @param   addon
  *          The AddonInternal to wrap
  * @return  an AddonWrapper or null if addon was null
  */
 function createWrapper(aAddon) {
   if (!aAddon)
@@ -6299,17 +6180,17 @@ function AddonWrapper(aAddon) {
 
     return val;
   });
 
   this.__defineSetter__("syncGUID", function AddonWrapper_syncGUIDGetter(val) {
     if (aAddon.syncGUID == val)
       return val;
 
-    if (aAddon instanceof DBAddonInternal)
+    if (aAddon.inDatabase)
       XPIDatabase.setAddonSyncGUID(aAddon, val);
 
     aAddon.syncGUID = val;
 
     return val;
   });
 
   this.__defineGetter__("install", function AddonWrapper_installGetter() {
@@ -6326,17 +6207,17 @@ function AddonWrapper(aAddon) {
     if (aAddon._installLocation)
       return aAddon._installLocation.scope;
 
     return AddonManager.SCOPE_PROFILE;
   });
 
   this.__defineGetter__("pendingOperations", function AddonWrapper_pendingOperationsGetter() {
     let pending = 0;
-    if (!(aAddon instanceof DBAddonInternal)) {
+    if (!(aAddon.inDatabase)) {
       // Add-on is pending install if there is no associated install (shouldn't
       // happen here) or if the install is in the process of or has successfully
       // completed the install. If an add-on is pending install then we ignore
       // any other pending operations.
       if (!aAddon._install || aAddon._install.state == AddonManager.STATE_INSTALLING ||
           aAddon._install.state == AddonManager.STATE_INSTALLED)
         return AddonManager.PENDING_INSTALL;
     }
@@ -6370,17 +6251,17 @@ function AddonWrapper(aAddon) {
 
     return ops;
   });
 
   this.__defineGetter__("permissions", function AddonWrapper_permisionsGetter() {
     let permissions = 0;
 
     // Add-ons that aren't installed cannot be modified in any way
-    if (!(aAddon instanceof DBAddonInternal))
+    if (!(aAddon.inDatabase))
       return permissions;
 
     if (!aAddon.appDisabled) {
       if (this.userDisabled)
         permissions |= AddonManager.PERM_CAN_ENABLE;
       else if (aAddon.type != "theme")
         permissions |= AddonManager.PERM_CAN_DISABLE;
     }
@@ -6405,17 +6286,17 @@ function AddonWrapper(aAddon) {
 
   this.__defineGetter__("userDisabled", function AddonWrapper_userDisabledGetter() {
     return aAddon.softDisabled || aAddon.userDisabled;
   });
   this.__defineSetter__("userDisabled", function AddonWrapper_userDisabledSetter(val) {
     if (val == this.userDisabled)
       return val;
 
-    if (aAddon instanceof DBAddonInternal) {
+    if (aAddon.inDatabase) {
       if (aAddon.type == "theme" && val) {
         if (aAddon.internalName == XPIProvider.defaultSkin)
           throw new Error("Cannot disable the default theme");
         XPIProvider.enableDefaultTheme();
       }
       else {
         XPIProvider.updateAddonDisabledState(aAddon, val);
       }
@@ -6429,17 +6310,17 @@ function AddonWrapper(aAddon) {
 
     return val;
   });
 
   this.__defineSetter__("softDisabled", function AddonWrapper_softDisabledSetter(val) {
     if (val == aAddon.softDisabled)
       return val;
 
-    if (aAddon instanceof DBAddonInternal) {
+    if (aAddon.inDatabase) {
       // When softDisabling a theme just enable the active theme
       if (aAddon.type == "theme" && val && !aAddon.userDisabled) {
         if (aAddon.internalName == XPIProvider.defaultSkin)
           throw new Error("Cannot disable the default theme");
         XPIProvider.enableDefaultTheme();
       }
       else {
         XPIProvider.updateAddonDisabledState(aAddon, undefined, val);
@@ -6454,25 +6335,25 @@ function AddonWrapper(aAddon) {
     return val;
   });
 
   this.isCompatibleWith = function AddonWrapper_isCompatiblewith(aAppVersion, aPlatformVersion) {
     return aAddon.isCompatibleWith(aAppVersion, aPlatformVersion);
   };
 
   this.uninstall = function AddonWrapper_uninstall() {
-    if (!(aAddon instanceof DBAddonInternal))
+    if (!(aAddon.inDatabase))
       throw new Error("Cannot uninstall an add-on that isn't installed");
     if (aAddon.pendingUninstall)
       throw new Error("Add-on is already marked to be uninstalled");
     XPIProvider.uninstallAddon(aAddon);
   };
 
   this.cancelUninstall = function AddonWrapper_cancelUninstall() {
-    if (!(aAddon instanceof DBAddonInternal))
+    if (!(aAddon.inDatabase))
       throw new Error("Cannot cancel uninstall for an add-on that isn't installed");
     if (!aAddon.pendingUninstall)
       throw new Error("Add-on is not marked to be uninstalled");
     XPIProvider.cancelUninstallAddon(aAddon);
   };
 
   this.findUpdates = function AddonWrapper_findUpdates(aListener, aReason, aAppVersion, aPlatformVersion) {
     new UpdateChecker(aAddon, aListener, aReason, aAppVersion, aPlatformVersion);