diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index acfd3b339284..527542ba46cc 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -1078,7 +1078,7 @@ pref("devtools.commands.dir", "");
 
 // Enable the app manager
 pref("devtools.appmanager.enabled", true);
-pref("devtools.appmanager.firstrun", true);
+pref("devtools.appmanager.lastTab", "help");
 pref("devtools.appmanager.manifestEditor.enabled", false);
 
 // Toolbox preferences
diff --git a/browser/base/content/nsContextMenu.js b/browser/base/content/nsContextMenu.js
index a08898dbd904..fb9a5241631b 100644
--- a/browser/base/content/nsContextMenu.js
+++ b/browser/base/content/nsContextMenu.js
@@ -986,16 +986,15 @@ nsContextMenu.prototype = {
   },
 
   saveVideoFrameAsImage: function () {
-    urlSecurityCheck(this.mediaURL,
-                     this._unremotePrincipal(this.browser.contentPrincipal),
-                     Ci.nsIScriptSecurityManager.DISALLOW_SCRIPT);
     let name = "";
-    try {
-      let uri = makeURI(this.mediaURL);
-      let url = uri.QueryInterface(Ci.nsIURL);
-      if (url.fileBaseName)
-        name = decodeURI(url.fileBaseName) + ".jpg";
-    } catch (e) { }
+    if (this.mediaURL) {
+      try {
+        let uri = makeURI(this.mediaURL);
+        let url = uri.QueryInterface(Ci.nsIURL);
+        if (url.fileBaseName)
+          name = decodeURI(url.fileBaseName) + ".jpg";
+      } catch (e) { }
+    }
     if (!name)
       name = "snapshot.jpg";
     var video = this.target;
diff --git a/browser/devtools/app-manager/content/device.js b/browser/devtools/app-manager/content/device.js
index fb50073c7592..84f916c53405 100644
--- a/browser/devtools/app-manager/content/device.js
+++ b/browser/devtools/app-manager/content/device.js
@@ -162,16 +162,13 @@ let UI = {
     if (!this.connected) {
       return;
     }
+
+    let app = this.store.object.apps.all.filter(a => a.manifestURL == manifest)[0];
     getTargetForApp(this.connection.client,
                     this.listTabsResponse.webappsActor,
                     manifest).then((target) => {
-      gDevTools.showToolbox(target,
-                            null,
-                            devtools.Toolbox.HostType.WINDOW).then(toolbox => {
-        this.connection.once(Connection.Events.DISCONNECTED, () => {
-          toolbox.destroy();
-        });
-      });
+
+      top.UI.openAndShowToolboxForTarget(target, app.name, app.iconURL);
     }, console.error);
   },
 
diff --git a/browser/devtools/app-manager/content/index.js b/browser/devtools/app-manager/content/index.js
index 8f21eeaf226d..aa0ee4d654dd 100644
--- a/browser/devtools/app-manager/content/index.js
+++ b/browser/devtools/app-manager/content/index.js
@@ -7,76 +7,176 @@ Cu.import("resource:///modules/devtools/gDevTools.jsm");
 const {devtools} = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
 const {require} = devtools;
 const {ConnectionManager, Connection} = require("devtools/client/connection-manager");
+const promise = require("sdk/core/promise");
 const prefs = require('sdk/preferences/service');
 
-let connection;
 
-window.addEventListener("message", function(event) {
-  try {
-    let json = JSON.parse(event.data);
-    switch (json.name) {
-      case "connection":
-        let cid = +json.cid;
-        for (let c of ConnectionManager.connections) {
-          if (c.uid == cid) {
-            connection = c;
-            onNewConnection();
-            break;
-          }
-        }
-        break;
-      case "closeHelp":
-        selectTab("projects");
-        break;
-      default:
-        Cu.reportError("Unknown message: " + json.name);
+let UI = {
+  _toolboxTabCursor: 0,
+  _handledTargets: new Map(),
+
+  connection: null,
+
+  init: function() {
+    this.onLoad = this.onLoad.bind(this);
+    this.onUnload = this.onUnload.bind(this);
+    this.onMessage = this.onMessage.bind(this);
+    this.onConnected = this.onConnected.bind(this);
+    this.onDisconnected = this.onDisconnected.bind(this);
+
+    window.addEventListener("load", this.onLoad);
+    window.addEventListener("unload", this.onUnload);
+    window.addEventListener("message", this.onMessage);
+  },
+
+  onLoad: function() {
+    window.removeEventListener("load", this.onLoad);
+    let defaultPanel = prefs.get("devtools.appmanager.lastTab");
+    let panelExists = !!document.querySelector("." + defaultPanel  + "-panel");
+    this.selectTab(panelExists ? defaultPanel : "projects");
+  },
+
+  onUnload: function() {
+    window.removeEventListener("unload", this.onUnload);
+    window.removeEventListener("message", this.onMessage);
+    if (this.connection) {
+      this.connection.off(Connection.Status.CONNECTED, this.onConnected);
+      this.connection.off(Connection.Status.DISCONNECTED, this.onDisconnected);
     }
-  } catch(e) { Cu.reportError(e); }
+  },
 
-  // Forward message
-  let panels = document.querySelectorAll(".panel");
-  for (let frame of panels) {
-    frame.contentWindow.postMessage(event.data, "*");
-  }
-}, false);
+  onMessage: function(event) {
+    try {
+      let json = JSON.parse(event.data);
+      switch (json.name) {
+        case "connection":
+          let cid = +json.cid;
+          for (let c of ConnectionManager.connections) {
+            if (c.uid == cid) {
+              this.onNewConnection(c);
+              break;
+            }
+          }
+          break;
+        case "closeHelp":
+          this.selectTab("projects");
+          break;
+        case "toolbox-raise":
+          this.selectTab(json.uid);
+          break;
+        case "toolbox-close":
+          this.closeToolboxTab(json.uid);
+          break;
+        default:
+          Cu.reportError("Unknown message: " + json.name);
+      }
+    } catch(e) { Cu.reportError(e); }
 
-window.addEventListener("unload", function onUnload() {
-  window.removeEventListener("unload", onUnload);
-  if (connection) {
-    connection.off(Connection.Status.CONNECTED, onConnected);
-    connection.off(Connection.Status.DISCONNECTED, onDisconnected);
-  }
-});
+    // Forward message
+    let panels = document.querySelectorAll(".panel");
+    for (let frame of panels) {
+      frame.contentWindow.postMessage(event.data, "*");
+    }
+  },
 
-function onNewConnection() {
-  connection.on(Connection.Status.CONNECTED, onConnected);
-  connection.on(Connection.Status.DISCONNECTED, onDisconnected);
-}
+  selectTabFromButton: function(button) {
+    if (!button.hasAttribute("panel"))
+      return;
+    this.selectTab(button.getAttribute("panel"));
+  },
 
-function onConnected() {
-  document.querySelector("#content").classList.add("connected");
-}
+  selectTab: function(panel) {
+    let isToolboxTab = false;
+    for (let type of ["button", "panel"]) {
+      let oldSelection = document.querySelector("." + type + "[selected]");
+      let newSelection = document.querySelector("." + panel + "-" + type);
+      if (oldSelection) oldSelection.removeAttribute("selected");
+      if (newSelection) {
+        newSelection.scrollIntoView(false);
+        newSelection.setAttribute("selected", "true");
+        if (newSelection.classList.contains("toolbox")) {
+          isToolboxTab = true;
+        }
+      }
+    }
+    if (!isToolboxTab) {
+      prefs.set("devtools.appmanager.lastTab", panel);
+    }
+  },
 
-function onDisconnected() {
-  document.querySelector("#content").classList.remove("connected");
-}
+  onNewConnection: function(connection) {
+    this.connection = connection;
+    this.connection.on(Connection.Status.CONNECTED, this.onConnected);
+    this.connection.on(Connection.Status.DISCONNECTED, this.onDisconnected);
+  },
 
-function selectTab(id) {
-  for (let type of ["button", "panel"]) {
-    let oldSelection = document.querySelector("." + type + "[selected]");
-    let newSelection = document.querySelector("." + id + "-" + type);
-    if (oldSelection) oldSelection.removeAttribute("selected");
-    if (newSelection) newSelection.setAttribute("selected", "true");
-  }
-  if (id != "help") {
-    // Might be the first time the user is accessing the actual app manager
-    prefs.set("devtools.appmanager.firstrun", false);
+  onConnected: function() {
+    document.querySelector("#content").classList.add("connected");
+  },
+
+  onDisconnected: function() {
+    for (let [,toolbox] of this._handledTargets) {
+      if (toolbox) {
+        toolbox.destroy();
+      }
+    }
+    this._handledTargets.clear();
+    document.querySelector("#content").classList.remove("connected");
+  },
+
+  createToolboxTab: function(name, iconURL, uid) {
+    let button = document.createElement("button");
+    button.className = "button toolbox " + uid + "-button";
+    button.setAttribute("panel", uid);
+    button.textContent = name;
+    button.setAttribute("style", "background-image: url(" + iconURL + ")");
+    let toolboxTabs = document.querySelector("#toolbox-tabs");
+    toolboxTabs.appendChild(button);
+    let iframe = document.createElement("iframe");
+    iframe.setAttribute("flex", "1");
+    iframe.className = "panel toolbox " + uid + "-panel";
+    let panels = document.querySelector("#tab-panels");
+    panels.appendChild(iframe);
+    this.selectTab(uid);
+    return iframe;
+  },
+
+  closeToolboxTab: function(uid) {
+    let buttonToDestroy = document.querySelector("." + uid + "-button");
+    let panelToDestroy = document.querySelector("." + uid + "-panel");
+
+    if (buttonToDestroy.hasAttribute("selected")) {
+      let lastTab = prefs.get("devtools.appmanager.lastTab");
+      this.selectTab(lastTab);
+    }
+
+    buttonToDestroy.remove();
+    panelToDestroy.remove();
+  },
+
+  openAndShowToolboxForTarget: function(target, name, icon) {
+    let host = devtools.Toolbox.HostType.CUSTOM;
+    if (!this._handledTargets.has(target)) {
+      let uid = "uid" + this._toolboxTabCursor++;
+      let iframe = this.createToolboxTab(name, icon, uid);
+      let options = { customIframe: iframe , uid: uid };
+      this._handledTargets.set(target, null);
+      return gDevTools.showToolbox(target, null, host, options).then(toolbox => {
+        this._handledTargets.set(target, toolbox);
+        toolbox.once("destroyed", () => {
+          this._handledTargets.delete(target)
+        });
+      });
+    } else {
+      let toolbox = this._handledTargets.get(target);
+      if (!toolbox) {
+        // Target is handled, but toolbox is still being
+        // created.
+        return promise.resolve(null);
+      }
+      return gDevTools.showToolbox(target, null, host);
+    }
   }
 }
 
-let firstRun = prefs.get("devtools.appmanager.firstrun");
-if (firstRun) {
-  selectTab("help");
-} else {
-  selectTab("projects");
-}
+UI.init();
diff --git a/browser/devtools/app-manager/content/index.xul b/browser/devtools/app-manager/content/index.xul
index ba27f097af83..82afbeb3c874 100644
--- a/browser/devtools/app-manager/content/index.xul
+++ b/browser/devtools/app-manager/content/index.xul
@@ -22,11 +22,11 @@
 
   <vbox id="root" flex="1">
     <hbox id="content" flex="1">
-      <vbox id="tabs">
-        <button class="button projects-button" onclick="selectTab('projects')">&index.projects2;</button>
-        <button class="button device-button" onclick="selectTab('device')">&index.device2;</button>
-        <spacer flex="1"/>
-        <button class="button help-button" onclick="selectTab('help')">&index.help;</button>
+      <vbox id="tabs" onclick="UI.selectTabFromButton(event.target)">
+        <button class="button projects-button" panel="projects">&index.projects2;</button>
+        <button class="button device-button" panel="device">&index.device2;</button>
+        <vbox id="toolbox-tabs" flex="1"/>
+        <button class="button help-button" panel="help">&index.help;</button>
       </vbox>
       <hbox id="tab-panels" flex="1">
         <iframe flex="1" class="panel projects-panel" src="chrome://browser/content/devtools/app-manager/projects.xhtml"/>
diff --git a/browser/devtools/app-manager/content/projects.js b/browser/devtools/app-manager/content/projects.js
index 0299346973e5..7fb32c33ee6b 100644
--- a/browser/devtools/app-manager/content/projects.js
+++ b/browser/devtools/app-manager/content/projects.js
@@ -356,25 +356,15 @@ let UI = {
       loop(0);
       return deferred.promise;
     };
-    let onTargetReady = (target) => {
-      // Finally, when it's finally opened, display the toolbox
-      let deferred = promise.defer();
-      gDevTools.showToolbox(target,
-                            null,
-                            devtools.Toolbox.HostType.WINDOW).then(toolbox => {
-        this.connection.once(Connection.Events.DISCONNECTED, () => {
-          toolbox.destroy();
-        });
-        deferred.resolve(toolbox);
-      });
-      return deferred.promise;
-    };
 
     // First try to open the app
     this.start(project)
         .then(null, onFailedToStart)
         .then(onStarted)
-        .then(onTargetReady)
+        .then((target) =>
+          top.UI.openAndShowToolboxForTarget(target,
+                                             project.manifest.name,
+                                             project.icon))
         .then(() => {
            // And only when the toolbox is opened, release the button
            button.disabled = false;
diff --git a/browser/devtools/debugger/test/browser_dbg_navigation.js b/browser/devtools/debugger/test/browser_dbg_navigation.js
index 6a66f1d5db76..48563cb546cb 100644
--- a/browser/devtools/debugger/test/browser_dbg_navigation.js
+++ b/browser/devtools/debugger/test/browser_dbg_navigation.js
@@ -33,7 +33,7 @@ function test() {
   });
 }
 
-function testNavigate() {
+function testNavigate([aGrip, aResponse]) {
   let outstanding = [promise.defer(), promise.defer()];
 
   gClient.addListener("tabNavigated", function onTabNavigated(aEvent, aPacket) {
@@ -51,14 +51,16 @@ function testNavigate() {
   });
 
   gBrowser.selectedTab.linkedBrowser.loadURI(TAB2_URL);
-  return promise.all(outstanding.map(e => e.promise));
+  return promise.all(outstanding.map(e => e.promise))
+                .then(() => aGrip.actor);
 }
 
-function testDetach() {
+function testDetach(aActor) {
   let deferred = promise.defer();
 
-  gClient.addOneTimeListener("tabDetached", () => {
+  gClient.addOneTimeListener("tabDetached", (aType, aPacket) => {
     ok(true, "Got a tab detach notification.");
+    is(aPacket.from, aActor, "tab detach message comes from the expected actor");
     gClient.close(deferred.resolve);
   });
 
diff --git a/browser/devtools/framework/gDevTools.jsm b/browser/devtools/framework/gDevTools.jsm
index 76afcae28d12..1948bd3b8471 100644
--- a/browser/devtools/framework/gDevTools.jsm
+++ b/browser/devtools/framework/gDevTools.jsm
@@ -206,11 +206,13 @@ DevTools.prototype = {
    *        The id of the tool to show
    * @param {Toolbox.HostType} hostType
    *        The type of host (bottom, window, side)
+   * @param {object} hostOptions
+   *        Options for host specifically
    *
    * @return {Toolbox} toolbox
    *        The toolbox that was opened
    */
-  showToolbox: function(target, toolId, hostType) {
+  showToolbox: function(target, toolId, hostType, hostOptions) {
     let deferred = promise.defer();
 
     let toolbox = this._toolboxes.get(target);
@@ -233,7 +235,7 @@ DevTools.prototype = {
     }
     else {
       // No toolbox for target, create one
-      toolbox = new devtools.Toolbox(target, toolId, hostType);
+      toolbox = new devtools.Toolbox(target, toolId, hostType, hostOptions);
 
       this._toolboxes.set(target, toolbox);
 
diff --git a/browser/devtools/framework/target.js b/browser/devtools/framework/target.js
index 65894254a4d4..0e5680c4c16e 100644
--- a/browser/devtools/framework/target.js
+++ b/browser/devtools/framework/target.js
@@ -350,7 +350,13 @@ TabTarget.prototype = {
    * Setup listeners for remote debugging, updating existing ones as necessary.
    */
   _setupRemoteListeners: function TabTarget__setupRemoteListeners() {
-    this.client.addListener("tabDetached", this.destroy);
+    this._onTabDetached = (aType, aPacket) => {
+      // We have to filter message to ensure that this detach is for this tab
+      if (aPacket.from == this._form.actor) {
+        this.destroy();
+      }
+    };
+    this.client.addListener("tabDetached", this._onTabDetached);
 
     this._onTabNavigated = function onRemoteTabNavigated(aType, aPacket) {
       let event = Object.create(null);
@@ -377,7 +383,7 @@ TabTarget.prototype = {
    */
   _teardownRemoteListeners: function TabTarget__teardownRemoteListeners() {
     this.client.removeListener("tabNavigated", this._onTabNavigated);
-    this.client.removeListener("tabDetached", this.destroy);
+    this.client.removeListener("tabDetached", this._onTabDetached);
   },
 
   /**
diff --git a/browser/devtools/framework/test/browser.ini b/browser/devtools/framework/test/browser.ini
index bf250c3df039..33dadc3073b9 100644
--- a/browser/devtools/framework/test/browser.ini
+++ b/browser/devtools/framework/test/browser.ini
@@ -22,3 +22,4 @@ support-files = head.js
 [browser_toolbox_window_shortcuts.js]
 [browser_toolbox_window_title_changes.js]
 [browser_toolbox_zoom.js]
+[browser_toolbox_custom_host.js]
diff --git a/browser/devtools/framework/test/browser_toolbox_custom_host.js b/browser/devtools/framework/test/browser_toolbox_custom_host.js
new file mode 100644
index 000000000000..d8c7b27b9d4d
--- /dev/null
+++ b/browser/devtools/framework/test/browser_toolbox_custom_host.js
@@ -0,0 +1,60 @@
+/* vim: set ts=2 et sw=2 tw=80: */
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+function test() {
+  Cu.import("resource://gre/modules/Services.jsm");
+  let temp = {}
+  Cu.import("resource:///modules/devtools/gDevTools.jsm", temp);
+  let DevTools = temp.DevTools;
+  Cu.import("resource://gre/modules/devtools/LayoutHelpers.jsm", temp);
+  let LayoutHelpers = temp.LayoutHelpers;
+
+  Cu.import("resource://gre/modules/devtools/Loader.jsm", temp);
+  let devtools = temp.devtools;
+
+  let Toolbox = devtools.Toolbox;
+
+  let toolbox, iframe, target, tab;
+
+  waitForExplicitFinish();
+
+  gBrowser.selectedTab = gBrowser.addTab();
+  target = TargetFactory.forTab(gBrowser.selectedTab);
+
+  window.addEventListener("message", onMessage);
+
+  iframe = document.createElement("iframe");
+  document.documentElement.appendChild(iframe);
+
+  gBrowser.selectedBrowser.addEventListener("load", function onLoad(evt) {
+    gBrowser.selectedBrowser.removeEventListener(evt.type, onLoad, true);
+    let options = {customIframe: iframe};
+    gDevTools.showToolbox(target, null, Toolbox.HostType.CUSTOM, options)
+             .then(testCustomHost, console.error)
+             .then(null, console.error);
+  }, true);
+
+  content.location = "data:text/html,test custom host";
+
+  function onMessage(event) {
+    info("onMessage: " + event.data);
+    let json = JSON.parse(event.data);
+    if (json.name == "toolbox-close") {
+      ok("Got the `toolbox-close` message");
+      cleanup();
+    }
+  }
+
+  function testCustomHost(toolbox) {
+    is(toolbox.doc.defaultView.top, window, "Toolbox is included in browser.xul");
+    is(toolbox.doc, iframe.contentDocument, "Toolbox is in the custom iframe");
+    executeSoon(() => gBrowser.removeCurrentTab());
+  }
+
+  function cleanup() {
+    window.removeEventListener("message", onMessage);
+    iframe.remove();
+    finish();
+  }
+}
diff --git a/browser/devtools/framework/toolbox-hosts.js b/browser/devtools/framework/toolbox-hosts.js
index f4ed648b7733..e27bcc9a6a2a 100644
--- a/browser/devtools/framework/toolbox-hosts.js
+++ b/browser/devtools/framework/toolbox-hosts.js
@@ -10,6 +10,7 @@ let promise = require("sdk/core/promise");
 let EventEmitter = require("devtools/shared/event-emitter");
 
 Cu.import("resource://gre/modules/Services.jsm");
+Cu.import("resource:///modules/devtools/DOMHelpers.jsm");
 
 /**
  * A toolbox host represents an object that contains a toolbox (e.g. the
@@ -23,7 +24,8 @@ Cu.import("resource://gre/modules/Services.jsm");
 exports.Hosts = {
   "bottom": BottomHost,
   "side": SidebarHost,
-  "window": WindowHost
+  "window": WindowHost,
+  "custom": CustomHost
 }
 
 /**
@@ -61,18 +63,18 @@ BottomHost.prototype = {
     this._nbox.appendChild(this.frame);
 
     let frameLoad = function() {
-      this.frame.removeEventListener("DOMContentLoaded", frameLoad, true);
       this.emit("ready", this.frame);
-
       deferred.resolve(this.frame);
     }.bind(this);
 
     this.frame.tooltip = "aHTMLTooltip";
-    this.frame.addEventListener("DOMContentLoaded", frameLoad, true);
 
     // we have to load something so we can switch documents if we have to
     this.frame.setAttribute("src", "about:blank");
 
+    let domHelper = new DOMHelpers(this.frame.contentWindow);
+    domHelper.onceDOMReady(frameLoad);
+
     focusTab(this.hostTab);
 
     return deferred.promise;
@@ -272,6 +274,59 @@ WindowHost.prototype = {
   }
 }
 
+/**
+ * Host object for the toolbox in its own tab
+ */
+function CustomHost(hostTab, options) {
+  this.frame = options.customIframe;
+  this.uid = options.uid;
+  EventEmitter.decorate(this);
+}
+
+CustomHost.prototype = {
+  type: "custom",
+
+  _sendMessageToTopWindow: function CH__sendMessageToTopWindow(msg) {
+    // It's up to the custom frame owner (parent window) to honor
+    // "close" or "raise" instructions.
+    let topWindow = this.frame.ownerDocument.defaultView;
+    let json = {name:"toolbox-" + msg, uid: this.uid}
+    topWindow.postMessage(JSON.stringify(json), "*");
+  },
+
+  /**
+   * Create a new xul window to contain the toolbox.
+   */
+  create: function CH_create() {
+    return promise.resolve(this.frame);
+  },
+
+  /**
+   * Raise the host.
+   */
+  raise: function CH_raise() {
+    this._sendMessageToTopWindow("raise");
+  },
+
+  /**
+   * Set the toolbox title.
+   */
+  setTitle: function CH_setTitle(title) {
+    // Not supported
+  },
+
+  /**
+   * Destroy the window.
+   */
+  destroy: function WH_destroy() {
+    if (!this._destroyed) {
+      this._destroyed = true;
+      this._sendMessageToTopWindow("close");
+    }
+    return promise.resolve(null);
+  }
+}
+
 /**
  *  Switch to the given tab in a browser and focus the browser window
  */
diff --git a/browser/devtools/framework/toolbox.js b/browser/devtools/framework/toolbox.js
index f226ea5da61d..095206b2606f 100644
--- a/browser/devtools/framework/toolbox.js
+++ b/browser/devtools/framework/toolbox.js
@@ -19,6 +19,7 @@ Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource:///modules/devtools/gDevTools.jsm");
 Cu.import("resource:///modules/devtools/scratchpad-manager.jsm");
+Cu.import("resource:///modules/devtools/DOMHelpers.jsm");
 
 loader.lazyGetter(this, "Hosts", () => require("devtools/framework/toolbox-hosts").Hosts);
 
@@ -55,8 +56,10 @@ loader.lazyGetter(this, "Requisition", () => {
  *        Tool to select initially
  * @param {Toolbox.HostType} hostType
  *        Type of host that will host the toolbox (e.g. sidebar, window)
+ * @param {object} hostOptions
+ *        Options for host specifically
  */
-function Toolbox(target, selectedTool, hostType) {
+function Toolbox(target, selectedTool, hostType, hostOptions) {
   this._target = target;
   this._toolPanels = new Map();
   this._telemetry = new Telemetry();
@@ -79,7 +82,7 @@ function Toolbox(target, selectedTool, hostType) {
   }
   this._defaultToolId = selectedTool;
 
-  this._host = this._createHost(hostType);
+  this._host = this._createHost(hostType, hostOptions);
 
   EventEmitter.decorate(this);
 
@@ -99,7 +102,8 @@ exports.Toolbox = Toolbox;
 Toolbox.HostType = {
   BOTTOM: "bottom",
   SIDE: "side",
-  WINDOW: "window"
+  WINDOW: "window",
+  CUSTOM: "custom"
 };
 
 Toolbox.prototype = {
@@ -187,8 +191,6 @@ Toolbox.prototype = {
       let deferred = promise.defer();
 
       let domReady = () => {
-        iframe.removeEventListener("DOMContentLoaded", domReady, true);
-
         this.isReady = true;
 
         let closeButton = this.doc.getElementById("toolbox-close");
@@ -211,9 +213,11 @@ Toolbox.prototype = {
         });
       };
 
-      iframe.addEventListener("DOMContentLoaded", domReady, true);
       iframe.setAttribute("src", this._URL);
 
+      let domHelper = new DOMHelpers(iframe.contentWindow);
+      domHelper.onceDOMReady(domReady);
+
       return deferred.promise;
     });
   },
@@ -387,6 +391,7 @@ Toolbox.prototype = {
     for (let type in Toolbox.HostType) {
       let position = Toolbox.HostType[type];
       if (position == this.hostType ||
+          position == Toolbox.HostType.CUSTOM ||
           (!sideEnabled && position == Toolbox.HostType.SIDE)) {
         continue;
       }
@@ -555,8 +560,6 @@ Toolbox.prototype = {
     vbox.appendChild(iframe);
 
     let onLoad = () => {
-      iframe.removeEventListener("DOMContentLoaded", onLoad, true);
-
       let built = definition.build(iframe.contentWindow, this);
       promise.resolve(built).then((panel) => {
         this._toolPanels.set(id, panel);
@@ -566,8 +569,25 @@ Toolbox.prototype = {
       });
     };
 
-    iframe.addEventListener("DOMContentLoaded", onLoad, true);
     iframe.setAttribute("src", definition.url);
+
+    // Depending on the host, iframe.contentWindow is not always
+    // defined at this moment. If it is not defined, we use an
+    // event listener on the iframe DOM node. If it's defined,
+    // we use the chromeEventHandler. We can't use a listener
+    // on the DOM node every time because this won't work
+    // if the (xul chrome) iframe is loaded in a content docshell.
+    if (iframe.contentWindow) {
+      let domHelper = new DOMHelpers(iframe.contentWindow);
+      domHelper.onceDOMReady(onLoad);
+    } else {
+      let callback = () => {
+        iframe.removeEventListener("DOMContentLoaded", callback);
+        onLoad();
+      }
+      iframe.addEventListener("DOMContentLoaded", callback);
+    }
+
     return deferred.promise;
   },
 
@@ -732,13 +752,13 @@ Toolbox.prototype = {
    * @return {Host} host
    *        The created host object
    */
-  _createHost: function(hostType) {
+  _createHost: function(hostType, options) {
     if (!Hosts[hostType]) {
       throw new Error("Unknown hostType: " + hostType);
     }
 
     // clean up the toolbox if its window is closed
-    let newHost = new Hosts[hostType](this.target.tab);
+    let newHost = new Hosts[hostType](this.target.tab, options);
     newHost.on("window-closed", this.destroy);
     return newHost;
   },
@@ -766,7 +786,9 @@ Toolbox.prototype = {
 
       this._host = newHost;
 
-      Services.prefs.setCharPref(this._prefs.LAST_HOST, this._host.type);
+      if (this.hostType != Toolbox.HostType.CUSTOM) {
+        Services.prefs.setCharPref(this._prefs.LAST_HOST, this._host.type);
+      }
 
       this._buildDockButtons();
       this._addKeysToWindow();
diff --git a/browser/devtools/responsivedesign/responsivedesign.jsm b/browser/devtools/responsivedesign/responsivedesign.jsm
index 30715e9148f8..cceda150dd9a 100644
--- a/browser/devtools/responsivedesign/responsivedesign.jsm
+++ b/browser/devtools/responsivedesign/responsivedesign.jsm
@@ -181,6 +181,13 @@ function ResponsiveUI(aWindow, aTab)
   this.buildUI();
   this.checkMenus();
 
+  this.docShell = this.browser.contentWindow.QueryInterface(Ci.nsIInterfaceRequestor)
+                      .getInterface(Ci.nsIWebNavigation)
+                      .QueryInterface(Ci.nsIDocShell);
+
+  this._deviceSizeWasPageSize = this.docShell.deviceSizeIsPageSize;
+  this.docShell.deviceSizeIsPageSize = true;
+
   try {
     if (Services.prefs.getBoolPref("devtools.responsiveUI.rotate")) {
       this.rotate();
@@ -249,6 +256,8 @@ ResponsiveUI.prototype = {
       return;
     this.closing = true;
 
+    this.docShell.deviceSizeIsPageSize = this._deviceSizeWasPageSize;
+
     this.browser.removeEventListener("load", this.bound_onPageLoad, true);
     this.browser.removeEventListener("unload", this.bound_onPageUnload, true);
 
@@ -288,6 +297,7 @@ ResponsiveUI.prototype = {
     this.container.removeAttribute("responsivemode");
     this.stack.removeAttribute("responsivemode");
 
+    delete this.docShell;
     delete this.tab.__responsiveUI;
     if (this.touchEventHandler)
       this.touchEventHandler.stop();
diff --git a/browser/devtools/responsivedesign/test/browser.ini b/browser/devtools/responsivedesign/test/browser.ini
index 46c19e38d255..2b95ce11f12b 100644
--- a/browser/devtools/responsivedesign/test/browser.ini
+++ b/browser/devtools/responsivedesign/test/browser.ini
@@ -9,3 +9,4 @@ support-files =
 [browser_responsiveui.js]
 [browser_responsiveui_touch.js]
 [browser_responsiveuiaddcustompreset.js]
+[browser_responsive_devicewidth.js]
diff --git a/browser/devtools/responsivedesign/test/browser_responsive_devicewidth.js b/browser/devtools/responsivedesign/test/browser_responsive_devicewidth.js
new file mode 100644
index 000000000000..5ece52cb0a59
--- /dev/null
+++ b/browser/devtools/responsivedesign/test/browser_responsive_devicewidth.js
@@ -0,0 +1,64 @@
+/* Any copyright is dedicated to the Public Domain.
+http://creativecommons.org/publicdomain/zero/1.0/ */
+
+function test() {
+  let instance;
+  let mgr = ResponsiveUI.ResponsiveUIManager;
+
+  waitForExplicitFinish();
+
+  gBrowser.selectedTab = gBrowser.addTab();
+  gBrowser.selectedBrowser.addEventListener("load", function onload() {
+    gBrowser.selectedBrowser.removeEventListener("load", onload, true);
+    waitForFocus(startTest, content);
+  }, true);
+
+  content.location = "data:text/html,mop";
+
+  function startTest() {
+    mgr.once("on", function() {executeSoon(onUIOpen)});
+    document.getElementById("Tools:ResponsiveUI").doCommand();
+  }
+
+  function onUIOpen() {
+    instance = gBrowser.selectedTab.__responsiveUI;
+    instance.stack.setAttribute("notransition", "true");
+    ok(instance, "instance of the module is attached to the tab.");
+
+    instance.setSize(110, 500);
+    ok(content.innerWidth, 110, "initial width is valid");
+
+    let mql = content.matchMedia("(max-device-width:100px)")
+
+    ok(!mql.matches, "media query doesn't match.");
+
+    mql.addListener(onMediaChange);
+    instance.setSize(90, 500);
+  }
+
+  function onMediaChange(mql) {
+    mql.removeListener(onMediaChange);
+    ok(mql.matches, "media query matches.");
+    ok(window.screen.width != content.screen.width, "screen.width is not the size of the screen.");
+    is(content.screen.width, 90, "screen.width is the width of the page.");
+    is(content.screen.height, 500, "screen.height is the height of the page.");
+
+
+    let docShell = content.QueryInterface(Ci.nsIInterfaceRequestor)
+                          .getInterface(Ci.nsIWebNavigation)
+                          .QueryInterface(Ci.nsIDocShell);
+
+    mql.addListener(onMediaChange2);
+    docShell.deviceSizeIsPageSize = false;
+  }
+
+  function onMediaChange2(mql) {
+    mql.removeListener(onMediaChange);
+    ok(!mql.matches, "media query has been re-evaluated.");
+    ok(window.screen.width == content.screen.width, "screen.width is not the size of the screen.");
+    instance.stack.removeAttribute("notransition");
+    document.getElementById("Tools:ResponsiveUI").doCommand();
+    gBrowser.removeCurrentTab();
+    finish();
+  }
+}
diff --git a/browser/devtools/shared/DOMHelpers.jsm b/browser/devtools/shared/DOMHelpers.jsm
index 754632ff9638..4c2bd522d38d 100644
--- a/browser/devtools/shared/DOMHelpers.jsm
+++ b/browser/devtools/shared/DOMHelpers.jsm
@@ -2,6 +2,10 @@
  * 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/. */
 
+const Ci = Components.interfaces;
+const Cu = Components.utils;
+Cu.import("resource://gre/modules/Services.jsm");
+
 this.EXPORTED_SYMBOLS = ["DOMHelpers"];
 
 /**
@@ -13,6 +17,9 @@ this.EXPORTED_SYMBOLS = ["DOMHelpers"];
  *        The content window, owning the document to traverse.
  */
 this.DOMHelpers = function DOMHelpers(aWindow) {
+  if (!aWindow) {
+    throw new Error("window can't be null or undefined");
+  }
   this.window = aWindow;
 };
 
@@ -120,5 +127,30 @@ DOMHelpers.prototype = {
   {
     delete this.window;
     delete this.treeWalker;
+  },
+
+  /**
+   * A simple way to be notified (once) when a window becomes
+   * interactive (DOMContentLoaded).
+   *
+   * It is based on the chromeEventHandler. This is useful when
+   * chrome iframes are loaded in content docshells (in Firefox
+   * tabs for example).
+   */
+  onceDOMReady: function Helpers_onLocationChange(callback) {
+    let window = this.window;
+    let docShell = window.QueryInterface(Ci.nsIInterfaceRequestor)
+                         .getInterface(Ci.nsIWebNavigation)
+                         .QueryInterface(Ci.nsIDocShell);
+    let onReady = function(event) {
+      if (event.target == window.document) {
+        docShell.chromeEventHandler.removeEventListener("DOMContentLoaded", onReady, false);
+        // If in `callback` the URL of the window is changed and a listener to DOMContentLoaded
+        // is attached, the event we just received will be also be caught by the new listener.
+        // We want to avoid that so we execute the callback in the next queue.
+        Services.tm.mainThread.dispatch(callback, 0);
+      }
+    }
+    docShell.chromeEventHandler.addEventListener("DOMContentLoaded", onReady, false);
   }
 };
diff --git a/browser/themes/shared/devtools/app-manager/connection-footer.css b/browser/themes/shared/devtools/app-manager/connection-footer.css
index bc8675c77c4f..04fa308b52df 100644
--- a/browser/themes/shared/devtools/app-manager/connection-footer.css
+++ b/browser/themes/shared/devtools/app-manager/connection-footer.css
@@ -12,6 +12,7 @@
 
 #banners-and-logs {
   display: flex;
+  flex-grow: 1;
 }
 
 #logs {
diff --git a/browser/themes/shared/devtools/app-manager/index.css b/browser/themes/shared/devtools/app-manager/index.css
index 9c101e5ea5d5..d0f2508b9222 100644
--- a/browser/themes/shared/devtools/app-manager/index.css
+++ b/browser/themes/shared/devtools/app-manager/index.css
@@ -14,6 +14,10 @@
   background: #252C33;
 }
 
+#toolbox-tabs {
+  overflow-y: auto;
+}
+
 .button {
   width: 80px;
   height: 85px;
@@ -54,6 +58,12 @@
   display: none;
 }
 
+.button.toolbox {
+  background-repeat: no-repeat;
+  background-position: center 15px;
+  background-size: 40px 40px;
+}
+
 .projects-button {
   background: url('chrome://browser/skin/devtools/app-manager/index-icons.svg') no-repeat;
   background-position: left -5px;
diff --git a/build/mobile/robocop/Actions.java.in b/build/mobile/robocop/Actions.java
similarity index 98%
rename from build/mobile/robocop/Actions.java.in
rename to build/mobile/robocop/Actions.java
index 8b0478fc48ed..9ebb6505ae63 100644
--- a/build/mobile/robocop/Actions.java.in
+++ b/build/mobile/robocop/Actions.java
@@ -1,9 +1,8 @@
-#filter substitution
 /* 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/. */
 
-package @ANDROID_PACKAGE_NAME@;
+package org.mozilla.gecko;
 import java.util.List;
 import java.util.ArrayList;
 
diff --git a/build/mobile/robocop/AndroidManifest.xml.in b/build/mobile/robocop/AndroidManifest.xml.in
index 2d0a79e7e7ba..51a2922ef0b8 100644
--- a/build/mobile/robocop/AndroidManifest.xml.in
+++ b/build/mobile/robocop/AndroidManifest.xml.in
@@ -8,7 +8,7 @@
     <uses-sdk android:minSdkVersion="8" />
 
     <instrumentation
-        android:name="@ANDROID_PACKAGE_NAME@.FennecInstrumentationTestRunner"
+        android:name="org.mozilla.gecko.FennecInstrumentationTestRunner"
         android:targetPackage="@ANDROID_PACKAGE_NAME@" />
 
     <application
diff --git a/build/mobile/robocop/Assert.java.in b/build/mobile/robocop/Assert.java
similarity index 94%
rename from build/mobile/robocop/Assert.java.in
rename to build/mobile/robocop/Assert.java
index 878ff06b8ae6..a9e31ec6d12a 100644
--- a/build/mobile/robocop/Assert.java.in
+++ b/build/mobile/robocop/Assert.java
@@ -1,9 +1,8 @@
-#filter substitution
 /* 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/. */
 
-package @ANDROID_PACKAGE_NAME@;
+package org.mozilla.gecko;
 
 public interface Assert {
     void dumpLog(String message);
diff --git a/build/mobile/robocop/Driver.java.in b/build/mobile/robocop/Driver.java
similarity index 95%
rename from build/mobile/robocop/Driver.java.in
rename to build/mobile/robocop/Driver.java
index 5d606d945f23..d615a41cce61 100644
--- a/build/mobile/robocop/Driver.java.in
+++ b/build/mobile/robocop/Driver.java
@@ -1,9 +1,8 @@
-#filter substitution
 /* 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/. */
 
-package @ANDROID_PACKAGE_NAME@;
+package org.mozilla.gecko;
 
 import java.util.List;
 import android.app.Activity;
diff --git a/build/mobile/robocop/Element.java.in b/build/mobile/robocop/Element.java
similarity index 93%
rename from build/mobile/robocop/Element.java.in
rename to build/mobile/robocop/Element.java
index 97bb2f873dc8..97610ff32a02 100644
--- a/build/mobile/robocop/Element.java.in
+++ b/build/mobile/robocop/Element.java
@@ -1,9 +1,8 @@
-#filter substitution
 /* 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/. */
 
-package @ANDROID_PACKAGE_NAME@;
+package org.mozilla.gecko;
 
 /** 
  *  Element provides access to a specific UI view (android.view.View). 
diff --git a/build/mobile/robocop/FennecInstrumentationTestRunner.java.in b/build/mobile/robocop/FennecInstrumentationTestRunner.java
similarity index 95%
rename from build/mobile/robocop/FennecInstrumentationTestRunner.java.in
rename to build/mobile/robocop/FennecInstrumentationTestRunner.java
index cf891f8ebe7f..d4fb727d168a 100644
--- a/build/mobile/robocop/FennecInstrumentationTestRunner.java.in
+++ b/build/mobile/robocop/FennecInstrumentationTestRunner.java
@@ -1,9 +1,8 @@
-#filter substitution
 /* 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/. */
 
-package @ANDROID_PACKAGE_NAME@;
+package org.mozilla.gecko;
 
 import android.os.Bundle;
 import android.test.InstrumentationTestRunner;
diff --git a/build/mobile/robocop/FennecMochitestAssert.java.in b/build/mobile/robocop/FennecMochitestAssert.java
similarity index 99%
rename from build/mobile/robocop/FennecMochitestAssert.java.in
rename to build/mobile/robocop/FennecMochitestAssert.java
index 689dab1ba84f..dcb8cf498517 100644
--- a/build/mobile/robocop/FennecMochitestAssert.java.in
+++ b/build/mobile/robocop/FennecMochitestAssert.java
@@ -1,9 +1,8 @@
-#filter substitution
 /* 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/. */
 
-package @ANDROID_PACKAGE_NAME@;
+package org.mozilla.gecko;
 
 import java.util.LinkedList;
 import android.os.SystemClock;
diff --git a/build/mobile/robocop/FennecNativeActions.java.in b/build/mobile/robocop/FennecNativeActions.java
similarity index 99%
rename from build/mobile/robocop/FennecNativeActions.java.in
rename to build/mobile/robocop/FennecNativeActions.java
index 7b2492fb0a95..26c3755b55ec 100644
--- a/build/mobile/robocop/FennecNativeActions.java.in
+++ b/build/mobile/robocop/FennecNativeActions.java
@@ -1,9 +1,8 @@
-#filter substitution
 /* 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/. */
 
-package @ANDROID_PACKAGE_NAME@;
+package org.mozilla.gecko;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -28,7 +27,7 @@ import android.view.ViewConfiguration;
 
 import com.jayway.android.robotium.solo.Solo;
 
-import static @ANDROID_PACKAGE_NAME@.FennecNativeDriver.LogLevel;
+import static org.mozilla.gecko.FennecNativeDriver.LogLevel;
 
 public class FennecNativeActions implements Actions {
     private Solo mSolo;
diff --git a/build/mobile/robocop/FennecNativeDriver.java.in b/build/mobile/robocop/FennecNativeDriver.java
similarity index 99%
rename from build/mobile/robocop/FennecNativeDriver.java.in
rename to build/mobile/robocop/FennecNativeDriver.java
index e05fa6f8344f..795288b7182a 100644
--- a/build/mobile/robocop/FennecNativeDriver.java.in
+++ b/build/mobile/robocop/FennecNativeDriver.java
@@ -1,9 +1,8 @@
-#filter substitution
 /* 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/. */
 
-package @ANDROID_PACKAGE_NAME@;
+package org.mozilla.gecko;
 
 import java.io.BufferedOutputStream;
 import java.io.BufferedReader;
diff --git a/build/mobile/robocop/FennecNativeElement.java.in b/build/mobile/robocop/FennecNativeElement.java
similarity index 98%
rename from build/mobile/robocop/FennecNativeElement.java.in
rename to build/mobile/robocop/FennecNativeElement.java
index 40fecd37c169..c50d965345b6 100644
--- a/build/mobile/robocop/FennecNativeElement.java.in
+++ b/build/mobile/robocop/FennecNativeElement.java
@@ -1,9 +1,8 @@
-#filter substitution
 /* 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/. */
 
-package @ANDROID_PACKAGE_NAME@;
+package org.mozilla.gecko;
 
 import android.app.Activity;
 import android.view.View;
diff --git a/build/mobile/robocop/FennecTalosAssert.java.in b/build/mobile/robocop/FennecTalosAssert.java
similarity index 97%
rename from build/mobile/robocop/FennecTalosAssert.java.in
rename to build/mobile/robocop/FennecTalosAssert.java
index 0034da20ce8d..853ef88f3836 100644
--- a/build/mobile/robocop/FennecTalosAssert.java.in
+++ b/build/mobile/robocop/FennecTalosAssert.java
@@ -1,9 +1,8 @@
-#filter substitution
 /* 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/. */
 
-package @ANDROID_PACKAGE_NAME@;
+package org.mozilla.gecko;
 
 
 public class FennecTalosAssert implements Assert {
diff --git a/build/mobile/robocop/Makefile.in b/build/mobile/robocop/Makefile.in
index b8f48abbd8f5..f49cc4386656 100644
--- a/build/mobile/robocop/Makefile.in
+++ b/build/mobile/robocop/Makefile.in
@@ -30,18 +30,14 @@ _JAVA_HARNESS := \
   PaintedSurface.java \
   $(NULL)
 
-# pre-process harness sources
-PP_TARGETS        += java-harness
-java-harness      := $(addprefix $(srcdir)/,$(addsuffix .in,$(_JAVA_HARNESS)))
-java-harness-dep  := $(addprefix $(CURDIR)/,$(_JAVA_HARNESS))
-java-harness_PATH := $(CURDIR)
+java-harness := $(addprefix $(srcdir)/,$(_JAVA_HARNESS))
+java-tests   := $(wildcard $(TESTPATH)/*.java)
 
-# pre-process test sources
-PP_TARGETS      += java-tests
-java-tests-src  := $(wildcard $(TESTPATH)/*.java.in)
-java-tests-dep  := $(patsubst $(TESTPATH)/%.java.in,$(dir-tests)/%.java,$(java-tests-src))
-java-tests      := $(java-tests-src)
-java-tests_PATH := $(dir-tests)
+# pre-process TestConstants.java.in
+PP_TARGETS         += testconstants
+testconstants-dep  := $(dir-tests)/TestConstants.java
+testconstants      := $(TESTPATH)/TestConstants.java.in
+testconstants_PATH := $(dir-tests)
 
 PP_TARGETS        += manifest
 manifest          := $(srcdir)/AndroidManifest.xml.in
@@ -68,15 +64,15 @@ MOCHITEST_ROBOCOP_FILES := \
 
 GARBAGE += \
   AndroidManifest.xml \
-  $(java-tests-dep) \
-  $(java-harness-dep) \
   $(robocop-deps) \
+  $(testconstants-dep) \
   $(NULL)
 
 JAVAFILES += \
+  $(java-harness) \
+  $(java-tests) \
   $(robocop-deps) \
-  $(java-harness-dep) \
-  $(java-tests-dep) \
+  $(testconstants-dep) \
   $(NULL)
 
 DEFINES += \
@@ -88,8 +84,3 @@ include $(topsrcdir)/config/rules.mk
 tools:: $(ANDROID_APK_NAME).apk
 
 GENERATED_DIRS += $(dir-tests)
-
-# PP_java-tests not fully usable here
-# Intermediate step toward a library rule.
-$(dir-tests)/%.java: $(TESTPATH)/%.java.in $(call mkdir_deps,$(dir-tests))
-	$(PYTHON) $(topsrcdir)/config/Preprocessor.py $(DEFINES) $< > $@
diff --git a/build/mobile/robocop/PaintedSurface.java.in b/build/mobile/robocop/PaintedSurface.java
similarity index 98%
rename from build/mobile/robocop/PaintedSurface.java.in
rename to build/mobile/robocop/PaintedSurface.java
index 81302dad1bfb..f6da2b5395ca 100644
--- a/build/mobile/robocop/PaintedSurface.java.in
+++ b/build/mobile/robocop/PaintedSurface.java
@@ -1,9 +1,8 @@
-#filter substitution
 /* 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/. */
 
-package @ANDROID_PACKAGE_NAME@;
+package org.mozilla.gecko;
 
 import android.graphics.Bitmap;
 import android.util.Base64;
diff --git a/build/mobile/robocop/RoboCopException.java.in b/build/mobile/robocop/RoboCopException.java
similarity index 91%
rename from build/mobile/robocop/RoboCopException.java.in
rename to build/mobile/robocop/RoboCopException.java
index 5bff42494347..420df818d954 100644
--- a/build/mobile/robocop/RoboCopException.java.in
+++ b/build/mobile/robocop/RoboCopException.java
@@ -1,9 +1,8 @@
-#filter substitution
 /* 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/. */
 
-package @ANDROID_PACKAGE_NAME@;
+package org.mozilla.gecko;
 
 public class RoboCopException extends RuntimeException {
     
diff --git a/build/mobile/robocop/RobocopUtils.java.in b/build/mobile/robocop/RobocopUtils.java
similarity index 96%
rename from build/mobile/robocop/RobocopUtils.java.in
rename to build/mobile/robocop/RobocopUtils.java
index f2ab238f3826..0572dfd6520e 100644
--- a/build/mobile/robocop/RobocopUtils.java.in
+++ b/build/mobile/robocop/RobocopUtils.java
@@ -1,10 +1,8 @@
-#filter substitution
-
 /* 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/. */
 
-package @ANDROID_PACKAGE_NAME@;
+package org.mozilla.gecko;
 
 import android.app.Activity;
 
diff --git a/content/base/src/nsContentList.h b/content/base/src/nsContentList.h
index 2899024b46ef..2363bd5e464f 100644
--- a/content/base/src/nsContentList.h
+++ b/content/base/src/nsContentList.h
@@ -95,6 +95,10 @@ public:
   virtual JSObject* WrapObject(JSContext *cx, JS::Handle<JSObject*> scope)
     MOZ_OVERRIDE = 0;
 
+  void SetCapacity(uint32_t aCapacity)
+  {
+    mElements.SetCapacity(aCapacity);
+  }
 protected:
   /**
    * To be called from non-destructor locations (e.g. unlink) that want to
diff --git a/content/base/src/nsINode.cpp b/content/base/src/nsINode.cpp
index 8592273b607f..57bef0abf483 100644
--- a/content/base/src/nsINode.cpp
+++ b/content/base/src/nsINode.cpp
@@ -2337,8 +2337,8 @@ AddScopeElements(TreeMatchContext& aMatchContext,
 // Actually find elements matching aSelectorList (which must not be
 // null) and which are descendants of aRoot and put them in aList.  If
 // onlyFirstMatch, then stop once the first one is found.
-template<bool onlyFirstMatch, class T>
-inline static nsresult
+template<bool onlyFirstMatch, class Collector, class T>
+MOZ_ALWAYS_INLINE static nsresult
 FindMatchingElements(nsINode* aRoot, const nsAString& aSelector, T &aList)
 {
 
@@ -2424,6 +2424,7 @@ FindMatchingElements(nsINode* aRoot, const nsAString& aSelector, T &aList)
     return NS_OK;
   }
 
+  Collector results;
   for (nsIContent* cur = aRoot->GetFirstChild();
        cur;
        cur = cur->GetNextNode(aRoot)) {
@@ -2431,10 +2432,19 @@ FindMatchingElements(nsINode* aRoot, const nsAString& aSelector, T &aList)
         nsCSSRuleProcessor::SelectorListMatches(cur->AsElement(),
                                                 matchingContext,
                                                 selectorList)) {
-      aList.AppendElement(cur->AsElement());
       if (onlyFirstMatch) {
+        aList.AppendElement(cur->AsElement());
         return NS_OK;
       }
+      results.AppendElement(cur->AsElement());
+    }
+  }
+
+  const uint32_t len = results.Length();
+  if (len) {
+    aList.SetCapacity(len);
+    for (uint32_t i = 0; i < len; ++i) {
+      aList.AppendElement(results.ElementAt(i));
     }
   }
 
@@ -2447,6 +2457,10 @@ struct ElementHolder {
     NS_ABORT_IF_FALSE(!mElement, "Should only get one element");
     mElement = aElement;
   }
+  void SetCapacity(uint32_t aCapacity) { MOZ_CRASH("Don't call me!"); }
+  uint32_t Length() { return 0; }
+  Element* ElementAt(uint32_t aIndex) { return nullptr; }
+
   Element* mElement;
 };
 
@@ -2454,7 +2468,7 @@ Element*
 nsINode::QuerySelector(const nsAString& aSelector, ErrorResult& aResult)
 {
   ElementHolder holder;
-  aResult = FindMatchingElements<true>(this, aSelector, holder);
+  aResult = FindMatchingElements<true, ElementHolder>(this, aSelector, holder);
 
   return holder.mElement;
 }
@@ -2464,7 +2478,10 @@ nsINode::QuerySelectorAll(const nsAString& aSelector, ErrorResult& aResult)
 {
   nsRefPtr<nsSimpleContentList> contentList = new nsSimpleContentList(this);
 
-  aResult = FindMatchingElements<false>(this, aSelector, *contentList);
+  aResult =
+    FindMatchingElements<false, nsAutoTArray<Element*, 128>>(this,
+                                                             aSelector,
+                                                             *contentList);
 
   return contentList.forget();
 }
diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp
index b7f782de70a6..05b5bbed5f84 100644
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -755,6 +755,7 @@ nsDocShell::nsDocShell():
     mIsAppTab(false),
     mUseGlobalHistory(false),
     mInPrivateBrowsing(false),
+    mDeviceSizeIsPageSize(false),
     mFiredUnloadEvent(false),
     mEODForCurrentDocument(false),
     mURIResultedInDocument(false),
@@ -3920,6 +3921,27 @@ nsDocShell::GetCurrentSHEntry(nsISHEntry** aEntry, bool* aOSHE)
     return NS_OK;
 }
 
+NS_IMETHODIMP
+nsDocShell::SetDeviceSizeIsPageSize(bool aValue)
+{
+    if (mDeviceSizeIsPageSize != aValue) {
+      mDeviceSizeIsPageSize = aValue;
+      nsRefPtr<nsPresContext> presContext;
+      GetPresContext(getter_AddRefs(presContext));
+      if (presContext) {
+          presContext->MediaFeatureValuesChanged(presContext->eAlwaysRebuildStyle);
+      }
+    }
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsDocShell::GetDeviceSizeIsPageSize(bool* aValue)
+{
+    *aValue = mDeviceSizeIsPageSize;
+    return NS_OK;
+}
+
 void
 nsDocShell::ClearFrameHistory(nsISHEntry* aEntry)
 {
@@ -4929,6 +4951,10 @@ nsDocShell::Create()
         gAddedPreferencesVarCache = true;
     }
 
+    mDeviceSizeIsPageSize =
+        Preferences::GetBool("docshell.device_size_is_page_size",
+                             mDeviceSizeIsPageSize);
+
     nsCOMPtr<nsIObserverService> serv = services::GetObserverService();
     if (serv) {
         const char* msg = mItemType == typeContent ?
diff --git a/docshell/base/nsDocShell.h b/docshell/base/nsDocShell.h
index 56e292cce7d5..4715826c592a 100644
--- a/docshell/base/nsDocShell.h
+++ b/docshell/base/nsDocShell.h
@@ -815,6 +815,7 @@ protected:
     bool                       mIsAppTab;
     bool                       mUseGlobalHistory;
     bool                       mInPrivateBrowsing;
+    bool                       mDeviceSizeIsPageSize;
 
     // This boolean is set to true right before we fire pagehide and generally
     // unset when we embed a new content viewer.  While it's true no navigation
diff --git a/docshell/base/nsIDocShell.idl b/docshell/base/nsIDocShell.idl
index 919f9174433f..c260f65cd6ec 100644
--- a/docshell/base/nsIDocShell.idl
+++ b/docshell/base/nsIDocShell.idl
@@ -43,7 +43,7 @@ interface nsIReflowObserver;
 
 typedef unsigned long nsLoadFlags;
 
-[scriptable, builtinclass, uuid(1470A132-99B2-44C3-B37D-D8093B2E29BF)]
+[scriptable, builtinclass, uuid(77aca3ee-7417-4cd2-994e-9bd95ca1d98a)]
 interface nsIDocShell : nsIDocShellTreeItem
 {
   /**
@@ -907,4 +907,16 @@ interface nsIDocShell : nsIDocShellTreeItem
    */
   [noscript, notxpcom] bool IsInvisible();
   [noscript, notxpcom] void SetInvisible(in bool aIsInvisibleDochsell);
+
+  /**
+   * If deviceSizeIsPageSize is set to true, device-width/height media queries
+   * will be calculated from the page size, not the device size.
+   *
+   * Used by the Responsive Design View and B2G Simulator.
+   *
+   * Default is False.
+   * Default value can be overriden with
+   * docshell.device_size_is_page_size pref.
+   */
+  [infallible] attribute boolean deviceSizeIsPageSize;
 };
diff --git a/dom/base/nsScreen.cpp b/dom/base/nsScreen.cpp
index 7d97296851ba..66398982bb12 100644
--- a/dom/base/nsScreen.cpp
+++ b/dom/base/nsScreen.cpp
@@ -390,6 +390,19 @@ nsScreen::SlowMozUnlockOrientation()
   return NS_OK;
 }
 
+bool
+nsScreen::IsDeviceSizePageSize()
+{
+  nsPIDOMWindow* owner = GetOwner();
+  if (owner) {
+    nsIDocShell* docShell = owner->GetDocShell();
+    if (docShell) {
+      return docShell->GetDeviceSizeIsPageSize();
+    }
+  }
+  return false;
+}
+
 /* virtual */
 JSObject*
 nsScreen::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aScope)
diff --git a/dom/base/nsScreen.h b/dom/base/nsScreen.h
index 47f19c913e66..ebdabf18724b 100644
--- a/dom/base/nsScreen.h
+++ b/dom/base/nsScreen.h
@@ -51,6 +51,15 @@ public:
   int32_t GetWidth(ErrorResult& aRv)
   {
     nsRect rect;
+    if (IsDeviceSizePageSize()) {
+      nsCOMPtr<nsPIDOMWindow> owner = GetOwner();
+      if (owner) {
+        int32_t innerWidth = 0;
+        aRv = owner->GetInnerWidth(&innerWidth);
+        return innerWidth;
+      }
+    }
+
     aRv = GetRect(rect);
     return rect.width;
   }
@@ -58,6 +67,15 @@ public:
   int32_t GetHeight(ErrorResult& aRv)
   {
     nsRect rect;
+    if (IsDeviceSizePageSize()) {
+      nsCOMPtr<nsPIDOMWindow> owner = GetOwner();
+      if (owner) {
+        int32_t innerHeight = 0;
+        aRv = owner->GetInnerHeight(&innerHeight);
+        return innerHeight;
+      }
+    }
+
     aRv = GetRect(rect);
     return rect.height;
   }
@@ -137,6 +155,8 @@ private:
 
   LockPermission GetLockOrientationPermission() const;
 
+  bool IsDeviceSizePageSize();
+
   nsRefPtr<FullScreenEventListener> mEventListener;
 };
 
diff --git a/gfx/2d/HelpersD2D.h b/gfx/2d/HelpersD2D.h
index e592739445e3..802a4e1b9a55 100644
--- a/gfx/2d/HelpersD2D.h
+++ b/gfx/2d/HelpersD2D.h
@@ -410,7 +410,7 @@ CreateStrokeStyleForOptions(const StrokeOptions &aStrokeOptions)
                                   capStyle, joinStyle,
                                   aStrokeOptions.mMiterLimit,
                                   D2D1_DASH_STYLE_CUSTOM,
-                                  aStrokeOptions.mDashOffset),
+                                  aStrokeOptions.mDashOffset / lineWidth),
       &dash[0], // data() is not C++98, although it's in recent gcc
                 // and VC10's STL
       dash.size(),
diff --git a/gfx/layers/composite/APZCTreeManager.cpp b/gfx/layers/composite/APZCTreeManager.cpp
index 4f191cbeb131..497174986051 100644
--- a/gfx/layers/composite/APZCTreeManager.cpp
+++ b/gfx/layers/composite/APZCTreeManager.cpp
@@ -16,6 +16,7 @@
 #include "mozilla/MouseEvents.h"
 #include "mozilla/mozalloc.h"           // for operator new
 #include "mozilla/TouchEvents.h"
+#include "nsDebug.h"                    // for NS_WARNING
 #include "nsPoint.h"                    // for nsIntPoint
 #include "nsTArray.h"                   // for nsTArray, nsTArray_Impl, etc
 #include "nsThreadUtils.h"              // for NS_IsMainThread
@@ -29,7 +30,8 @@ namespace layers {
 float APZCTreeManager::sDPI = 72.0;
 
 APZCTreeManager::APZCTreeManager()
-    : mTreeLock("APZCTreeLock")
+    : mTreeLock("APZCTreeLock"),
+      mTouchCount(0)
 {
   MOZ_ASSERT(NS_IsMainThread());
   AsyncPanZoomController::InitializeGlobalState();
@@ -238,6 +240,7 @@ APZCTreeManager::ReceiveInputEvent(const InputData& aEvent)
     case MULTITOUCH_INPUT: {
       const MultiTouchInput& multiTouchInput = aEvent.AsMultiTouchInput();
       if (multiTouchInput.mType == MultiTouchInput::MULTITOUCH_START) {
+        mTouchCount++;
         mApzcForInputBlock = GetTargetAPZC(ScreenPoint(multiTouchInput.mTouches[0].mScreenPoint));
         for (size_t i = 1; i < multiTouchInput.mTouches.Length(); i++) {
           nsRefPtr<AsyncPanZoomController> apzc2 = GetTargetAPZC(ScreenPoint(multiTouchInput.mTouches[i].mScreenPoint));
@@ -267,10 +270,18 @@ APZCTreeManager::ReceiveInputEvent(const InputData& aEvent)
           ApplyTransform(&(inputForApzc.mTouches[i].mScreenPoint), transformToApzc);
         }
         result = mApzcForInputBlock->ReceiveInputEvent(inputForApzc);
+      }
+      if (multiTouchInput.mType == MultiTouchInput::MULTITOUCH_CANCEL ||
+          multiTouchInput.mType == MultiTouchInput::MULTITOUCH_END) {
+        if (mTouchCount >= multiTouchInput.mTouches.Length()) {
+          mTouchCount -= multiTouchInput.mTouches.Length();
+        } else {
+          NS_WARNING("Got an unexpected touchend/touchcancel");
+          mTouchCount = 0;
+        }
         // If we have an mApzcForInputBlock and it's the end of the touch sequence
         // then null it out so we don't keep a dangling reference and leak things.
-        if (multiTouchInput.mType == MultiTouchInput::MULTITOUCH_CANCEL ||
-            (multiTouchInput.mType == MultiTouchInput::MULTITOUCH_END && multiTouchInput.mTouches.Length() == 1)) {
+        if (mTouchCount == 0) {
           mApzcForInputBlock = nullptr;
         }
       }
@@ -333,31 +344,50 @@ nsEventStatus
 APZCTreeManager::ProcessTouchEvent(const WidgetTouchEvent& aEvent,
                                    WidgetTouchEvent* aOutEvent)
 {
-  // For computing the input for the APZC, used the cached transform.
-  // This ensures that the sequence of touch points an APZC sees in an
-  // input block are all in the same coordinate space.
-  gfx3DMatrix transformToApzc = mCachedTransformToApzcForInputBlock;
-  MultiTouchInput inputForApzc(aEvent);
-  for (size_t i = 0; i < inputForApzc.mTouches.Length(); i++) {
-    ApplyTransform(&(inputForApzc.mTouches[i].mScreenPoint), transformToApzc);
+  nsEventStatus ret = nsEventStatus_eIgnore;
+  if (!aEvent.touches.Length()) {
+    return ret;
   }
-  nsEventStatus ret = mApzcForInputBlock->ReceiveInputEvent(inputForApzc);
-
-  // For computing the event to pass back to Gecko, use the up-to-date transforms.
-  // This ensures that transformToApzc and transformToGecko are in sync
-  // (note that transformToGecko isn't cached).
-  gfx3DMatrix transformToGecko;
-  GetInputTransforms(mApzcForInputBlock, transformToApzc, transformToGecko);
-  gfx3DMatrix outTransform = transformToApzc * transformToGecko;
-  for (size_t i = 0; i < aOutEvent->touches.Length(); i++) {
-    ApplyTransform(&(aOutEvent->touches[i]->mRefPoint), outTransform);
+  if (aEvent.message == NS_TOUCH_START) {
+    mTouchCount++;
+    ScreenPoint point = ScreenPoint(aEvent.touches[0]->mRefPoint.x, aEvent.touches[0]->mRefPoint.y);
+    mApzcForInputBlock = GetTouchInputBlockAPZC(aEvent, point);
   }
 
+  if (mApzcForInputBlock) {
+    // For computing the input for the APZC, used the cached transform.
+    // This ensures that the sequence of touch points an APZC sees in an
+    // input block are all in the same coordinate space.
+    gfx3DMatrix transformToApzc = mCachedTransformToApzcForInputBlock;
+    MultiTouchInput inputForApzc(aEvent);
+    for (size_t i = 0; i < inputForApzc.mTouches.Length(); i++) {
+      ApplyTransform(&(inputForApzc.mTouches[i].mScreenPoint), transformToApzc);
+    }
+    ret = mApzcForInputBlock->ReceiveInputEvent(inputForApzc);
+
+    // For computing the event to pass back to Gecko, use the up-to-date transforms.
+    // This ensures that transformToApzc and transformToGecko are in sync
+    // (note that transformToGecko isn't cached).
+    gfx3DMatrix transformToGecko;
+    GetInputTransforms(mApzcForInputBlock, transformToApzc, transformToGecko);
+    gfx3DMatrix outTransform = transformToApzc * transformToGecko;
+    for (size_t i = 0; i < aOutEvent->touches.Length(); i++) {
+      ApplyTransform(&(aOutEvent->touches[i]->mRefPoint), outTransform);
+    }
+  }
   // If we have an mApzcForInputBlock and it's the end of the touch sequence
   // then null it out so we don't keep a dangling reference and leak things.
   if (aEvent.message == NS_TOUCH_CANCEL ||
-      (aEvent.message == NS_TOUCH_END && aEvent.touches.Length() == 1)) {
-    mApzcForInputBlock = nullptr;
+      aEvent.message == NS_TOUCH_END) {
+    if (mTouchCount >= aEvent.touches.Length()) {
+      mTouchCount -= aEvent.touches.Length();
+    } else {
+      NS_WARNING("Got an unexpected touchend/touchcancel");
+      mTouchCount = 0;
+    }
+    if (mTouchCount == 0) {
+      mApzcForInputBlock = nullptr;
+    }
   }
   return ret;
 }
@@ -406,16 +436,6 @@ APZCTreeManager::ReceiveInputEvent(const WidgetInputEvent& aEvent,
   switch (aEvent.eventStructType) {
     case NS_TOUCH_EVENT: {
       const WidgetTouchEvent& touchEvent = *aEvent.AsTouchEvent();
-      if (!touchEvent.touches.Length()) {
-        return nsEventStatus_eIgnore;
-      }
-      if (touchEvent.message == NS_TOUCH_START) {
-        ScreenPoint point = ScreenPoint(touchEvent.touches[0]->mRefPoint.x, touchEvent.touches[0]->mRefPoint.y);
-        mApzcForInputBlock = GetTouchInputBlockAPZC(touchEvent, point);
-      }
-      if (!mApzcForInputBlock) {
-        return nsEventStatus_eIgnore;
-      }
       return ProcessTouchEvent(touchEvent, aOutEvent->AsTouchEvent());
     }
     case NS_MOUSE_EVENT: {
@@ -438,16 +458,6 @@ APZCTreeManager::ReceiveInputEvent(WidgetInputEvent& aEvent)
   switch (aEvent.eventStructType) {
     case NS_TOUCH_EVENT: {
       WidgetTouchEvent& touchEvent = *aEvent.AsTouchEvent();
-      if (!touchEvent.touches.Length()) {
-        return nsEventStatus_eIgnore;
-      }
-      if (touchEvent.message == NS_TOUCH_START) {
-        ScreenPoint point = ScreenPoint(touchEvent.touches[0]->mRefPoint.x, touchEvent.touches[0]->mRefPoint.y);
-        mApzcForInputBlock = GetTouchInputBlockAPZC(touchEvent, point);
-      }
-      if (!mApzcForInputBlock) {
-        return nsEventStatus_eIgnore;
-      }
       return ProcessTouchEvent(touchEvent, &touchEvent);
     }
     default: {
diff --git a/gfx/layers/composite/APZCTreeManager.h b/gfx/layers/composite/APZCTreeManager.h
index c858258850ec..551f23ec71e8 100644
--- a/gfx/layers/composite/APZCTreeManager.h
+++ b/gfx/layers/composite/APZCTreeManager.h
@@ -321,6 +321,8 @@ private:
    * input delivery thread, and so does not require locking.
    */
   nsRefPtr<AsyncPanZoomController> mApzcForInputBlock;
+  /* The number of touch points we are tracking that are currently on the screen. */
+  uint32_t mTouchCount;
   /* The transform from root screen coordinates into mApzcForInputBlock's
    * screen coordinates, as returned through the 'aTransformToApzcOut' parameter
    * of GetInputTransform(), at the start of the input block. This is cached
diff --git a/gfx/layers/ipc/GestureEventListener.cpp b/gfx/layers/ipc/GestureEventListener.cpp
index eeaef9809305..637f90e0d222 100644
--- a/gfx/layers/ipc/GestureEventListener.cpp
+++ b/gfx/layers/ipc/GestureEventListener.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set sw=4 ts=8 et tw=80 : */
+/* vim: set sw=2 ts=8 et tw=80 : */
 /* 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/. */
@@ -73,11 +73,7 @@ nsEventStatus GestureEventListener::HandleInputEvent(const InputData& aEvent)
         }
       }
 
-      NS_WARN_IF_FALSE(!foundAlreadyExistingTouch, "Tried to add a touch that already exists");
-
       // If we didn't find a touch in our list that matches this, then add it.
-      // If it already existed, we don't want to add it twice because that
-      // messes with our touch move/end code.
       if (!foundAlreadyExistingTouch) {
         mTouches.AppendElement(event.mTouches[i]);
       }
@@ -137,18 +133,17 @@ nsEventStatus GestureEventListener::HandleInputEvent(const InputData& aEvent)
   }
   case MultiTouchInput::MULTITOUCH_END:
   case MultiTouchInput::MULTITOUCH_LEAVE: {
-    bool foundAlreadyExistingTouch = false;
-    for (size_t i = 0; i < event.mTouches.Length() && !foundAlreadyExistingTouch; i++) {
+    for (size_t i = 0; i < event.mTouches.Length(); i++) {
+      bool foundAlreadyExistingTouch = false;
       for (size_t j = 0; j < mTouches.Length() && !foundAlreadyExistingTouch; j++) {
         if (event.mTouches[i].mIdentifier == mTouches[j].mIdentifier) {
           foundAlreadyExistingTouch = true;
           mTouches.RemoveElementAt(j);
         }
       }
+      NS_WARN_IF_FALSE(foundAlreadyExistingTouch, "Touch ended, but not in list");
     }
 
-    NS_WARN_IF_FALSE(foundAlreadyExistingTouch, "Touch ended, but not in list");
-
     if (mState == GESTURE_WAITING_DOUBLE_TAP) {
       CancelDoubleTapTimeoutTask();
       if (mTapStartTime - mLastTapEndTime > MAX_TAP_TIME ||
diff --git a/gfx/layers/ipc/GestureEventListener.h b/gfx/layers/ipc/GestureEventListener.h
index f25c1b6bd2ca..579307d2963e 100644
--- a/gfx/layers/ipc/GestureEventListener.h
+++ b/gfx/layers/ipc/GestureEventListener.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set sw=4 ts=8 et tw=80 : */
+/* vim: set sw=2 ts=8 et tw=80 : */
 /* 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/. */
diff --git a/js/public/Utility.h b/js/public/Utility.h
index cdaf19ba5f69..1755831f30f1 100644
--- a/js/public/Utility.h
+++ b/js/public/Utility.h
@@ -250,63 +250,141 @@ static inline void js_free(void* p)
     }\
 \
     template <class T, class P1>\
-    QUALIFIERS T *NEWNAME(P1 p1) {\
-        JS_NEW_BODY(ALLOCATOR, T, (p1))\
+    QUALIFIERS T *NEWNAME(P1 &&p1) {\
+        JS_NEW_BODY(ALLOCATOR, T,\
+                    (mozilla::Forward<P1>(p1)))\
     }\
 \
     template <class T, class P1, class P2>\
-    QUALIFIERS T *NEWNAME(P1 p1, P2 p2) {\
-        JS_NEW_BODY(ALLOCATOR, T, (p1, p2))\
+    QUALIFIERS T *NEWNAME(P1 &&p1, P2 &&p2) {\
+        JS_NEW_BODY(ALLOCATOR, T,\
+                    (mozilla::Forward<P1>(p1),\
+                     mozilla::Forward<P2>(p2)))\
     }\
 \
     template <class T, class P1, class P2, class P3>\
-    QUALIFIERS T *NEWNAME(P1 p1, P2 p2, P3 p3) {\
-        JS_NEW_BODY(ALLOCATOR, T, (p1, p2, p3))\
+    QUALIFIERS T *NEWNAME(P1 &&p1, P2 &&p2, P3 &&p3) {\
+        JS_NEW_BODY(ALLOCATOR, T,\
+                    (mozilla::Forward<P1>(p1),\
+                     mozilla::Forward<P2>(p2),\
+                     mozilla::Forward<P3>(p3)))\
     }\
 \
     template <class T, class P1, class P2, class P3, class P4>\
-    QUALIFIERS T *NEWNAME(P1 p1, P2 p2, P3 p3, P4 p4) {\
-        JS_NEW_BODY(ALLOCATOR, T, (p1, p2, p3, p4))\
+    QUALIFIERS T *NEWNAME(P1 &&p1, P2 &&p2, P3 &&p3, P4 &&p4) {\
+        JS_NEW_BODY(ALLOCATOR, T,\
+                    (mozilla::Forward<P1>(p1),\
+                     mozilla::Forward<P2>(p2),\
+                     mozilla::Forward<P3>(p3),\
+                     mozilla::Forward<P4>(p4)))\
     }\
 \
     template <class T, class P1, class P2, class P3, class P4, class P5>\
-    QUALIFIERS T *NEWNAME(P1 p1, P2 p2, P3 p3, P4 p4, P5 p5) {\
-        JS_NEW_BODY(ALLOCATOR, T, (p1, p2, p3, p4, p5))\
+    QUALIFIERS T *NEWNAME(P1 &&p1, P2 &&p2, P3 &&p3, P4 &&p4, P5 &&p5) {\
+        JS_NEW_BODY(ALLOCATOR, T,\
+                    (mozilla::Forward<P1>(p1),\
+                     mozilla::Forward<P2>(p2),\
+                     mozilla::Forward<P3>(p3),\
+                     mozilla::Forward<P4>(p4),\
+                     mozilla::Forward<P5>(p5)))\
     }\
 \
     template <class T, class P1, class P2, class P3, class P4, class P5, class P6>\
-    QUALIFIERS T *NEWNAME(P1 p1, P2 p2, P3 p3, P4 p4, P5 p5, P6 p6) {\
-        JS_NEW_BODY(ALLOCATOR, T, (p1, p2, p3, p4, p5, p6))\
+    QUALIFIERS T *NEWNAME(P1 &&p1, P2 &&p2, P3 &&p3, P4 &&p4, P5 &&p5, P6 &&p6) {\
+        JS_NEW_BODY(ALLOCATOR, T,\
+                    (mozilla::Forward<P1>(p1),\
+                     mozilla::Forward<P2>(p2),\
+                     mozilla::Forward<P3>(p3),\
+                     mozilla::Forward<P4>(p4),\
+                     mozilla::Forward<P5>(p5),\
+                     mozilla::Forward<P6>(p6)))\
     }\
 \
     template <class T, class P1, class P2, class P3, class P4, class P5, class P6, class P7>\
-    QUALIFIERS T *NEWNAME(P1 p1, P2 p2, P3 p3, P4 p4, P5 p5, P6 p6, P7 p7) {\
-        JS_NEW_BODY(ALLOCATOR, T, (p1, p2, p3, p4, p5, p6, p7))\
+    QUALIFIERS T *NEWNAME(P1 &&p1, P2 &&p2, P3 &&p3, P4 &&p4, P5 &&p5, P6 &&p6, P7 &&p7) {\
+        JS_NEW_BODY(ALLOCATOR, T,\
+                    (mozilla::Forward<P1>(p1),\
+                     mozilla::Forward<P2>(p2),\
+                     mozilla::Forward<P3>(p3),\
+                     mozilla::Forward<P4>(p4),\
+                     mozilla::Forward<P5>(p5),\
+                     mozilla::Forward<P6>(p6),\
+                     mozilla::Forward<P7>(p7)))\
     }\
 \
     template <class T, class P1, class P2, class P3, class P4, class P5, class P6, class P7, class P8>\
-    QUALIFIERS T *NEWNAME(P1 p1, P2 p2, P3 p3, P4 p4, P5 p5, P6 p6, P7 p7, P8 p8) {\
-        JS_NEW_BODY(ALLOCATOR, T, (p1, p2, p3, p4, p5, p6, p7, p8))\
+    QUALIFIERS T *NEWNAME(P1 &&p1, P2 &&p2, P3 &&p3, P4 &&p4, P5 &&p5, P6 &&p6, P7 &&p7, P8 &&p8) {\
+        JS_NEW_BODY(ALLOCATOR, T,\
+                    (mozilla::Forward<P1>(p1),\
+                     mozilla::Forward<P2>(p2),\
+                     mozilla::Forward<P3>(p3),\
+                     mozilla::Forward<P4>(p4),\
+                     mozilla::Forward<P5>(p5),\
+                     mozilla::Forward<P6>(p6),\
+                     mozilla::Forward<P7>(p7),\
+                     mozilla::Forward<P8>(p8)))\
     }\
 \
     template <class T, class P1, class P2, class P3, class P4, class P5, class P6, class P7, class P8, class P9>\
-    QUALIFIERS T *NEWNAME(P1 p1, P2 p2, P3 p3, P4 p4, P5 p5, P6 p6, P7 p7, P8 p8, P9 p9) {\
-        JS_NEW_BODY(ALLOCATOR, T, (p1, p2, p3, p4, p5, p6, p7, p8, p9))\
+    QUALIFIERS T *NEWNAME(P1 &&p1, P2 &&p2, P3 &&p3, P4 &&p4, P5 &&p5, P6 &&p6, P7 &&p7, P8 &&p8, P9 &&p9) {\
+        JS_NEW_BODY(ALLOCATOR, T,\
+                    (mozilla::Forward<P1>(p1),\
+                     mozilla::Forward<P2>(p2),\
+                     mozilla::Forward<P3>(p3),\
+                     mozilla::Forward<P4>(p4),\
+                     mozilla::Forward<P5>(p5),\
+                     mozilla::Forward<P6>(p6),\
+                     mozilla::Forward<P7>(p7),\
+                     mozilla::Forward<P8>(p8),\
+                     mozilla::Forward<P9>(p9)))\
     }\
 \
     template <class T, class P1, class P2, class P3, class P4, class P5, class P6, class P7, class P8, class P9, class P10>\
-    QUALIFIERS T *NEWNAME(P1 p1, P2 p2, P3 p3, P4 p4, P5 p5, P6 p6, P7 p7, P8 p8, P9 p9, P10 p10) {\
-        JS_NEW_BODY(ALLOCATOR, T, (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10))\
+    QUALIFIERS T *NEWNAME(P1 &&p1, P2 &&p2, P3 &&p3, P4 &&p4, P5 &&p5, P6 &&p6, P7 &&p7, P8 &&p8, P9 &&p9, P10 &&p10) {\
+        JS_NEW_BODY(ALLOCATOR, T,\
+                    (mozilla::Forward<P1>(p1),\
+                     mozilla::Forward<P2>(p2),\
+                     mozilla::Forward<P3>(p3),\
+                     mozilla::Forward<P4>(p4),\
+                     mozilla::Forward<P5>(p5),\
+                     mozilla::Forward<P6>(p6),\
+                     mozilla::Forward<P7>(p7),\
+                     mozilla::Forward<P8>(p8),\
+                     mozilla::Forward<P9>(p9),\
+                     mozilla::Forward<P10>(p10)))\
     }\
 \
     template <class T, class P1, class P2, class P3, class P4, class P5, class P6, class P7, class P8, class P9, class P10, class P11>\
-    QUALIFIERS T *NEWNAME(P1 p1, P2 p2, P3 p3, P4 p4, P5 p5, P6 p6, P7 p7, P8 p8, P9 p9, P10 p10, P11 p11) {\
-        JS_NEW_BODY(ALLOCATOR, T, (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11))\
+    QUALIFIERS T *NEWNAME(P1 &&p1, P2 &&p2, P3 &&p3, P4 &&p4, P5 &&p5, P6 &&p6, P7 &&p7, P8 &&p8, P9 &&p9, P10 &&p10, P11 &&p11) {\
+        JS_NEW_BODY(ALLOCATOR, T,\
+                    (mozilla::Forward<P1>(p1),\
+                     mozilla::Forward<P2>(p2),\
+                     mozilla::Forward<P3>(p3),\
+                     mozilla::Forward<P4>(p4),\
+                     mozilla::Forward<P5>(p5),\
+                     mozilla::Forward<P6>(p6),\
+                     mozilla::Forward<P7>(p7),\
+                     mozilla::Forward<P8>(p8),\
+                     mozilla::Forward<P9>(p9),\
+                     mozilla::Forward<P10>(p10),\
+                     mozilla::Forward<P11>(p11)))\
     }\
 \
     template <class T, class P1, class P2, class P3, class P4, class P5, class P6, class P7, class P8, class P9, class P10, class P11, class P12>\
-    QUALIFIERS T *NEWNAME(P1 p1, P2 p2, P3 p3, P4 p4, P5 p5, P6 p6, P7 p7, P8 p8, P9 p9, P10 p10, P11 p11, P12 p12) {\
-        JS_NEW_BODY(ALLOCATOR, T, (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12))\
+    QUALIFIERS T *NEWNAME(P1 &&p1, P2 &&p2, P3 &&p3, P4 &&p4, P5 &&p5, P6 &&p6, P7 &&p7, P8 &&p8, P9 &&p9, P10 &&p10, P11 &&p11, P12 &&p12) {\
+        JS_NEW_BODY(ALLOCATOR, T,\
+                    (mozilla::Forward<P1>(p1),\
+                     mozilla::Forward<P2>(p2),\
+                     mozilla::Forward<P3>(p3),\
+                     mozilla::Forward<P4>(p4),\
+                     mozilla::Forward<P5>(p5),\
+                     mozilla::Forward<P6>(p6),\
+                     mozilla::Forward<P7>(p7),\
+                     mozilla::Forward<P8>(p8),\
+                     mozilla::Forward<P9>(p9),\
+                     mozilla::Forward<P10>(p10),\
+                     mozilla::Forward<P11>(p11),\
+                     mozilla::Forward<P12>(p12)))\
     }\
 
 JS_DECLARE_NEW_METHODS(js_new, js_malloc, static JS_ALWAYS_INLINE)
diff --git a/js/src/jit-test/tests/baseline/bug934427.js b/js/src/jit-test/tests/baseline/bug934427.js
new file mode 100644
index 000000000000..0be2118b7224
--- /dev/null
+++ b/js/src/jit-test/tests/baseline/bug934427.js
@@ -0,0 +1,13 @@
+// |jit-test| error: InternalError
+
+function f(){
+  var j;
+  f(0,1,2,3,4,5,6,7,8,9,0,1,2,3,4,5,6,7,8,9,
+      0,1,2,3,4,5,6,7,8,9,0,1,2,3,4,5,6,7,8,9,
+      0,1,2,3,4,5,6,7,8,9,0,1,2,3,4,5,6,7,8,9,
+      0,1,2,3,4,5,6,7,8,9,0,1,2,3,4,5,6,7,8,9,
+      0,1,2,3,4,5,6,7,8,9,0,1,2,3,4,5,6,7,8,9,
+      0,1,2,3,4,5,6,7,8,9,0,1,2,3,4,5,6,7,8,9,
+      0,1,2,3,4,5,6,7,8,9,0,1,2,3,4,5,6,7,8,9);
+}
+f()
diff --git a/js/src/jit/BaselineCompiler.cpp b/js/src/jit/BaselineCompiler.cpp
index 3a86f46622e0..b620fe22877a 100644
--- a/js/src/jit/BaselineCompiler.cpp
+++ b/js/src/jit/BaselineCompiler.cpp
@@ -489,7 +489,14 @@ BaselineCompiler::emitStackCheck(bool earlyCheck)
     pushArg(Imm32(tolerance));
     masm.loadBaselineFramePtr(BaselineFrameReg, R1.scratchReg());
     pushArg(R1.scratchReg());
-    if (!callVM(CheckOverRecursedWithExtraInfo, /*preInitialize=*/earlyCheck))
+
+    CallVMPhase phase = POST_INITIALIZE;
+    if (earlyCheck)
+        phase = PRE_INITIALIZE;
+    else if (needsEarlyStackCheck())
+        phase = CHECK_OVER_RECURSED;
+
+    if (!callVM(CheckOverRecursedWithExtraInfo, phase))
         return false;
 
     masm.bind(&skipCall);
@@ -536,6 +543,10 @@ static const VMFunction HeavyweightFunPrologueInfo =
 bool
 BaselineCompiler::initScopeChain()
 {
+    CallVMPhase phase = POST_INITIALIZE;
+    if (needsEarlyStackCheck())
+        phase = CHECK_OVER_RECURSED;
+
     RootedFunction fun(cx, function());
     if (fun) {
         // Use callee->environment as scope chain. Note that we do
@@ -554,7 +565,7 @@ BaselineCompiler::initScopeChain()
             masm.loadBaselineFramePtr(BaselineFrameReg, R0.scratchReg());
             pushArg(R0.scratchReg());
 
-            if (!callVM(HeavyweightFunPrologueInfo))
+            if (!callVM(HeavyweightFunPrologueInfo, phase))
                 return false;
         }
     } else {
@@ -568,7 +579,7 @@ BaselineCompiler::initScopeChain()
             masm.loadBaselineFramePtr(BaselineFrameReg, R0.scratchReg());
             pushArg(R0.scratchReg());
 
-            if (!callVM(StrictEvalPrologueInfo))
+            if (!callVM(StrictEvalPrologueInfo, phase))
                 return false;
         }
     }
diff --git a/js/src/jit/IonAnalysis.cpp b/js/src/jit/IonAnalysis.cpp
index adbbbd425e1e..c5444e3f4cd7 100644
--- a/js/src/jit/IonAnalysis.cpp
+++ b/js/src/jit/IonAnalysis.cpp
@@ -1976,7 +1976,7 @@ AnalyzePoppedThis(JSContext *cx, types::TypeObject *type,
         RootedId id(cx, NameToId(setprop->name()));
         RootedValue value(cx, UndefinedValue());
         if (!DefineNativeProperty(cx, baseobj, id, value, nullptr, nullptr,
-                                  JSPROP_ENUMERATE, 0, 0, DNP_SKIP_TYPE))
+                                  JSPROP_ENUMERATE, 0, 0))
         {
             return false;
         }
diff --git a/js/src/jit/IonBuilder.cpp b/js/src/jit/IonBuilder.cpp
index eb807a97856e..c6bb42bd2f94 100644
--- a/js/src/jit/IonBuilder.cpp
+++ b/js/src/jit/IonBuilder.cpp
@@ -6310,14 +6310,9 @@ IonBuilder::setStaticName(JSObject *staticObject, PropertyName *name)
     // If the property has a known type, we may be able to optimize typed stores by not
     // storing the type tag.
     MIRType slotType = MIRType_None;
-    {
-        Shape *shape = staticObject->nativeLookup(cx, id);
-        if (!shape || !shape->hasSlot() || !staticObject->getSlot(shape->slot()).isUndefined()) {
-            JSValueType knownType = property.knownTypeTag(constraints());
-            if (knownType != JSVAL_TYPE_UNKNOWN)
-                slotType = MIRTypeFromValueType(knownType);
-        }
-    }
+    JSValueType knownType = property.knownTypeTag(constraints());
+    if (knownType != JSVAL_TYPE_UNKNOWN)
+        slotType = MIRTypeFromValueType(knownType);
 
     bool needsBarrier = property.needsBarrier(constraints());
     return storeSlot(obj, property.maybeTypes()->definiteSlot(), NumFixedSlots(staticObject),
diff --git a/js/src/jit/VMFunctions.cpp b/js/src/jit/VMFunctions.cpp
index 8499fe40b1b6..65f637df0854 100644
--- a/js/src/jit/VMFunctions.cpp
+++ b/js/src/jit/VMFunctions.cpp
@@ -462,7 +462,7 @@ SetProperty(JSContext *cx, HandleObject obj, HandlePropertyName name, HandleValu
         // required for initializing 'const' closure variables.
         Shape *shape = obj->nativeLookup(cx, name);
         JS_ASSERT(shape && shape->hasSlot());
-        JSObject::nativeSetSlotWithType(cx, obj, shape, value);
+        obj->nativeSetSlotWithType(cx, shape, value);
         return true;
     }
 
diff --git a/js/src/jit/shared/BaselineCompiler-shared.cpp b/js/src/jit/shared/BaselineCompiler-shared.cpp
index 341c36ab44de..7fd20c984570 100644
--- a/js/src/jit/shared/BaselineCompiler-shared.cpp
+++ b/js/src/jit/shared/BaselineCompiler-shared.cpp
@@ -31,7 +31,7 @@ BaselineCompilerShared::BaselineCompilerShared(JSContext *cx, HandleScript scrip
 { }
 
 bool
-BaselineCompilerShared::callVM(const VMFunction &fun, bool preInitialize)
+BaselineCompilerShared::callVM(const VMFunction &fun, CallVMPhase phase)
 {
     IonCode *code = cx->runtime()->jitRuntime()->getVMWrapper(fun);
     if (!code)
@@ -50,14 +50,43 @@ BaselineCompilerShared::callVM(const VMFunction &fun, bool preInitialize)
     // Assert all arguments were pushed.
     JS_ASSERT(masm.framePushed() - pushedBeforeCall_ == argSize);
 
-    uint32_t frameVals = preInitialize ? 0 : frame.nlocals() + frame.stackDepth();
-    uint32_t frameSize = BaselineFrame::FramePointerOffset + BaselineFrame::Size() +
-                         (frameVals * sizeof(Value));
+    Address frameSizeAddress(BaselineFrameReg, BaselineFrame::reverseOffsetOfFrameSize());
+    uint32_t frameVals = frame.nlocals() + frame.stackDepth();
+    uint32_t frameBaseSize = BaselineFrame::FramePointerOffset + BaselineFrame::Size();
+    uint32_t frameFullSize = frameBaseSize + (frameVals * sizeof(Value));
+    if (phase == POST_INITIALIZE) {
+        masm.store32(Imm32(frameFullSize), frameSizeAddress);
+        uint32_t descriptor = MakeFrameDescriptor(frameFullSize + argSize, IonFrame_BaselineJS);
+        masm.push(Imm32(descriptor));
 
-    masm.store32(Imm32(frameSize), Address(BaselineFrameReg, BaselineFrame::reverseOffsetOfFrameSize()));
+    } else if (phase == PRE_INITIALIZE) {
+        masm.store32(Imm32(frameBaseSize), frameSizeAddress);
+        uint32_t descriptor = MakeFrameDescriptor(frameBaseSize + argSize, IonFrame_BaselineJS);
+        masm.push(Imm32(descriptor));
 
-    uint32_t descriptor = MakeFrameDescriptor(frameSize + argSize, IonFrame_BaselineJS);
-    masm.push(Imm32(descriptor));
+    } else {
+        JS_ASSERT(phase == CHECK_OVER_RECURSED);
+        Label afterWrite;
+        Label writePostInitialize;
+
+        // If OVER_RECURSED is set, then frame locals haven't been pushed yet.
+        masm.branchTest32(Assembler::Zero,
+                          frame.addressOfFlags(),
+                          Imm32(BaselineFrame::OVER_RECURSED),
+                          &writePostInitialize);
+
+        masm.move32(Imm32(frameBaseSize), BaselineTailCallReg);
+        masm.jump(&afterWrite);
+
+        masm.bind(&writePostInitialize);
+        masm.move32(Imm32(frameFullSize), BaselineTailCallReg);
+
+        masm.bind(&afterWrite);
+        masm.store32(BaselineTailCallReg, frameSizeAddress);
+        masm.add32(Imm32(argSize), BaselineTailCallReg);
+        masm.makeFrameDescriptor(BaselineTailCallReg, IonFrame_BaselineJS);
+        masm.push(BaselineTailCallReg);
+    }
 
     // Perform the call.
     masm.call(code);
diff --git a/js/src/jit/shared/BaselineCompiler-shared.h b/js/src/jit/shared/BaselineCompiler-shared.h
index 7a2836758023..122f3fa394a4 100644
--- a/js/src/jit/shared/BaselineCompiler-shared.h
+++ b/js/src/jit/shared/BaselineCompiler-shared.h
@@ -127,7 +127,12 @@ class BaselineCompilerShared
         masm.Push(BaselineFrameReg);
     }
 
-    bool callVM(const VMFunction &fun, bool preInitialize=false);
+    enum CallVMPhase {
+        POST_INITIALIZE,
+        PRE_INITIALIZE,
+        CHECK_OVER_RECURSED
+    };
+    bool callVM(const VMFunction &fun, CallVMPhase phase=POST_INITIALIZE);
 
   public:
     BytecodeAnalysis &analysis() {
diff --git a/js/src/jsanalyze.cpp b/js/src/jsanalyze.cpp
index c79771130ff4..7dc85ff0522b 100644
--- a/js/src/jsanalyze.cpp
+++ b/js/src/jsanalyze.cpp
@@ -520,7 +520,8 @@ ScriptAnalysis::analyzeLifetimes(JSContext *cx)
             /* Restore all saved variables. :FIXME: maybe do this precisely. */
             for (unsigned i = 0; i < savedCount; i++) {
                 LifetimeVariable &var = *saved[i];
-                var.lifetime = alloc.new_<Lifetime>(offset, var.savedEnd, var.saved);
+                uint32_t savedEnd = var.savedEnd;
+                var.lifetime = alloc.new_<Lifetime>(offset, savedEnd, var.saved);
                 if (!var.lifetime) {
                     js_free(saved);
                     setOOM(cx);
@@ -612,7 +613,8 @@ ScriptAnalysis::analyzeLifetimes(JSContext *cx)
                          * Jumping to a place where this variable is live. Make a new
                          * lifetime segment for the variable.
                          */
-                        var.lifetime = alloc.new_<Lifetime>(offset, var.savedEnd, var.saved);
+                        uint32_t savedEnd = var.savedEnd;
+                        var.lifetime = alloc.new_<Lifetime>(offset, savedEnd, var.saved);
                         if (!var.lifetime) {
                             js_free(saved);
                             setOOM(cx);
@@ -676,7 +678,8 @@ ScriptAnalysis::addVariable(JSContext *cx, LifetimeVariable &var, unsigned offse
                 }
             }
         }
-        var.lifetime = cx->typeLifoAlloc().new_<Lifetime>(offset, var.savedEnd, var.saved);
+        uint32_t savedEnd = var.savedEnd;
+        var.lifetime = cx->typeLifoAlloc().new_<Lifetime>(offset, savedEnd, var.saved);
         if (!var.lifetime) {
             setOOM(cx);
             return;
@@ -691,7 +694,8 @@ ScriptAnalysis::killVariable(JSContext *cx, LifetimeVariable &var, unsigned offs
 {
     if (!var.lifetime) {
         /* Make a point lifetime indicating the write. */
-        Lifetime *lifetime = cx->typeLifoAlloc().new_<Lifetime>(offset, var.savedEnd, var.saved);
+        uint32_t savedEnd = var.savedEnd;
+        Lifetime *lifetime = cx->typeLifoAlloc().new_<Lifetime>(offset, savedEnd, var.saved);
         if (!lifetime) {
             setOOM(cx);
             return;
diff --git a/js/src/jsarray.cpp b/js/src/jsarray.cpp
index 2a906bd76eac..5a20ba3429f7 100644
--- a/js/src/jsarray.cpp
+++ b/js/src/jsarray.cpp
@@ -286,7 +286,7 @@ SetArrayElement(JSContext *cx, HandleObject obj, double index, HandleValue v)
                 break;
             if (idx >= arr->length())
                 arr->setLengthInt32(idx + 1);
-            JSObject::setDenseElementWithType(cx, arr, idx, v);
+            arr->setDenseElementWithType(cx, idx, v);
             return true;
         } while (false);
 
@@ -677,14 +677,12 @@ js::ArraySetLength(typename ExecutionModeTraits<mode>::ContextType cxArg,
 
     RootedValue v(cxArg, NumberValue(newLen));
     if (mode == ParallelExecution) {
-        // Adding the property type or overflowing int32 requires changing TI
-        // state.
-        if (!HasTypePropertyId(arr, id, v) || newLen > INT32_MAX)
+        // Overflowing int32 requires changing TI state.
+        if (newLen > INT32_MAX)
             return false;
         arr->setLengthInt32(newLen);
     } else {
         JSContext *cx = cxArg->asJSContext();
-        AddTypePropertyId(cx, arr, id, v);
         ArrayObject::setLength(cx, arr, newLen);
     }
 
@@ -2022,7 +2020,7 @@ NewbornArrayPushImpl(JSContext *cx, HandleObject obj, const Value &v)
 
     arr->setDenseInitializedLength(length + 1);
     arr->setLengthInt32(length + 1);
-    JSObject::initDenseElementWithType(cx, arr, length, v);
+    arr->initDenseElementWithType(cx, length, v);
     return true;
 }
 
@@ -2066,7 +2064,7 @@ js::array_push(JSContext *cx, unsigned argc, Value *vp)
 
         if (result == JSObject::ED_OK) {
             for (uint32_t i = 0, index = length; i < argCount; index++, i++)
-                JSObject::setDenseElementWithType(cx, obj, index, args[i]);
+                obj->setDenseElementWithType(cx, index, args[i]);
             uint32_t newlength = length + argCount;
             args.rval().setNumber(newlength);
             if (obj->is<ArrayObject>()) {
diff --git a/js/src/jsinfer.cpp b/js/src/jsinfer.cpp
index 83931c655f63..6d51272e1e90 100644
--- a/js/src/jsinfer.cpp
+++ b/js/src/jsinfer.cpp
@@ -1000,7 +1000,7 @@ class ConstraintDataFreeze
     const char *kind() { return "freeze"; }
 
     bool invalidateOnNewType(Type type) { return true; }
-    bool invalidateOnNewPropertyState(TypeSet *property) { return false; }
+    bool invalidateOnNewPropertyState(TypeSet *property) { return true; }
     bool invalidateOnNewObjectState(TypeObject *object) { return false; }
 
     bool constraintHolds(JSContext *cx,
@@ -1103,7 +1103,7 @@ HeapTypeSetKey::knownTypeTag(CompilerConstraintList *constraints)
 bool
 HeapTypeSetKey::isOwnProperty(CompilerConstraintList *constraints)
 {
-    if (maybeTypes() && !maybeTypes()->empty())
+    if (maybeTypes() && (!maybeTypes()->empty() || maybeTypes()->configuredProperty()))
         return true;
     if (JSObject *obj = object()->singleton()) {
         if (CanHaveEmptyPropertyTypesForOwnProperty(obj))
@@ -1138,9 +1138,9 @@ TemporaryTypeSet::getSingleton()
 JSObject *
 HeapTypeSetKey::singleton(CompilerConstraintList *constraints)
 {
-    TypeSet *types = maybeTypes();
+    HeapTypeSet *types = maybeTypes();
 
-    if (!types || types->baseFlags() != 0 || types->getObjectCount() != 1)
+    if (!types || types->configuredProperty() || types->baseFlags() != 0 || types->getObjectCount() != 1)
         return nullptr;
 
     JSObject *obj = types->getSingleObject(0);
diff --git a/js/src/jsinferinlines.h b/js/src/jsinferinlines.h
index 08d6d58f58d5..f44b4c6c22d0 100644
--- a/js/src/jsinferinlines.h
+++ b/js/src/jsinferinlines.h
@@ -536,7 +536,7 @@ MarkTypeObjectUnknownProperties(JSContext *cx, TypeObject *obj,
  * have a getter/setter.
  */
 inline void
-MarkTypePropertyConfigured(ExclusiveContext *cx, HandleObject obj, jsid id)
+MarkTypePropertyConfigured(ExclusiveContext *cx, JSObject *obj, jsid id)
 {
     if (cx->typeInferenceEnabled()) {
         id = IdToTypeId(id);
diff --git a/js/src/jsobj.cpp b/js/src/jsobj.cpp
index 59a8ba06c804..7e05a78fdf21 100644
--- a/js/src/jsobj.cpp
+++ b/js/src/jsobj.cpp
@@ -1442,9 +1442,9 @@ js::NewObjectWithClassProtoCommon(ExclusiveContext *cxArg,
  * Create a plain object with the specified type. This bypasses getNewType to
  * avoid losing creation site information for objects made by scripted 'new'.
  */
-static JSObject *
-NewObjectWithType(JSContext *cx, HandleTypeObject type, JSObject *parent, gc::AllocKind allocKind,
-                  NewObjectKind newKind = GenericObject)
+JSObject *
+js::NewObjectWithType(JSContext *cx, HandleTypeObject type, JSObject *parent, gc::AllocKind allocKind,
+                      NewObjectKind newKind)
 {
     JS_ASSERT(type->proto->hasNewType(&JSObject::class_, type));
     JS_ASSERT(parent);
@@ -1500,46 +1500,6 @@ js::NewObjectScriptedCall(JSContext *cx, MutableHandleObject pobj)
     return true;
 }
 
-JSObject *
-js::NewReshapedObject(JSContext *cx, HandleTypeObject type, JSObject *parent,
-                      gc::AllocKind allocKind, HandleShape shape, NewObjectKind newKind)
-{
-    RootedObject res(cx, NewObjectWithType(cx, type, parent, allocKind, newKind));
-    if (!res)
-        return nullptr;
-
-    if (shape->isEmptyShape())
-        return res;
-
-    /* Get all the ids in the object, in order. */
-    js::AutoIdVector ids(cx);
-    {
-        for (unsigned i = 0; i <= shape->slot(); i++) {
-            if (!ids.append(JSID_VOID))
-                return nullptr;
-        }
-        Shape *nshape = shape;
-        while (!nshape->isEmptyShape()) {
-            ids[nshape->slot()] = nshape->propid();
-            nshape = nshape->previous();
-        }
-    }
-
-    /* Construct the new shape. */
-    RootedId id(cx);
-    RootedValue undefinedValue(cx, UndefinedValue());
-    for (unsigned i = 0; i < ids.length(); i++) {
-        id = ids[i];
-        if (!DefineNativeProperty(cx, res, id, undefinedValue, nullptr, nullptr,
-                                  JSPROP_ENUMERATE, 0, 0, DNP_SKIP_TYPE)) {
-            return nullptr;
-        }
-    }
-    JS_ASSERT(!res->inDictionaryMode());
-
-    return res;
-}
-
 JSObject*
 js::CreateThis(JSContext *cx, const Class *newclasp, HandleObject callee)
 {
@@ -2224,7 +2184,6 @@ DefineStandardSlot(JSContext *cx, HandleObject obj, JSProtoKey key, JSAtom *atom
             uint32_t slot = GlobalObject::constructorPropertySlot(key);
             if (!JSObject::addProperty(cx, obj, id, JS_PropertyStub, JS_StrictPropertyStub, slot, attrs, 0, 0))
                 return false;
-            AddTypePropertyId(cx, obj, id, v);
 
             named = true;
             return true;
@@ -3431,7 +3390,7 @@ CallAddPropertyHook(typename ExecutionModeTraits<mode>::ExclusiveContextType cxA
         }
         if (value.get() != nominal) {
             if (shape->hasSlot())
-                JSObject::nativeSetSlotWithType(cx, obj, shape, value);
+                obj->nativeSetSlotWithType(cx, shape, value);
         }
     }
     return true;
@@ -3473,16 +3432,43 @@ CallAddPropertyHookDense(typename ExecutionModeTraits<mode>::ExclusiveContextTyp
 
         Rooted<jsid> id(cx, INT_TO_JSID(index));
         if (!CallJSPropertyOp(cx->asJSContext(), clasp->addProperty, obj, id, &value)) {
-            JSObject::setDenseElementHole(cx, obj, index);
+            obj->setDenseElementHole(cx, index);
             return false;
         }
         if (value.get() != nominal)
-            JSObject::setDenseElementWithType(cx, obj, index, value);
+            obj->setDenseElementWithType(cx, index, value);
     }
 
     return true;
 }
 
+template <ExecutionMode mode>
+static bool
+UpdateShapeTypeAndValue(typename ExecutionModeTraits<mode>::ExclusiveContextType cx,
+                        JSObject *obj, Shape *shape, const Value &value)
+{
+    jsid id = shape->propid();
+    if (shape->hasSlot()) {
+        if (mode == ParallelExecution) {
+            if (!obj->nativeSetSlotIfHasType(shape, value))
+                return false;
+        } else {
+            obj->nativeSetSlotWithType(cx->asExclusiveContext(), shape, value);
+        }
+    }
+    if (!shape->hasSlot() || !shape->writable() ||
+        !shape->hasDefaultGetter() || !shape->hasDefaultSetter())
+    {
+        if (mode == ParallelExecution) {
+            if (!IsTypePropertyIdMarkedConfigured(obj, id))
+                return false;
+        } else {
+            MarkTypePropertyConfigured(cx->asExclusiveContext(), obj, id);
+        }
+    }
+    return true;
+}
+
 template <ExecutionMode mode>
 static inline bool
 DefinePropertyOrElement(typename ExecutionModeTraits<mode>::ExclusiveContextType cx,
@@ -3517,7 +3503,12 @@ DefinePropertyOrElement(typename ExecutionModeTraits<mode>::ExclusiveContextType
         if (result == JSObject::ED_FAILED)
             return false;
         if (result == JSObject::ED_OK) {
-            obj->setDenseElementMaybeConvertDouble(index, value);
+            if (mode == ParallelExecution) {
+                if (!obj->setDenseElementIfHasType(index, value))
+                    return false;
+            } else {
+                obj->setDenseElementWithType(cx->asExclusiveContext(), index, value);
+            }
             return CallAddPropertyHookDense<mode>(cx, obj->getClass(), obj, index, value);
         }
     }
@@ -3549,8 +3540,8 @@ DefinePropertyOrElement(typename ExecutionModeTraits<mode>::ExclusiveContextType
     if (!shape)
         return false;
 
-    if (shape->hasSlot())
-        obj->nativeSetSlot(shape->slot(), value);
+    if (!UpdateShapeTypeAndValue<mode>(cx, obj, shape, value))
+        return false;
 
     /*
      * Clear any existing dense index after adding a sparse indexed property,
@@ -3594,7 +3585,7 @@ js::DefineNativeProperty(ExclusiveContext *cx, HandleObject obj, HandleId id, Ha
                          PropertyOp getter, StrictPropertyOp setter, unsigned attrs,
                          unsigned flags, int shortid, unsigned defineHow /* = 0 */)
 {
-    JS_ASSERT((defineHow & ~(DNP_DONT_PURGE | DNP_SKIP_TYPE)) == 0);
+    JS_ASSERT((defineHow & ~DNP_DONT_PURGE) == 0);
     JS_ASSERT(!(attrs & JSPROP_NATIVE_ACCESSORS));
 
     AutoRooterGetterSetter gsRoot(cx, attrs, &getter, &setter);
@@ -3606,10 +3597,6 @@ js::DefineNativeProperty(ExclusiveContext *cx, HandleObject obj, HandleId id, Ha
      */
     RootedShape shape(cx);
     if (attrs & (JSPROP_GETTER | JSPROP_SETTER)) {
-        /* Type information for getter/setter properties is unknown. */
-        AddTypePropertyId(cx, obj, id, types::Type::UnknownType());
-        MarkTypePropertyConfigured(cx, obj, id);
-
         /*
          * If we are defining a getter whose setter was already defined, or
          * vice versa, finish the job via obj->changeProperty.
@@ -3656,24 +3643,13 @@ js::DefineNativeProperty(ExclusiveContext *cx, HandleObject obj, HandleId id, Ha
     if (!setter && !(attrs & JSPROP_SETTER))
         setter = clasp->setProperty;
 
-    if ((getter == JS_PropertyStub) && !(defineHow & DNP_SKIP_TYPE)) {
-        /*
-         * Type information for normal native properties should reflect the
-         * initial value of the property.
-         */
-        AddTypePropertyId(cx, obj, id, value);
-        if (attrs & JSPROP_READONLY)
-            MarkTypePropertyConfigured(cx, obj, id);
-    }
-
     if (!shape) {
         return DefinePropertyOrElement<SequentialExecution>(cx, obj, id, getter, setter,
                                                             attrs, flags, shortid, value,
                                                             false, false);
     }
 
-    if (shape->hasSlot())
-        obj->nativeSetSlot(shape->slot(), value);
+    JS_ALWAYS_TRUE(UpdateShapeTypeAndValue<SequentialExecution>(cx, obj, shape, value));
 
     return CallAddPropertyHook<SequentialExecution>(cx, clasp, obj, shape, value);
 }
@@ -4162,7 +4138,7 @@ js::NativeSet(typename ExecutionModeTraits<mode>::ContextType cxArg,
                 if (!obj->nativeSetSlotIfHasType(shape, vp))
                     return false;
             } else {
-                obj->nativeSetSlotWithType(cxArg->asExclusiveContext(), obj, shape, vp);
+                obj->nativeSetSlotWithType(cxArg->asExclusiveContext(), shape, vp);
             }
 
             return true;
@@ -4197,8 +4173,7 @@ js::NativeSet(typename ExecutionModeTraits<mode>::ContextType cxArg,
     if (shape->hasSlot() &&
         (JS_LIKELY(cx->runtime()->propertyRemovals == sample) ||
          obj->nativeContains(cx, shape)))
-     {
-        AddTypePropertyId(cx, obj, shape->propid(), ovp);
+    {
         obj->setSlot(shape->slot(), vp);
     }
 
@@ -4242,10 +4217,6 @@ GetPropertyHelperInline(JSContext *cx,
             return false;
         }
 
-        /* Record non-undefined values produced by the class getter hook. */
-        if (!vp.isUndefined())
-            AddTypePropertyId(cx, obj, id, vp);
-
         /*
          * Give a strict warning if foo.bar is evaluated by a script for an
          * object foo with no property named 'bar'.
@@ -4830,7 +4801,7 @@ baseops::SetPropertyHelper(typename ExecutionModeTraits<mode>::ContextType cxArg
         if (mode == ParallelExecution)
             obj->setDenseElementIfHasType(index, vp);
         else
-            JSObject::setDenseElementWithType(cxArg->asJSContext(), obj, index, vp);
+            obj->setDenseElementWithType(cxArg->asJSContext(), index, vp);
         return true;
     }
 
@@ -4871,9 +4842,6 @@ baseops::SetPropertyHelper(typename ExecutionModeTraits<mode>::ContextType cxArg
             /* Purge the property cache of now-shadowed id in obj's scope chain. */
             if (!PurgeScopeChain(cx, obj, id))
                 return false;
-
-            if (getter == JS_PropertyStub)
-                AddTypePropertyId(cx, obj, id, vp);
         }
 
         return DefinePropertyOrElement<mode>(cxArg, obj, id, getter, setter,
@@ -4937,9 +4905,15 @@ baseops::SetAttributes(JSContext *cx, HandleObject obj, HandleId id, unsigned *a
             return false;
         shape = obj->nativeLookup(cx, id);
     }
-    return nobj->isNative()
-           ? JSObject::changePropertyAttributes(cx, nobj, shape, *attrsp)
-           : JSObject::setGenericAttributes(cx, nobj, id, attrsp);
+    if (nobj->isNative()) {
+        if (!JSObject::changePropertyAttributes(cx, nobj, shape, *attrsp))
+            return false;
+        if (*attrsp & JSPROP_READONLY)
+            MarkTypePropertyConfigured(cx, obj, id);
+        return true;
+    } else {
+        return JSObject::setGenericAttributes(cx, nobj, id, attrsp);
+    }
 }
 
 bool
@@ -4965,7 +4939,7 @@ baseops::DeleteGeneric(JSContext *cx, HandleObject obj, HandleId id, bool *succe
         if (!succeeded)
             return true;
 
-        JSObject::setDenseElementHole(cx, obj, JSID_TO_INT(id));
+        obj->setDenseElementHole(cx, JSID_TO_INT(id));
         return js_SuppressDeletedProperty(cx, obj, id);
     }
 
diff --git a/js/src/jsobj.h b/js/src/jsobj.h
index 03f216f33583..1d73720e26bc 100644
--- a/js/src/jsobj.h
+++ b/js/src/jsobj.h
@@ -409,10 +409,8 @@ class JSObject : public js::ObjectImpl
     }
 
     inline bool nativeSetSlotIfHasType(js::Shape *shape, const js::Value &value);
-
-    static inline void nativeSetSlotWithType(js::ExclusiveContext *cx,
-                                             js::HandleObject, js::Shape *shape,
-                                             const js::Value &value);
+    inline void nativeSetSlotWithType(js::ExclusiveContext *cx, js::Shape *shape,
+                                      const js::Value &value);
 
     inline const js::Value &getReservedSlot(uint32_t index) const {
         JS_ASSERT(index < JSSLOT_FREE(getClass()));
@@ -642,12 +640,11 @@ class JSObject : public js::ObjectImpl
     }
 
     inline bool setDenseElementIfHasType(uint32_t index, const js::Value &val);
-    static inline void setDenseElementWithType(js::ExclusiveContext *cx, js::HandleObject obj,
-                                               uint32_t index, const js::Value &val);
-    static inline void initDenseElementWithType(js::ExclusiveContext *cx, js::HandleObject obj,
-                                                uint32_t index, const js::Value &val);
-    static inline void setDenseElementHole(js::ExclusiveContext *cx,
-                                           js::HandleObject obj, uint32_t index);
+    inline void setDenseElementWithType(js::ExclusiveContext *cx, uint32_t index,
+                                        const js::Value &val);
+    inline void initDenseElementWithType(js::ExclusiveContext *cx, uint32_t index,
+                                         const js::Value &val);
+    inline void setDenseElementHole(js::ExclusiveContext *cx, uint32_t index);
     static inline void removeDenseElementForSparseIndex(js::ExclusiveContext *cx,
                                                         js::HandleObject obj, uint32_t index);
 
@@ -1394,7 +1391,6 @@ const unsigned DNP_DONT_PURGE   = 1;   /* suppress js_PurgeScopeChain */
 const unsigned DNP_UNQUALIFIED  = 2;   /* Unqualified property set.  Only used in
                                        the defineHow argument of
                                        js_SetPropertyHelper. */
-const unsigned DNP_SKIP_TYPE    = 4;   /* Don't update type information */
 
 /*
  * Return successfully added or changed shape or nullptr on error.
diff --git a/js/src/jsobjinlines.h b/js/src/jsobjinlines.h
index 81f2377680ec..edc32e4c7552 100644
--- a/js/src/jsobjinlines.h
+++ b/js/src/jsobjinlines.h
@@ -43,7 +43,6 @@ JSObject::deleteProperty(JSContext *cx, js::HandleObject obj, js::HandleProperty
                          bool *succeeded)
 {
     JS::RootedId id(cx, js::NameToId(name));
-    js::types::AddTypePropertyId(cx, obj, id, js::types::Type::UndefinedType());
     js::types::MarkTypePropertyConfigured(cx, obj, id);
     js::DeletePropertyOp op = obj->getOps()->deleteProperty;
     return (op ? op : js::baseops::DeleteProperty)(cx, obj, name, succeeded);
@@ -55,7 +54,6 @@ JSObject::deleteElement(JSContext *cx, js::HandleObject obj, uint32_t index, boo
     JS::RootedId id(cx);
     if (!js::IndexToId(cx, index, &id))
         return false;
-    js::types::AddTypePropertyId(cx, obj, id, js::types::Type::UndefinedType());
     js::types::MarkTypePropertyConfigured(cx, obj, id);
     js::DeleteElementOp op = obj->getOps()->deleteElement;
     return (op ? op : js::baseops::DeleteElement)(cx, obj, index, succeeded);
@@ -66,7 +64,6 @@ JSObject::deleteSpecial(JSContext *cx, js::HandleObject obj, js::HandleSpecialId
                         bool *succeeded)
 {
     JS::RootedId id(cx, SPECIALID_TO_JSID(sid));
-    js::types::AddTypePropertyId(cx, obj, id, js::types::Type::UndefinedType());
     js::types::MarkTypePropertyConfigured(cx, obj, id);
     js::DeleteSpecialOp op = obj->getOps()->deleteSpecial;
     return (op ? op : js::baseops::DeleteSpecial)(cx, obj, sid, succeeded);
@@ -145,32 +142,32 @@ JSObject::setDenseElementIfHasType(uint32_t index, const js::Value &val)
     return true;
 }
 
-/* static */ inline void
-JSObject::setDenseElementWithType(js::ExclusiveContext *cx, js::HandleObject obj, uint32_t index,
+inline void
+JSObject::setDenseElementWithType(js::ExclusiveContext *cx, uint32_t index,
                                   const js::Value &val)
 {
     // Avoid a slow AddTypePropertyId call if the type is the same as the type
     // of the previous element.
     js::types::Type thisType = js::types::GetValueType(val);
-    if (index == 0 || js::types::GetValueType(obj->elements[index - 1]) != thisType)
-        js::types::AddTypePropertyId(cx, obj, JSID_VOID, thisType);
-    obj->setDenseElementMaybeConvertDouble(index, val);
+    if (index == 0 || js::types::GetValueType(elements[index - 1]) != thisType)
+        js::types::AddTypePropertyId(cx, this, JSID_VOID, thisType);
+    setDenseElementMaybeConvertDouble(index, val);
 }
 
-/* static */ inline void
-JSObject::initDenseElementWithType(js::ExclusiveContext *cx, js::HandleObject obj, uint32_t index,
+inline void
+JSObject::initDenseElementWithType(js::ExclusiveContext *cx, uint32_t index,
                                    const js::Value &val)
 {
-    JS_ASSERT(!obj->shouldConvertDoubleElements());
-    js::types::AddTypePropertyId(cx, obj, JSID_VOID, val);
-    obj->initDenseElement(index, val);
+    JS_ASSERT(!shouldConvertDoubleElements());
+    js::types::AddTypePropertyId(cx, this, JSID_VOID, val);
+    initDenseElement(index, val);
 }
 
-/* static */ inline void
-JSObject::setDenseElementHole(js::ExclusiveContext *cx, js::HandleObject obj, uint32_t index)
+inline void
+JSObject::setDenseElementHole(js::ExclusiveContext *cx, uint32_t index)
 {
-    js::types::MarkTypeObjectFlags(cx, obj, js::types::OBJECT_FLAG_NON_PACKED);
-    obj->setDenseElement(index, js::MagicValue(JS_ELEMENTS_HOLE));
+    js::types::MarkTypeObjectFlags(cx, this, js::types::OBJECT_FLAG_NON_PACKED);
+    setDenseElement(index, js::MagicValue(JS_ELEMENTS_HOLE));
 }
 
 /* static */ inline void
@@ -535,12 +532,12 @@ JSObject::nativeSetSlotIfHasType(js::Shape *shape, const js::Value &value)
     return true;
 }
 
-/* static */ inline void
-JSObject::nativeSetSlotWithType(js::ExclusiveContext *cx, js::HandleObject obj, js::Shape *shape,
+inline void
+JSObject::nativeSetSlotWithType(js::ExclusiveContext *cx, js::Shape *shape,
                                 const js::Value &value)
 {
-    obj->nativeSetSlot(shape->slot(), value);
-    js::types::AddTypePropertyId(cx, obj, shape->propid(), value);
+    nativeSetSlot(shape->slot(), value);
+    js::types::AddTypePropertyId(cx, this, shape->propid(), value);
 }
 
 /* static */ inline bool
@@ -903,6 +900,10 @@ CopyInitializerObject(JSContext *cx, HandleObject baseobj, NewObjectKind newKind
     return obj;
 }
 
+JSObject *
+NewObjectWithType(JSContext *cx, HandleTypeObject type, JSObject *parent, gc::AllocKind allocKind,
+                  NewObjectKind newKind = GenericObject);
+
 JSObject *
 NewReshapedObject(JSContext *cx, HandleTypeObject type, JSObject *parent,
                   gc::AllocKind allocKind, HandleShape shape,
@@ -945,7 +946,6 @@ DefineConstructorAndPrototype(JSContext *cx, Handle<GlobalObject*> global,
     global->setPrototype(key, ObjectValue(*proto));
     global->setConstructorPropertySlot(key, ObjectValue(*ctor));
 
-    types::AddTypePropertyId(cx, global, id, ObjectValue(*ctor));
     if (!global->addDataProperty(cx, id, GlobalObject::constructorPropertySlot(key), 0)) {
         global->setConstructor(key, UndefinedValue());
         global->setPrototype(key, UndefinedValue());
@@ -953,6 +953,7 @@ DefineConstructorAndPrototype(JSContext *cx, Handle<GlobalObject*> global,
         return false;
     }
 
+    types::AddTypePropertyId(cx, global, id, ObjectValue(*ctor));
     return true;
 }
 
diff --git a/js/src/vm/ArrayObject-inl.h b/js/src/vm/ArrayObject-inl.h
index 18365f61ab6a..1df6cf280a37 100644
--- a/js/src/vm/ArrayObject-inl.h
+++ b/js/src/vm/ArrayObject-inl.h
@@ -23,8 +23,6 @@ ArrayObject::setLength(ExclusiveContext *cx, Handle<ArrayObject*> arr, uint32_t
     if (length > INT32_MAX) {
         /* Track objects with overflowing lengths in type information. */
         types::MarkTypeObjectFlags(cx, arr, types::OBJECT_FLAG_LENGTH_OVERFLOW);
-        jsid lengthId = NameToId(cx->names().length);
-        types::AddTypePropertyId(cx, arr, lengthId, types::Type::DoubleType());
     }
 
     arr->getElementsHeader()->length = length;
diff --git a/js/src/vm/SelfHosting.cpp b/js/src/vm/SelfHosting.cpp
index 743045808e13..56eb8bfb6410 100644
--- a/js/src/vm/SelfHosting.cpp
+++ b/js/src/vm/SelfHosting.cpp
@@ -411,7 +411,7 @@ js::intrinsic_UnsafePutElements(JSContext *cx, unsigned argc, Value *vp)
 
         if (arrobj->isNative()) {
             JS_ASSERT(idx < arrobj->getDenseInitializedLength());
-            JSObject::setDenseElementWithType(cx, arrobj, idx, args[elemi]);
+            arrobj->setDenseElementWithType(cx, idx, args[elemi]);
         } else {
             JS_ASSERT(idx < arrobj->as<TypedArrayObject>().length());
             RootedValue tmp(cx, args[elemi]);
diff --git a/js/src/vm/Shape.cpp b/js/src/vm/Shape.cpp
index 25238b97f4de..fbe70f0fb12d 100644
--- a/js/src/vm/Shape.cpp
+++ b/js/src/vm/Shape.cpp
@@ -673,6 +673,61 @@ JSObject::addPropertyInternal<ParallelExecution>(ForkJoinSlice *cx,
                                                  unsigned flags, int shortid, Shape **spp,
                                                  bool allowDictionary);
 
+JSObject *
+js::NewReshapedObject(JSContext *cx, HandleTypeObject type, JSObject *parent,
+                      gc::AllocKind allocKind, HandleShape shape, NewObjectKind newKind)
+{
+    RootedObject res(cx, NewObjectWithType(cx, type, parent, allocKind, newKind));
+    if (!res)
+        return nullptr;
+
+    if (shape->isEmptyShape())
+        return res;
+
+    /* Get all the ids in the object, in order. */
+    js::AutoIdVector ids(cx);
+    {
+        for (unsigned i = 0; i <= shape->slot(); i++) {
+            if (!ids.append(JSID_VOID))
+                return nullptr;
+        }
+        Shape *nshape = shape;
+        while (!nshape->isEmptyShape()) {
+            ids[nshape->slot()] = nshape->propid();
+            nshape = nshape->previous();
+        }
+    }
+
+    /* Construct the new shape, without updating type information. */
+    RootedId id(cx);
+    RootedShape newShape(cx, res->lastProperty());
+    for (unsigned i = 0; i < ids.length(); i++) {
+        id = ids[i];
+        JS_ASSERT(!res->nativeContains(cx, id));
+
+        uint32_t index;
+        bool indexed = js_IdIsIndex(id, &index);
+
+        Rooted<UnownedBaseShape*> nbase(cx, newShape->base()->toUnowned());
+        if (indexed) {
+            StackBaseShape base(nbase);
+            base.flags |= BaseShape::INDEXED;
+            nbase = GetOrLookupUnownedBaseShape<SequentialExecution>(cx, base);
+            if (!nbase)
+                return nullptr;
+        }
+
+        StackShape child(nbase, id, i, res->numFixedSlots(), JSPROP_ENUMERATE, 0, 0);
+        newShape = cx->compartment()->propertyTree.getChild(cx, newShape, res->numFixedSlots(), child);
+        if (!newShape)
+            return nullptr;
+        if (!JSObject::setLastProperty(cx, res, newShape))
+            return nullptr;
+    }
+
+    return res;
+}
+
 /*
  * Check and adjust the new attributes for the shape to make sure that our
  * slot access optimizations are sound. It is responsibility of the callers to
@@ -925,16 +980,6 @@ JSObject::changeProperty(typename ExecutionModeTraits<mode>::ExclusiveContextTyp
         types::MarkTypePropertyConfigured(cx->asExclusiveContext(), obj, shape->propid());
     }
 
-    if (attrs & (JSPROP_GETTER | JSPROP_SETTER)) {
-        if (mode == ParallelExecution) {
-            if (!types::HasTypePropertyId(obj, shape->propid(), types::Type::UnknownType()))
-                return nullptr;
-        } else {
-            types::AddTypePropertyId(cx->asExclusiveContext(), obj, shape->propid(),
-                                     types::Type::UnknownType());
-        }
-    }
-
     if (getter == JS_PropertyStub)
         getter = nullptr;
     if (setter == JS_StrictPropertyStub)
diff --git a/layout/base/nsLayoutUtils.cpp b/layout/base/nsLayoutUtils.cpp
index 16abed05f968..a61c205ebf12 100644
--- a/layout/base/nsLayoutUtils.cpp
+++ b/layout/base/nsLayoutUtils.cpp
@@ -1260,6 +1260,13 @@ nsLayoutUtils::GetActiveScrolledRootFor(nsIFrame* aFrame,
     nsIFrame* parent = GetCrossDocParentFrame(f);
     if (!parent)
       break;
+    nsIAtom* parentType = parent->GetType();
+#ifdef ANDROID
+    // Treat the slider thumb as being as an active scrolled root
+    // on mobile so that it can move without repainting.
+    if (parentType == nsGkAtoms::sliderFrame)
+      break;
+#endif
     // Sticky frames are active if their nearest scrollable frame
     // is also active, just keep a record of sticky frames that we
     // encounter for now.
@@ -1267,8 +1274,8 @@ nsLayoutUtils::GetActiveScrolledRootFor(nsIFrame* aFrame,
         !stickyFrame) {
       stickyFrame = f;
     }
-    nsIScrollableFrame* sf = do_QueryFrame(parent);
-    if (sf) {
+    if (parentType == nsGkAtoms::scrollFrame) {
+      nsIScrollableFrame* sf = do_QueryFrame(parent);
       if (sf->IsScrollingActive() && sf->GetScrolledFrame() == f) {
         // If we found a sticky frame inside this active scroll frame,
         // then use that. Otherwise use the scroll frame.
diff --git a/layout/base/nsPresContext.cpp b/layout/base/nsPresContext.cpp
index dafcdc8ebe69..725ed546fa27 100644
--- a/layout/base/nsPresContext.cpp
+++ b/layout/base/nsPresContext.cpp
@@ -2688,6 +2688,17 @@ nsPresContext::AppUnitsToGfxUnits(nscoord aAppUnits) const
   return mDeviceContext->AppUnitsToGfxUnits(aAppUnits);
 }
 
+bool
+nsPresContext::IsDeviceSizePageSize()
+{
+  bool isDeviceSizePageSize = false;
+  nsCOMPtr<nsIDocShell> docShell(do_QueryReferent(mContainer));
+  if (docShell) {
+    isDeviceSizePageSize = docShell->GetDeviceSizeIsPageSize();
+  }
+  return isDeviceSizePageSize;
+}
+
 nsRootPresContext::nsRootPresContext(nsIDocument* aDocument,
                                      nsPresContextType aType)
   : nsPresContext(aDocument, aType),
diff --git a/layout/base/nsPresContext.h b/layout/base/nsPresContext.h
index 5d4de289a2b1..0fc93bf70041 100644
--- a/layout/base/nsPresContext.h
+++ b/layout/base/nsPresContext.h
@@ -1000,6 +1000,8 @@ public:
     mExistThrottledUpdates = aExistThrottledUpdates;
   }
 
+  bool IsDeviceSizePageSize();
+
 protected:
   friend class nsRunnableMethod<nsPresContext>;
   NS_HIDDEN_(void) ThemeChangedInternal();
diff --git a/layout/style/nsMediaFeatures.cpp b/layout/style/nsMediaFeatures.cpp
index e4765dc5eb09..af6942356d2f 100644
--- a/layout/style/nsMediaFeatures.cpp
+++ b/layout/style/nsMediaFeatures.cpp
@@ -113,14 +113,18 @@ static nsSize
 GetDeviceSize(nsPresContext* aPresContext)
 {
     nsSize size;
-    if (aPresContext->IsRootPaginatedDocument())
+
+    if (aPresContext->IsDeviceSizePageSize()) {
+        size = GetSize(aPresContext);
+    } else if (aPresContext->IsRootPaginatedDocument()) {
         // We want the page size, including unprintable areas and margins.
         // XXX The spec actually says we want the "page sheet size", but
         // how is that different?
         size = aPresContext->GetPageSize();
-    else
+    } else {
         GetDeviceContextFor(aPresContext)->
             GetDeviceSurfaceDimensions(size.width, size.height);
+    }
     return size;
 }
 
diff --git a/mobile/android/base/GeckoView.java b/mobile/android/base/GeckoView.java
index 52931d11c744..d858fcfb6c4b 100644
--- a/mobile/android/base/GeckoView.java
+++ b/mobile/android/base/GeckoView.java
@@ -20,16 +20,9 @@ import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.content.res.TypedArray;
-import android.graphics.Canvas;
-import android.graphics.Paint;
-import android.net.Uri;
-import android.os.Bundle;
 import android.os.Handler;
 import android.util.AttributeSet;
 import android.util.Log;
-import android.view.SurfaceHolder;
-import android.view.SurfaceView;
-
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -49,6 +42,10 @@ public class GeckoView extends LayerView
         boolean doInit = a.getBoolean(R.styleable.GeckoView_doinit, true);
         a.recycle();
 
+        // TODO: Fennec currently takes care of its own initialization, so this
+        // flag is a hack used in Fennec to prevent GeckoView initialization.
+        // This should go away once Fennec also uses GeckoView for
+        // initialization.
         if (!doInit)
             return;
 
@@ -97,12 +94,17 @@ public class GeckoView extends LayerView
         ThreadUtils.setUiThread(Thread.currentThread(), new Handler());
         initializeView(GeckoAppShell.getEventDispatcher());
 
-        GeckoProfile profile = GeckoProfile.get(context).forceCreate();
-        BrowserDB.initialize(profile.getName());
-
         if (GeckoThread.checkAndSetLaunchState(GeckoThread.LaunchState.Launching, GeckoThread.LaunchState.Launched)) {
+            // This is the first launch, so finish initialization and go.
+            GeckoProfile profile = GeckoProfile.get(context).forceCreate();
+            BrowserDB.initialize(profile.getName());
+
             GeckoAppShell.setLayerView(this);
             GeckoThread.createAndStart();
+        } else if(GeckoThread.checkLaunchState(GeckoThread.LaunchState.GeckoRunning)) {
+            // If Gecko is already running, that means the Activity was
+            // destroyed, so we need to re-attach Gecko to this GeckoView.
+            connectToGecko();
         }
     }
 
@@ -195,7 +197,7 @@ public class GeckoView extends LayerView
         });
     }
 
-    private void handleReady(final JSONObject message) {
+    private void connectToGecko() {
         GeckoThread.setLaunchState(GeckoThread.LaunchState.GeckoRunning);
         Tab selectedTab = Tabs.getInstance().getSelectedTab();
         if (selectedTab != null)
@@ -203,8 +205,10 @@ public class GeckoView extends LayerView
         geckoConnected();
         GeckoAppShell.setLayerClient(getLayerClient());
         GeckoAppShell.sendEventToGecko(GeckoEvent.createBroadcastEvent("Viewport:Flush", null));
-        show();
-        requestRender();
+    }
+
+    private void handleReady(final JSONObject message) {
+        connectToGecko();
 
         if (mChromeDelegate != null) {
             mChromeDelegate.onReady(this);
diff --git a/mobile/android/base/tests/AboutHomeTest.java.in b/mobile/android/base/tests/AboutHomeTest.java
similarity index 99%
rename from mobile/android/base/tests/AboutHomeTest.java.in
rename to mobile/android/base/tests/AboutHomeTest.java
index 6df8ab062bdb..0c7837122995 100644
--- a/mobile/android/base/tests/AboutHomeTest.java.in
+++ b/mobile/android/base/tests/AboutHomeTest.java
@@ -1,8 +1,7 @@
-#filter substitution
-package @ANDROID_PACKAGE_NAME@.tests;
+package org.mozilla.gecko.tests;
 
 import com.jayway.android.robotium.solo.Condition;
-import @ANDROID_PACKAGE_NAME@.*;
+import org.mozilla.gecko.*;
 
 import android.content.ContentResolver;
 import android.database.Cursor;
diff --git a/mobile/android/base/tests/BaseTest.java.in b/mobile/android/base/tests/BaseTest.java
similarity index 99%
rename from mobile/android/base/tests/BaseTest.java.in
rename to mobile/android/base/tests/BaseTest.java
index 0aadbd10df4f..f2d6ccfd0b62 100644
--- a/mobile/android/base/tests/BaseTest.java.in
+++ b/mobile/android/base/tests/BaseTest.java
@@ -1,9 +1,8 @@
-#filter substitution
-package @ANDROID_PACKAGE_NAME@.tests;
+package org.mozilla.gecko.tests;
 
 import com.jayway.android.robotium.solo.Condition;
 import com.jayway.android.robotium.solo.Solo;
-import @ANDROID_PACKAGE_NAME@.*;
+import org.mozilla.gecko.*;
 
 import android.app.Activity;
 import android.app.Instrumentation;
@@ -46,7 +45,7 @@ abstract class BaseTest extends ActivityInstrumentationTestCase2<Activity> {
     public static final int TEST_TALOS = 1;
 
     private static final String TARGET_PACKAGE_ID = "org.mozilla.gecko";
-    private static final String LAUNCH_ACTIVITY_FULL_CLASSNAME ="@ANDROID_PACKAGE_NAME@.App";
+    private static final String LAUNCH_ACTIVITY_FULL_CLASSNAME = TestConstants.ANDROID_PACKAGE_NAME + ".App";
     private static final int VERIFY_URL_TIMEOUT = 2000;
     private static final int MAX_LIST_ATTEMPTS = 3;
     private static final int MAX_WAIT_ENABLED_TEXT_MS = 10000;
diff --git a/mobile/android/base/tests/ContentContextMenuTest.java.in b/mobile/android/base/tests/ContentContextMenuTest.java
similarity index 97%
rename from mobile/android/base/tests/ContentContextMenuTest.java.in
rename to mobile/android/base/tests/ContentContextMenuTest.java
index 0eb471fb0551..9761fd1353b5 100644
--- a/mobile/android/base/tests/ContentContextMenuTest.java.in
+++ b/mobile/android/base/tests/ContentContextMenuTest.java
@@ -1,7 +1,6 @@
-#filter substitution
-package @ANDROID_PACKAGE_NAME@.tests;
+package org.mozilla.gecko.tests;
 
-import @ANDROID_PACKAGE_NAME@.*;
+import org.mozilla.gecko.*;
 import android.content.ContentResolver;
 import android.util.DisplayMetrics;
 
diff --git a/mobile/android/base/tests/ContentProviderTest.java.in b/mobile/android/base/tests/ContentProviderTest.java
similarity index 99%
rename from mobile/android/base/tests/ContentProviderTest.java.in
rename to mobile/android/base/tests/ContentProviderTest.java
index ef82427660ce..19e4d3b5dc5e 100644
--- a/mobile/android/base/tests/ContentProviderTest.java.in
+++ b/mobile/android/base/tests/ContentProviderTest.java
@@ -1,5 +1,4 @@
-#filter substitution
-package @ANDROID_PACKAGE_NAME@.tests;
+package org.mozilla.gecko.tests;
 
 import android.content.ContentProvider;
 import android.content.ContentValues;
diff --git a/mobile/android/base/tests/DatabaseHelper.java.in b/mobile/android/base/tests/DatabaseHelper.java
similarity index 97%
rename from mobile/android/base/tests/DatabaseHelper.java.in
rename to mobile/android/base/tests/DatabaseHelper.java
index d3978472dc35..47cde4e0ae05 100644
--- a/mobile/android/base/tests/DatabaseHelper.java.in
+++ b/mobile/android/base/tests/DatabaseHelper.java
@@ -1,7 +1,6 @@
-#filter substitution
-package @ANDROID_PACKAGE_NAME@.tests;
+package org.mozilla.gecko.tests;
 
-import @ANDROID_PACKAGE_NAME@.*;
+import org.mozilla.gecko.*;
 
 import android.app.Activity;
 import android.content.ContentResolver;
@@ -39,7 +38,7 @@ class DatabaseHelper {
     protected Uri buildUri(BrowserDataType dataType) {
         Uri uri = null;
         if (dataType == BrowserDataType.BOOKMARKS || dataType == BrowserDataType.HISTORY) {
-            uri = Uri.parse("content://@ANDROID_PACKAGE_NAME@.db.browser/" + dataType.toString().toLowerCase());
+            uri = Uri.parse("content://" + TestConstants.ANDROID_PACKAGE_NAME + ".db.browser/" + dataType.toString().toLowerCase());
         } else {
            mAsserter.ok(false, "The wrong data type has been provided = " + dataType.toString(), "Please provide the correct data type");
         }
diff --git a/mobile/android/base/tests/JavascriptTest.java.in b/mobile/android/base/tests/JavascriptTest.java
similarity index 98%
rename from mobile/android/base/tests/JavascriptTest.java.in
rename to mobile/android/base/tests/JavascriptTest.java
index d2967b0bceb0..421482a04ddd 100644
--- a/mobile/android/base/tests/JavascriptTest.java.in
+++ b/mobile/android/base/tests/JavascriptTest.java
@@ -1,7 +1,6 @@
-#filter substitution
-package @ANDROID_PACKAGE_NAME@.tests;
+package org.mozilla.gecko.tests;
 
-import @ANDROID_PACKAGE_NAME@.*;
+import org.mozilla.gecko.*;
 
 import android.util.Log;
 
diff --git a/mobile/android/base/tests/MotionEventHelper.java.in b/mobile/android/base/tests/MotionEventHelper.java
similarity index 99%
rename from mobile/android/base/tests/MotionEventHelper.java.in
rename to mobile/android/base/tests/MotionEventHelper.java
index 4e9ca03a00f1..43075a3a2cfb 100644
--- a/mobile/android/base/tests/MotionEventHelper.java.in
+++ b/mobile/android/base/tests/MotionEventHelper.java
@@ -1,5 +1,4 @@
-#filter substitution
-package @ANDROID_PACKAGE_NAME@.tests;
+package org.mozilla.gecko.tests;
 
 import android.app.Instrumentation;
 import android.os.SystemClock;
diff --git a/mobile/android/base/tests/MotionEventReplayer.java.in b/mobile/android/base/tests/MotionEventReplayer.java
similarity index 99%
rename from mobile/android/base/tests/MotionEventReplayer.java.in
rename to mobile/android/base/tests/MotionEventReplayer.java
index a56407a5853d..a2bea8b2e747 100644
--- a/mobile/android/base/tests/MotionEventReplayer.java.in
+++ b/mobile/android/base/tests/MotionEventReplayer.java
@@ -1,5 +1,4 @@
-#filter substitution
-package @ANDROID_PACKAGE_NAME@.tests;
+package org.mozilla.gecko.tests;
 
 import java.io.BufferedReader;
 import java.io.InputStream;
diff --git a/mobile/android/base/tests/PixelTest.java.in b/mobile/android/base/tests/PixelTest.java
similarity index 98%
rename from mobile/android/base/tests/PixelTest.java.in
rename to mobile/android/base/tests/PixelTest.java
index 3f364982e4ba..dbebbb68e54f 100644
--- a/mobile/android/base/tests/PixelTest.java.in
+++ b/mobile/android/base/tests/PixelTest.java
@@ -1,7 +1,6 @@
-#filter substitution
-package @ANDROID_PACKAGE_NAME@.tests;
+package org.mozilla.gecko.tests;
 
-import @ANDROID_PACKAGE_NAME@.*;
+import org.mozilla.gecko.*;
 
 abstract class PixelTest extends BaseTest {
     private static final long PAINT_CLEAR_DELAY = 10000; // milliseconds
diff --git a/mobile/android/base/tests/StringHelper.java.in b/mobile/android/base/tests/StringHelper.java
similarity index 98%
rename from mobile/android/base/tests/StringHelper.java.in
rename to mobile/android/base/tests/StringHelper.java
index b676a856c735..b7d60772877f 100644
--- a/mobile/android/base/tests/StringHelper.java.in
+++ b/mobile/android/base/tests/StringHelper.java
@@ -1,7 +1,6 @@
-#filter substitution
-package @ANDROID_PACKAGE_NAME@.tests;
+package org.mozilla.gecko.tests;
 
-import @ANDROID_PACKAGE_NAME@.*;
+import org.mozilla.gecko.*;
 
 class StringHelper {
     // Note: DEFAULT_BOOKMARKS_TITLES.length == DEFAULT_BOOKMARKS_URLS.length
diff --git a/mobile/android/base/tests/TestConstants.java.in b/mobile/android/base/tests/TestConstants.java.in
new file mode 100644
index 000000000000..6b84ad1dc7b6
--- /dev/null
+++ b/mobile/android/base/tests/TestConstants.java.in
@@ -0,0 +1,11 @@
+#filter substitution
+/* -*- Mode: Java; c-basic-offset: 4; tab-width: 20; indent-tabs-mode: nil; -*-
+ * 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/. */
+
+package org.mozilla.gecko;
+
+public class TestConstants {
+    public static final String ANDROID_PACKAGE_NAME = "@ANDROID_PACKAGE_NAME@";
+}
diff --git a/mobile/android/base/tests/testAboutPage.java.in b/mobile/android/base/tests/testAboutPage.java
similarity index 95%
rename from mobile/android/base/tests/testAboutPage.java.in
rename to mobile/android/base/tests/testAboutPage.java
index d81e2caad206..ad0b4f46a87f 100644
--- a/mobile/android/base/tests/testAboutPage.java.in
+++ b/mobile/android/base/tests/testAboutPage.java
@@ -1,7 +1,6 @@
-#filter substitution
-package @ANDROID_PACKAGE_NAME@.tests;
+package org.mozilla.gecko.tests;
 
-import @ANDROID_PACKAGE_NAME@.*;
+import org.mozilla.gecko.*;
 
 /* Tests related to the about: page:
  *  - check that about: loads from the URL bar
diff --git a/mobile/android/base/tests/testAddSearchEngine.java.in b/mobile/android/base/tests/testAddSearchEngine.java
similarity index 98%
rename from mobile/android/base/tests/testAddSearchEngine.java.in
rename to mobile/android/base/tests/testAddSearchEngine.java
index abde84744f0f..13a3a0f64ff9 100644
--- a/mobile/android/base/tests/testAddSearchEngine.java.in
+++ b/mobile/android/base/tests/testAddSearchEngine.java
@@ -1,7 +1,6 @@
-#filter substitution
-package @ANDROID_PACKAGE_NAME@.tests;
+package org.mozilla.gecko.tests;
 
-import @ANDROID_PACKAGE_NAME@.*;
+import org.mozilla.gecko.*;
 import android.view.View;
 import android.widget.ListAdapter;
 import android.widget.ListView;
diff --git a/mobile/android/base/tests/testAddonManager.java.in b/mobile/android/base/tests/testAddonManager.java
similarity index 97%
rename from mobile/android/base/tests/testAddonManager.java.in
rename to mobile/android/base/tests/testAddonManager.java
index a932b3c394a0..b25e7d2f38b3 100644
--- a/mobile/android/base/tests/testAddonManager.java.in
+++ b/mobile/android/base/tests/testAddonManager.java
@@ -1,7 +1,6 @@
-#filter substitution
-package @ANDROID_PACKAGE_NAME@.tests;
+package org.mozilla.gecko.tests;
 
-import @ANDROID_PACKAGE_NAME@.*;
+import org.mozilla.gecko.*;
 import android.util.DisplayMetrics;
 
 import org.json.JSONArray;
diff --git a/mobile/android/base/tests/testAwesomebar.java.in b/mobile/android/base/tests/testAwesomebar.java
similarity index 93%
rename from mobile/android/base/tests/testAwesomebar.java.in
rename to mobile/android/base/tests/testAwesomebar.java
index 02f4d243ada5..d86ac17c0786 100644
--- a/mobile/android/base/tests/testAwesomebar.java.in
+++ b/mobile/android/base/tests/testAwesomebar.java
@@ -1,5 +1,4 @@
-#filter substitution
-package @ANDROID_PACKAGE_NAME@.tests;
+package org.mozilla.gecko.tests;
 
 public class testAwesomebar extends BaseTest {
     @Override
diff --git a/mobile/android/base/tests/testAwesomebarSwipes.java.in b/mobile/android/base/tests/testAwesomebarSwipes.java
similarity index 95%
rename from mobile/android/base/tests/testAwesomebarSwipes.java.in
rename to mobile/android/base/tests/testAwesomebarSwipes.java
index 08b5a48db5fd..85ac8552574c 100644
--- a/mobile/android/base/tests/testAwesomebarSwipes.java.in
+++ b/mobile/android/base/tests/testAwesomebarSwipes.java
@@ -1,5 +1,4 @@
-#filter substitution
-package @ANDROID_PACKAGE_NAME@.tests;
+package org.mozilla.gecko.tests;
 
 import com.jayway.android.robotium.solo.Solo;
 
@@ -7,7 +6,7 @@ import android.widget.ListView;
 import android.widget.TabWidget;
 import android.support.v4.view.ViewPager;
 
-import @ANDROID_PACKAGE_NAME@.*;
+import org.mozilla.gecko.*;
 
 /* Tests swiping between tabs on the awesome bar and other basic
    awesome bar tab selections.
diff --git a/mobile/android/base/tests/testAxisLocking.java.in b/mobile/android/base/tests/testAxisLocking.java
similarity index 95%
rename from mobile/android/base/tests/testAxisLocking.java.in
rename to mobile/android/base/tests/testAxisLocking.java
index 1b659c0ffde8..5c68cf867699 100644
--- a/mobile/android/base/tests/testAxisLocking.java.in
+++ b/mobile/android/base/tests/testAxisLocking.java
@@ -1,7 +1,6 @@
-#filter substitution
-package @ANDROID_PACKAGE_NAME@.tests;
+package org.mozilla.gecko.tests;
 
-import @ANDROID_PACKAGE_NAME@.*;
+import org.mozilla.gecko.*;
 
 /**
  * Basic test for axis locking behaviour.
diff --git a/mobile/android/base/tests/testBookmark.java.in b/mobile/android/base/tests/testBookmark.java
similarity index 96%
rename from mobile/android/base/tests/testBookmark.java.in
rename to mobile/android/base/tests/testBookmark.java
index b4f118e287f2..2ce300d79212 100644
--- a/mobile/android/base/tests/testBookmark.java.in
+++ b/mobile/android/base/tests/testBookmark.java
@@ -1,7 +1,6 @@
-#filter substitution
-package @ANDROID_PACKAGE_NAME@.tests;
+package org.mozilla.gecko.tests;
 
-import @ANDROID_PACKAGE_NAME@.*;
+import org.mozilla.gecko.*;
 
 import android.view.View;
 import android.widget.ListView;
diff --git a/mobile/android/base/tests/testBookmarkFolders.java.in b/mobile/android/base/tests/testBookmarkFolders.java
similarity index 98%
rename from mobile/android/base/tests/testBookmarkFolders.java.in
rename to mobile/android/base/tests/testBookmarkFolders.java
index 3c54acbf8e9b..2c267c491aad 100644
--- a/mobile/android/base/tests/testBookmarkFolders.java.in
+++ b/mobile/android/base/tests/testBookmarkFolders.java
@@ -1,7 +1,6 @@
-#filter substitution
-package @ANDROID_PACKAGE_NAME@.tests;
+package org.mozilla.gecko.tests;
 
-import @ANDROID_PACKAGE_NAME@.*;
+import org.mozilla.gecko.*;
 
 import com.jayway.android.robotium.solo.Condition;
 
diff --git a/mobile/android/base/tests/testBookmarkKeyword.java.in b/mobile/android/base/tests/testBookmarkKeyword.java
similarity index 91%
rename from mobile/android/base/tests/testBookmarkKeyword.java.in
rename to mobile/android/base/tests/testBookmarkKeyword.java
index 7a445d4d9c49..e93166f086c1 100644
--- a/mobile/android/base/tests/testBookmarkKeyword.java.in
+++ b/mobile/android/base/tests/testBookmarkKeyword.java
@@ -1,7 +1,6 @@
-#filter substitution
-package @ANDROID_PACKAGE_NAME@.tests;
+package org.mozilla.gecko.tests;
 
-import @ANDROID_PACKAGE_NAME@.*;
+import org.mozilla.gecko.*;
 
 public class testBookmarkKeyword extends AboutHomeTest {
 
diff --git a/mobile/android/base/tests/testBookmarklets.java.in b/mobile/android/base/tests/testBookmarklets.java
similarity index 96%
rename from mobile/android/base/tests/testBookmarklets.java.in
rename to mobile/android/base/tests/testBookmarklets.java
index dce297340690..07668dce00a3 100644
--- a/mobile/android/base/tests/testBookmarklets.java.in
+++ b/mobile/android/base/tests/testBookmarklets.java
@@ -1,7 +1,6 @@
-#filter substitution
-package @ANDROID_PACKAGE_NAME@.tests;
+package org.mozilla.gecko.tests;
 
-import @ANDROID_PACKAGE_NAME@.*;
+import org.mozilla.gecko.*;
 import android.database.Cursor;
 
 import android.widget.ListView;
diff --git a/mobile/android/base/tests/testBookmarksPage.java.in b/mobile/android/base/tests/testBookmarksPage.java
similarity index 97%
rename from mobile/android/base/tests/testBookmarksPage.java.in
rename to mobile/android/base/tests/testBookmarksPage.java
index c4895f23e07d..1026a8d81303 100644
--- a/mobile/android/base/tests/testBookmarksPage.java.in
+++ b/mobile/android/base/tests/testBookmarksPage.java
@@ -1,7 +1,6 @@
-#filter substitution
-package @ANDROID_PACKAGE_NAME@.tests;
+package org.mozilla.gecko.tests;
 
-import @ANDROID_PACKAGE_NAME@.*;
+import org.mozilla.gecko.*;
 
 public class testBookmarksPage extends AboutHomeTest {
 
diff --git a/mobile/android/base/tests/testBrowserProvider.java.in b/mobile/android/base/tests/testBrowserProvider.java
similarity index 99%
rename from mobile/android/base/tests/testBrowserProvider.java.in
rename to mobile/android/base/tests/testBrowserProvider.java
index 536728a6dffe..235d9b3ed011 100644
--- a/mobile/android/base/tests/testBrowserProvider.java.in
+++ b/mobile/android/base/tests/testBrowserProvider.java
@@ -1,5 +1,4 @@
-#filter substitution
-package @ANDROID_PACKAGE_NAME@.tests;
+package org.mozilla.gecko.tests;
 
 import android.content.ContentValues;
 import android.content.ContentUris;
diff --git a/mobile/android/base/tests/testBrowserProviderPerf.java.in b/mobile/android/base/tests/testBrowserProviderPerf.java
similarity index 99%
rename from mobile/android/base/tests/testBrowserProviderPerf.java.in
rename to mobile/android/base/tests/testBrowserProviderPerf.java
index a69ad3756be9..04c255e0e4a9 100644
--- a/mobile/android/base/tests/testBrowserProviderPerf.java.in
+++ b/mobile/android/base/tests/testBrowserProviderPerf.java
@@ -1,5 +1,4 @@
-#filter substitution
-package @ANDROID_PACKAGE_NAME@.tests;
+package org.mozilla.gecko.tests;
 
 import android.content.ContentResolver;
 import android.content.ContentValues;
diff --git a/mobile/android/base/tests/testBrowserSearchVisibility.java.in b/mobile/android/base/tests/testBrowserSearchVisibility.java
similarity index 96%
rename from mobile/android/base/tests/testBrowserSearchVisibility.java.in
rename to mobile/android/base/tests/testBrowserSearchVisibility.java
index 7f3a400ad6e6..4b158d5c40d3 100644
--- a/mobile/android/base/tests/testBrowserSearchVisibility.java.in
+++ b/mobile/android/base/tests/testBrowserSearchVisibility.java
@@ -1,7 +1,6 @@
-#filter substitution
-package @ANDROID_PACKAGE_NAME@.tests;
+package org.mozilla.gecko.tests;
 
-import @ANDROID_PACKAGE_NAME@.*;
+import org.mozilla.gecko.*;
 import android.app.Activity;
 import android.content.Context;
 import android.support.v4.app.Fragment;
diff --git a/mobile/android/base/tests/testCheck.java.in b/mobile/android/base/tests/testCheck.java
similarity index 96%
rename from mobile/android/base/tests/testCheck.java.in
rename to mobile/android/base/tests/testCheck.java
index 77dea2c09be8..524f1192f603 100644
--- a/mobile/android/base/tests/testCheck.java.in
+++ b/mobile/android/base/tests/testCheck.java
@@ -1,5 +1,4 @@
-#filter substitution
-package @ANDROID_PACKAGE_NAME@.tests;
+package org.mozilla.gecko.tests;
 
 public class testCheck extends PixelTest {
     private void pause(int length) {
diff --git a/mobile/android/base/tests/testCheck2.java.in b/mobile/android/base/tests/testCheck2.java
similarity index 97%
rename from mobile/android/base/tests/testCheck2.java.in
rename to mobile/android/base/tests/testCheck2.java
index 5b0eaf9e0ab1..1d728f9b592b 100644
--- a/mobile/android/base/tests/testCheck2.java.in
+++ b/mobile/android/base/tests/testCheck2.java
@@ -1,5 +1,4 @@
-#filter substitution
-package @ANDROID_PACKAGE_NAME@.tests;
+package org.mozilla.gecko.tests;
 
 public class testCheck2 extends PixelTest {
     @Override
diff --git a/mobile/android/base/tests/testClearPrivateData.java.in b/mobile/android/base/tests/testClearPrivateData.java
similarity index 94%
rename from mobile/android/base/tests/testClearPrivateData.java.in
rename to mobile/android/base/tests/testClearPrivateData.java
index 70f205ad0e8c..573db9c05e52 100644
--- a/mobile/android/base/tests/testClearPrivateData.java.in
+++ b/mobile/android/base/tests/testClearPrivateData.java
@@ -1,7 +1,6 @@
-#filter substitution
-package @ANDROID_PACKAGE_NAME@.tests;
+package org.mozilla.gecko.tests;
 
-import @ANDROID_PACKAGE_NAME@.*;
+import org.mozilla.gecko.*;
 import java.util.ArrayList;
 
 public class testClearPrivateData extends PixelTest {
diff --git a/mobile/android/base/tests/testDeviceSearchEngine.java.in b/mobile/android/base/tests/testDeviceSearchEngine.java
similarity index 62%
rename from mobile/android/base/tests/testDeviceSearchEngine.java.in
rename to mobile/android/base/tests/testDeviceSearchEngine.java
index 240cfad2b395..7f3d8ebb22b7 100644
--- a/mobile/android/base/tests/testDeviceSearchEngine.java.in
+++ b/mobile/android/base/tests/testDeviceSearchEngine.java
@@ -1,7 +1,6 @@
-#filter substitution
-package @ANDROID_PACKAGE_NAME@.tests;
+package org.mozilla.gecko.tests;
 
-import @ANDROID_PACKAGE_NAME@.*;
+import org.mozilla.gecko.*;
 
 
 public class testDeviceSearchEngine extends JavascriptTest {
diff --git a/mobile/android/base/tests/testDistribution.java.in b/mobile/android/base/tests/testDistribution.java
similarity index 99%
rename from mobile/android/base/tests/testDistribution.java.in
rename to mobile/android/base/tests/testDistribution.java
index 1d5d6c525b05..b2b56c8cdff0 100644
--- a/mobile/android/base/tests/testDistribution.java.in
+++ b/mobile/android/base/tests/testDistribution.java
@@ -1,7 +1,6 @@
-#filter substitution
-package @ANDROID_PACKAGE_NAME@.tests;
+package org.mozilla.gecko.tests;
 
-import @ANDROID_PACKAGE_NAME@.*;
+import org.mozilla.gecko.*;
 
 import android.app.Activity;
 import android.content.Context;
diff --git a/mobile/android/base/tests/testDoorHanger.java.in b/mobile/android/base/tests/testDoorHanger.java
similarity index 98%
rename from mobile/android/base/tests/testDoorHanger.java.in
rename to mobile/android/base/tests/testDoorHanger.java
index 516351e00d3b..507e5600eddd 100644
--- a/mobile/android/base/tests/testDoorHanger.java.in
+++ b/mobile/android/base/tests/testDoorHanger.java
@@ -1,7 +1,6 @@
-#filter substitution
-package @ANDROID_PACKAGE_NAME@.tests;
+package org.mozilla.gecko.tests;
 
-import @ANDROID_PACKAGE_NAME@.*;
+import org.mozilla.gecko.*;
 
 import android.app.Activity;
 import android.content.SharedPreferences;
diff --git a/mobile/android/base/tests/testFindInPage.java.in b/mobile/android/base/tests/testFindInPage.java
similarity index 97%
rename from mobile/android/base/tests/testFindInPage.java.in
rename to mobile/android/base/tests/testFindInPage.java
index 26e63a676bad..1c35f54d1fc1 100644
--- a/mobile/android/base/tests/testFindInPage.java.in
+++ b/mobile/android/base/tests/testFindInPage.java
@@ -1,7 +1,6 @@
-#filter substitution
-package @ANDROID_PACKAGE_NAME@.tests;
+package org.mozilla.gecko.tests;
 
-import @ANDROID_PACKAGE_NAME@.*;
+import org.mozilla.gecko.*;
 import android.app.Activity;
 import android.graphics.Color;
 
diff --git a/mobile/android/base/tests/testFlingCorrectness.java.in b/mobile/android/base/tests/testFlingCorrectness.java
similarity index 94%
rename from mobile/android/base/tests/testFlingCorrectness.java.in
rename to mobile/android/base/tests/testFlingCorrectness.java
index 3356c70f01c2..c9571cf27b12 100644
--- a/mobile/android/base/tests/testFlingCorrectness.java.in
+++ b/mobile/android/base/tests/testFlingCorrectness.java
@@ -1,7 +1,6 @@
-#filter substitution
-package @ANDROID_PACKAGE_NAME@.tests;
+package org.mozilla.gecko.tests;
 
-import @ANDROID_PACKAGE_NAME@.*;
+import org.mozilla.gecko.*;
 
 /**
  * Basic fling correctness test.
diff --git a/mobile/android/base/tests/testFormHistory.java.in b/mobile/android/base/tests/testFormHistory.java
similarity index 98%
rename from mobile/android/base/tests/testFormHistory.java.in
rename to mobile/android/base/tests/testFormHistory.java
index 541a7682ad72..576d801a29f6 100644
--- a/mobile/android/base/tests/testFormHistory.java.in
+++ b/mobile/android/base/tests/testFormHistory.java
@@ -1,5 +1,4 @@
-#filter substitution
-package @ANDROID_PACKAGE_NAME@.tests;
+package org.mozilla.gecko.tests;
 
 import android.content.ContentValues;
 import android.content.ContentResolver;
diff --git a/mobile/android/base/tests/testGetUserMedia.java.in b/mobile/android/base/tests/testGetUserMedia.java
similarity index 93%
rename from mobile/android/base/tests/testGetUserMedia.java.in
rename to mobile/android/base/tests/testGetUserMedia.java
index f605914649eb..796854f116b9 100644
--- a/mobile/android/base/tests/testGetUserMedia.java.in
+++ b/mobile/android/base/tests/testGetUserMedia.java
@@ -1,7 +1,6 @@
-#filter substitution
-package @ANDROID_PACKAGE_NAME@.tests;
+package org.mozilla.gecko.tests;
 
-import @ANDROID_PACKAGE_NAME@.*;
+import org.mozilla.gecko.*;
 
 import android.app.Activity;
 import android.hardware.Camera;
diff --git a/mobile/android/base/tests/testHistory.java.in b/mobile/android/base/tests/testHistory.java
similarity index 96%
rename from mobile/android/base/tests/testHistory.java.in
rename to mobile/android/base/tests/testHistory.java
index 5e0922184776..59cfde16bef6 100644
--- a/mobile/android/base/tests/testHistory.java.in
+++ b/mobile/android/base/tests/testHistory.java
@@ -1,7 +1,6 @@
-#filter substitution
-package @ANDROID_PACKAGE_NAME@.tests;
+package org.mozilla.gecko.tests;
 
-import @ANDROID_PACKAGE_NAME@.*;
+import org.mozilla.gecko.*;
 import android.widget.ListView;
 import android.app.Activity;
 import java.util.ArrayList;
diff --git a/mobile/android/base/tests/testHomeBanner.java.in b/mobile/android/base/tests/testHomeBanner.java
similarity index 93%
rename from mobile/android/base/tests/testHomeBanner.java.in
rename to mobile/android/base/tests/testHomeBanner.java
index 1bc94f6e1096..85dda1ac1248 100644
--- a/mobile/android/base/tests/testHomeBanner.java.in
+++ b/mobile/android/base/tests/testHomeBanner.java
@@ -1,7 +1,6 @@
-#filter substitution
-package @ANDROID_PACKAGE_NAME@.tests;
+package org.mozilla.gecko.tests;
 
-import @ANDROID_PACKAGE_NAME@.*;
+import org.mozilla.gecko.*;
 
 public class testHomeBanner extends BaseTest {
 
diff --git a/mobile/android/base/tests/testImportFromAndroid.java.in b/mobile/android/base/tests/testImportFromAndroid.java
similarity index 98%
rename from mobile/android/base/tests/testImportFromAndroid.java.in
rename to mobile/android/base/tests/testImportFromAndroid.java
index c9638c3374f9..53c294a74138 100644
--- a/mobile/android/base/tests/testImportFromAndroid.java.in
+++ b/mobile/android/base/tests/testImportFromAndroid.java
@@ -1,7 +1,6 @@
-#filter substitution
-package @ANDROID_PACKAGE_NAME@.tests;
+package org.mozilla.gecko.tests;
 
-import @ANDROID_PACKAGE_NAME@.*;
+import org.mozilla.gecko.*;
 import android.app.Activity;
 import android.provider.Browser;
 import android.content.ContentValues;
@@ -117,7 +116,7 @@ public class testImportFromAndroid extends AboutHomeTest {
 
         // Add a few history items in Firefox Mobile
         ContentResolver resolver = getActivity().getContentResolver();
-        Uri uri = Uri.parse("content://@ANDROID_PACKAGE_NAME@.db.browser/history");
+        Uri uri = Uri.parse("content://" + TestConstants.ANDROID_PACKAGE_NAME + ".db.browser/history");
         uri = uri.buildUpon().appendQueryParameter("profile", "default")
                              .appendQueryParameter("sync", "true").build();
         for (String url:androidData) {
diff --git a/mobile/android/base/tests/testInputUrlBar.java.in b/mobile/android/base/tests/testInputUrlBar.java
similarity index 97%
rename from mobile/android/base/tests/testInputUrlBar.java.in
rename to mobile/android/base/tests/testInputUrlBar.java
index 9dffecd6e7eb..ee1da7f8e87b 100644
--- a/mobile/android/base/tests/testInputUrlBar.java.in
+++ b/mobile/android/base/tests/testInputUrlBar.java
@@ -1,7 +1,6 @@
-#filter substitution
-package @ANDROID_PACKAGE_NAME@.tests;
+package org.mozilla.gecko.tests;
 
-import @ANDROID_PACKAGE_NAME@.*;
+import org.mozilla.gecko.*;
 
 import android.app.Activity;
 import android.view.View;
diff --git a/mobile/android/base/tests/testJNI.java.in b/mobile/android/base/tests/testJNI.java
similarity index 54%
rename from mobile/android/base/tests/testJNI.java.in
rename to mobile/android/base/tests/testJNI.java
index 08612b949256..72482a6011a2 100644
--- a/mobile/android/base/tests/testJNI.java.in
+++ b/mobile/android/base/tests/testJNI.java
@@ -1,7 +1,6 @@
-#filter substitution
-package @ANDROID_PACKAGE_NAME@.tests;
+package org.mozilla.gecko.tests;
 
-import @ANDROID_PACKAGE_NAME@.*;
+import org.mozilla.gecko.*;
 
 
 public class testJNI extends JavascriptTest {
diff --git a/mobile/android/base/tests/testJarReader.java.in b/mobile/android/base/tests/testJarReader.java
similarity index 98%
rename from mobile/android/base/tests/testJarReader.java.in
rename to mobile/android/base/tests/testJarReader.java
index 70406f1cb98c..d74ca8d67ba8 100644
--- a/mobile/android/base/tests/testJarReader.java.in
+++ b/mobile/android/base/tests/testJarReader.java
@@ -1,5 +1,4 @@
-#filter substitution
-package @ANDROID_PACKAGE_NAME@.tests;
+package org.mozilla.gecko.tests;
 
 import java.lang.ClassLoader;
 import java.io.InputStream;
diff --git a/mobile/android/base/tests/testLinkContextMenu.java.in b/mobile/android/base/tests/testLinkContextMenu.java
similarity index 94%
rename from mobile/android/base/tests/testLinkContextMenu.java.in
rename to mobile/android/base/tests/testLinkContextMenu.java
index efd438e9225f..3c091fd85071 100644
--- a/mobile/android/base/tests/testLinkContextMenu.java.in
+++ b/mobile/android/base/tests/testLinkContextMenu.java
@@ -1,7 +1,6 @@
-#filter substitution
-package @ANDROID_PACKAGE_NAME@.tests;
+package org.mozilla.gecko.tests;
 
-import @ANDROID_PACKAGE_NAME@.*;
+import org.mozilla.gecko.*;
 
 public class testLinkContextMenu extends ContentContextMenuTest {
 
diff --git a/mobile/android/base/tests/testLoad.java.in b/mobile/android/base/tests/testLoad.java
similarity index 88%
rename from mobile/android/base/tests/testLoad.java.in
rename to mobile/android/base/tests/testLoad.java
index ca4517b05bef..5b5e05f30703 100644
--- a/mobile/android/base/tests/testLoad.java.in
+++ b/mobile/android/base/tests/testLoad.java
@@ -1,5 +1,4 @@
-#filter substitution
-package @ANDROID_PACKAGE_NAME@.tests;
+package org.mozilla.gecko.tests;
 
 /**
  * A basic page load test.
diff --git a/mobile/android/base/tests/testMailToContextMenu.java.in b/mobile/android/base/tests/testMailToContextMenu.java
similarity index 90%
rename from mobile/android/base/tests/testMailToContextMenu.java.in
rename to mobile/android/base/tests/testMailToContextMenu.java
index 7d06a86fa9f1..b5503b270f8f 100644
--- a/mobile/android/base/tests/testMailToContextMenu.java.in
+++ b/mobile/android/base/tests/testMailToContextMenu.java
@@ -1,7 +1,6 @@
-#filter substitution
-package @ANDROID_PACKAGE_NAME@.tests;
+package org.mozilla.gecko.tests;
 
-import @ANDROID_PACKAGE_NAME@.*;
+import org.mozilla.gecko.*;
 
 public class testMailToContextMenu extends ContentContextMenuTest {
 
diff --git a/mobile/android/base/tests/testMasterPassword.java.in b/mobile/android/base/tests/testMasterPassword.java
similarity index 99%
rename from mobile/android/base/tests/testMasterPassword.java.in
rename to mobile/android/base/tests/testMasterPassword.java
index 60dbf77b0597..21aca4ad09a2 100644
--- a/mobile/android/base/tests/testMasterPassword.java.in
+++ b/mobile/android/base/tests/testMasterPassword.java
@@ -1,7 +1,6 @@
-#filter substitution
-package @ANDROID_PACKAGE_NAME@.tests;
+package org.mozilla.gecko.tests;
 
-import @ANDROID_PACKAGE_NAME@.*;
+import org.mozilla.gecko.*;
 
 /* This patch tests the Master Password feature first by enabling the password,
 then testing it on a login page and finally disabling the password */
diff --git a/mobile/android/base/tests/testNewTab.java.in b/mobile/android/base/tests/testNewTab.java
similarity index 97%
rename from mobile/android/base/tests/testNewTab.java.in
rename to mobile/android/base/tests/testNewTab.java
index 9f05e3d0487a..c9ef30eee622 100644
--- a/mobile/android/base/tests/testNewTab.java.in
+++ b/mobile/android/base/tests/testNewTab.java
@@ -1,7 +1,6 @@
-#filter substitution
-package @ANDROID_PACKAGE_NAME@.tests;
+package org.mozilla.gecko.tests;
 
-import @ANDROID_PACKAGE_NAME@.*;
+import org.mozilla.gecko.*;
 import android.app.Activity;
 import android.view.View;
 
diff --git a/mobile/android/base/tests/testOrderedBroadcast.java.in b/mobile/android/base/tests/testOrderedBroadcast.java
similarity index 95%
rename from mobile/android/base/tests/testOrderedBroadcast.java.in
rename to mobile/android/base/tests/testOrderedBroadcast.java
index b2f7626f69b0..cd52bd8c94bc 100644
--- a/mobile/android/base/tests/testOrderedBroadcast.java.in
+++ b/mobile/android/base/tests/testOrderedBroadcast.java
@@ -1,7 +1,6 @@
-#filter substitution
-package @ANDROID_PACKAGE_NAME@.tests;
+package org.mozilla.gecko.tests;
 
-import @ANDROID_PACKAGE_NAME@.*;
+import org.mozilla.gecko.*;
 
 import org.json.JSONArray;
 import org.json.JSONException;
diff --git a/mobile/android/base/tests/testOverscroll.java.in b/mobile/android/base/tests/testOverscroll.java
similarity index 95%
rename from mobile/android/base/tests/testOverscroll.java.in
rename to mobile/android/base/tests/testOverscroll.java
index 680a0ff387e7..b52ddc841ec5 100644
--- a/mobile/android/base/tests/testOverscroll.java.in
+++ b/mobile/android/base/tests/testOverscroll.java
@@ -1,7 +1,6 @@
-#filter substitution
-package @ANDROID_PACKAGE_NAME@.tests;
+package org.mozilla.gecko.tests;
 
-import @ANDROID_PACKAGE_NAME@.*;
+import org.mozilla.gecko.*;
 
 /**
  * Basic test to check bounce-back from overscroll.
diff --git a/mobile/android/base/tests/testPan.java.in b/mobile/android/base/tests/testPan.java
similarity index 96%
rename from mobile/android/base/tests/testPan.java.in
rename to mobile/android/base/tests/testPan.java
index 54d014c1b327..56ef427be3ad 100644
--- a/mobile/android/base/tests/testPan.java.in
+++ b/mobile/android/base/tests/testPan.java
@@ -1,5 +1,4 @@
-#filter substitution
-package @ANDROID_PACKAGE_NAME@.tests;
+package org.mozilla.gecko.tests;
 
 /**
  * A panning performance test.
diff --git a/mobile/android/base/tests/testPanCorrectness.java.in b/mobile/android/base/tests/testPanCorrectness.java
similarity index 93%
rename from mobile/android/base/tests/testPanCorrectness.java.in
rename to mobile/android/base/tests/testPanCorrectness.java
index c151d194e3c0..ad292835b01a 100644
--- a/mobile/android/base/tests/testPanCorrectness.java.in
+++ b/mobile/android/base/tests/testPanCorrectness.java
@@ -1,7 +1,6 @@
-#filter substitution
-package @ANDROID_PACKAGE_NAME@.tests;
+package org.mozilla.gecko.tests;
 
-import @ANDROID_PACKAGE_NAME@.*;
+import org.mozilla.gecko.*;
 
 /**
  * A basic panning correctness test.
diff --git a/mobile/android/base/tests/testPasswordEncrypt.java.in b/mobile/android/base/tests/testPasswordEncrypt.java
similarity index 98%
rename from mobile/android/base/tests/testPasswordEncrypt.java.in
rename to mobile/android/base/tests/testPasswordEncrypt.java
index aa408283b982..7650c84756ff 100644
--- a/mobile/android/base/tests/testPasswordEncrypt.java.in
+++ b/mobile/android/base/tests/testPasswordEncrypt.java
@@ -1,7 +1,6 @@
-#filter substitution
-package @ANDROID_PACKAGE_NAME@.tests;
+package org.mozilla.gecko.tests;
 
-import @ANDROID_PACKAGE_NAME@.*;
+import org.mozilla.gecko.*;
 import android.content.ContentValues;
 import android.content.ContentResolver;
 import android.database.Cursor;
diff --git a/mobile/android/base/tests/testPasswordProvider.java.in b/mobile/android/base/tests/testPasswordProvider.java
similarity index 98%
rename from mobile/android/base/tests/testPasswordProvider.java.in
rename to mobile/android/base/tests/testPasswordProvider.java
index 429bfc3f0086..8129014e67ea 100644
--- a/mobile/android/base/tests/testPasswordProvider.java.in
+++ b/mobile/android/base/tests/testPasswordProvider.java
@@ -1,5 +1,4 @@
-#filter substitution
-package @ANDROID_PACKAGE_NAME@.tests;
+package org.mozilla.gecko.tests;
 
 import android.content.ContentValues;
 import android.content.ContentResolver;
diff --git a/mobile/android/base/tests/testPermissions.java.in b/mobile/android/base/tests/testPermissions.java
similarity index 96%
rename from mobile/android/base/tests/testPermissions.java.in
rename to mobile/android/base/tests/testPermissions.java
index e2bf51b45a26..db1734cfeb6f 100644
--- a/mobile/android/base/tests/testPermissions.java.in
+++ b/mobile/android/base/tests/testPermissions.java
@@ -1,7 +1,6 @@
-#filter substitution
-package @ANDROID_PACKAGE_NAME@.tests;
+package org.mozilla.gecko.tests;
 
-import @ANDROID_PACKAGE_NAME@.*;
+import org.mozilla.gecko.*;
 
 import android.widget.CheckBox;
 import java.util.ArrayList;
diff --git a/mobile/android/base/tests/testPictureLinkContextMenu.java.in b/mobile/android/base/tests/testPictureLinkContextMenu.java
similarity index 95%
rename from mobile/android/base/tests/testPictureLinkContextMenu.java.in
rename to mobile/android/base/tests/testPictureLinkContextMenu.java
index 2c328df5ef94..396fac1615e7 100644
--- a/mobile/android/base/tests/testPictureLinkContextMenu.java.in
+++ b/mobile/android/base/tests/testPictureLinkContextMenu.java
@@ -1,7 +1,6 @@
-#filter substitution
-package @ANDROID_PACKAGE_NAME@.tests;
+package org.mozilla.gecko.tests;
 
-import @ANDROID_PACKAGE_NAME@.*;
+import org.mozilla.gecko.*;
 
 public class testPictureLinkContextMenu extends ContentContextMenuTest {
 
diff --git a/mobile/android/base/tests/testPrefsObserver.java.in b/mobile/android/base/tests/testPrefsObserver.java
similarity index 97%
rename from mobile/android/base/tests/testPrefsObserver.java.in
rename to mobile/android/base/tests/testPrefsObserver.java
index 8b34bf653348..94251be730b3 100644
--- a/mobile/android/base/tests/testPrefsObserver.java.in
+++ b/mobile/android/base/tests/testPrefsObserver.java
@@ -1,7 +1,6 @@
-#filter substitution
-package @ANDROID_PACKAGE_NAME@.tests;
+package org.mozilla.gecko.tests;
 
-import @ANDROID_PACKAGE_NAME@.*;
+import org.mozilla.gecko.*;
 import android.app.Instrumentation;
 
 import org.json.JSONArray;
diff --git a/mobile/android/base/tests/testPrivateBrowsing.java.in b/mobile/android/base/tests/testPrivateBrowsing.java
similarity index 97%
rename from mobile/android/base/tests/testPrivateBrowsing.java.in
rename to mobile/android/base/tests/testPrivateBrowsing.java
index ad73c942fd75..9ec281e87092 100644
--- a/mobile/android/base/tests/testPrivateBrowsing.java.in
+++ b/mobile/android/base/tests/testPrivateBrowsing.java
@@ -1,7 +1,6 @@
-#filter substitution
-package @ANDROID_PACKAGE_NAME@.tests;
+package org.mozilla.gecko.tests;
 
-import @ANDROID_PACKAGE_NAME@.*;
+import org.mozilla.gecko.*;
 
 import java.util.ArrayList;
 
diff --git a/mobile/android/base/tests/testPromptGridInput.java.in b/mobile/android/base/tests/testPromptGridInput.java
similarity index 94%
rename from mobile/android/base/tests/testPromptGridInput.java.in
rename to mobile/android/base/tests/testPromptGridInput.java
index da597401e948..dcbba1ba0fdf 100644
--- a/mobile/android/base/tests/testPromptGridInput.java.in
+++ b/mobile/android/base/tests/testPromptGridInput.java
@@ -1,7 +1,6 @@
-#filter substitution
-package @ANDROID_PACKAGE_NAME@.tests;
+package org.mozilla.gecko.tests;
 
-import @ANDROID_PACKAGE_NAME@.*;
+import org.mozilla.gecko.*;
 
 import android.graphics.drawable.Drawable;
 import android.widget.EditText;
diff --git a/mobile/android/base/tests/testReaderMode.java.in b/mobile/android/base/tests/testReaderMode.java
similarity index 99%
rename from mobile/android/base/tests/testReaderMode.java.in
rename to mobile/android/base/tests/testReaderMode.java
index 7ad858c47e81..137901bbada0 100644
--- a/mobile/android/base/tests/testReaderMode.java.in
+++ b/mobile/android/base/tests/testReaderMode.java
@@ -1,7 +1,6 @@
-#filter substitution
-package @ANDROID_PACKAGE_NAME@.tests;
+package org.mozilla.gecko.tests;
 
-import @ANDROID_PACKAGE_NAME@.*;
+import org.mozilla.gecko.*;
 import com.jayway.android.robotium.solo.Condition;
 import com.jayway.android.robotium.solo.Solo;
 import android.graphics.Rect;
diff --git a/mobile/android/base/tests/testSearchSuggestions.java.in b/mobile/android/base/tests/testSearchSuggestions.java
similarity index 98%
rename from mobile/android/base/tests/testSearchSuggestions.java.in
rename to mobile/android/base/tests/testSearchSuggestions.java
index 796b56502ae2..e973100dfd37 100644
--- a/mobile/android/base/tests/testSearchSuggestions.java.in
+++ b/mobile/android/base/tests/testSearchSuggestions.java
@@ -1,7 +1,6 @@
-#filter substitution
-package @ANDROID_PACKAGE_NAME@.tests;
+package org.mozilla.gecko.tests;
 
-import @ANDROID_PACKAGE_NAME@.*;
+import org.mozilla.gecko.*;
 import android.app.Activity;
 import android.content.Context;
 import android.support.v4.app.Fragment;
diff --git a/mobile/android/base/tests/testSettingsMenuItems.java.in b/mobile/android/base/tests/testSettingsMenuItems.java
similarity index 99%
rename from mobile/android/base/tests/testSettingsMenuItems.java.in
rename to mobile/android/base/tests/testSettingsMenuItems.java
index 5e6105049257..0719b20df606 100644
--- a/mobile/android/base/tests/testSettingsMenuItems.java.in
+++ b/mobile/android/base/tests/testSettingsMenuItems.java
@@ -1,7 +1,6 @@
-#filter substitution
-package @ANDROID_PACKAGE_NAME@.tests;
+package org.mozilla.gecko.tests;
 
-import @ANDROID_PACKAGE_NAME@.*;
+import org.mozilla.gecko.*;
 
 import java.lang.reflect.Field;
 import java.util.Arrays;
diff --git a/mobile/android/base/tests/testShareLink.java.in b/mobile/android/base/tests/testShareLink.java
similarity index 98%
rename from mobile/android/base/tests/testShareLink.java.in
rename to mobile/android/base/tests/testShareLink.java
index 2534bc604664..e13ce7d8f5cc 100644
--- a/mobile/android/base/tests/testShareLink.java.in
+++ b/mobile/android/base/tests/testShareLink.java
@@ -1,8 +1,9 @@
-#filter substitution
-package @ANDROID_PACKAGE_NAME@.tests;
+package org.mozilla.gecko.tests;
+
+import org.mozilla.gecko.*;
 
 import com.jayway.android.robotium.solo.Condition;
-import @ANDROID_PACKAGE_NAME@.*;
+
 import android.app.Activity;
 import android.content.Intent;
 import android.content.pm.PackageManager;
diff --git a/mobile/android/base/tests/testSharedPreferences.java.in b/mobile/android/base/tests/testSharedPreferences.java
similarity index 62%
rename from mobile/android/base/tests/testSharedPreferences.java.in
rename to mobile/android/base/tests/testSharedPreferences.java
index 7b5ea832d77c..6103603e7fb4 100644
--- a/mobile/android/base/tests/testSharedPreferences.java.in
+++ b/mobile/android/base/tests/testSharedPreferences.java
@@ -1,7 +1,6 @@
-#filter substitution
-package @ANDROID_PACKAGE_NAME@.tests;
+package org.mozilla.gecko.tests;
 
-import @ANDROID_PACKAGE_NAME@.*;
+import org.mozilla.gecko.*;
 
 
 public class testSharedPreferences extends JavascriptTest {
diff --git a/mobile/android/base/tests/testSystemPages.java.in b/mobile/android/base/tests/testSystemPages.java
similarity index 97%
rename from mobile/android/base/tests/testSystemPages.java.in
rename to mobile/android/base/tests/testSystemPages.java
index b48b47a67eb1..4e0d0f23bb21 100644
--- a/mobile/android/base/tests/testSystemPages.java.in
+++ b/mobile/android/base/tests/testSystemPages.java
@@ -1,7 +1,6 @@
-#filter substitution
-package @ANDROID_PACKAGE_NAME@.tests;
+package org.mozilla.gecko.tests;
 
-import @ANDROID_PACKAGE_NAME@.*;
+import org.mozilla.gecko.*;
 
 /** This patch tests the System Pages first by loading system pages from
  *  the awesome bar and then from Firefox menu 
diff --git a/mobile/android/base/tests/testTabHistory.java.in b/mobile/android/base/tests/testTabHistory.java
similarity index 97%
rename from mobile/android/base/tests/testTabHistory.java.in
rename to mobile/android/base/tests/testTabHistory.java
index 20ef6526fd93..ed8b88b3e769 100644
--- a/mobile/android/base/tests/testTabHistory.java.in
+++ b/mobile/android/base/tests/testTabHistory.java
@@ -1,5 +1,4 @@
-#filter substitution
-package @ANDROID_PACKAGE_NAME@.tests;
+package org.mozilla.gecko.tests;
 
 public class testTabHistory extends BaseTest {
 
diff --git a/mobile/android/base/tests/testThumbnails.java.in b/mobile/android/base/tests/testThumbnails.java
similarity index 99%
rename from mobile/android/base/tests/testThumbnails.java.in
rename to mobile/android/base/tests/testThumbnails.java
index db1bd32f6982..0a4968ae31c3 100644
--- a/mobile/android/base/tests/testThumbnails.java.in
+++ b/mobile/android/base/tests/testThumbnails.java
@@ -1,5 +1,4 @@
-#filter substitution
-package @ANDROID_PACKAGE_NAME@.tests;
+package org.mozilla.gecko.tests;
 
 import android.content.ContentResolver;
 import android.graphics.Bitmap;
diff --git a/mobile/android/base/tests/testVkbOverlap.java.in b/mobile/android/base/tests/testVkbOverlap.java
similarity index 98%
rename from mobile/android/base/tests/testVkbOverlap.java.in
rename to mobile/android/base/tests/testVkbOverlap.java
index 8555def5ffa1..0ce9a51b6814 100644
--- a/mobile/android/base/tests/testVkbOverlap.java.in
+++ b/mobile/android/base/tests/testVkbOverlap.java
@@ -1,7 +1,6 @@
-#filter substitution
-package @ANDROID_PACKAGE_NAME@.tests;
+package org.mozilla.gecko.tests;
 
-import @ANDROID_PACKAGE_NAME@.*;
+import org.mozilla.gecko.*;
 import android.net.Uri;
 
 /**
diff --git a/mobile/android/base/tests/test_bug720538.java.in b/mobile/android/base/tests/test_bug720538.java
similarity index 97%
rename from mobile/android/base/tests/test_bug720538.java.in
rename to mobile/android/base/tests/test_bug720538.java
index 436c3d752e98..96a59e5109b3 100644
--- a/mobile/android/base/tests/test_bug720538.java.in
+++ b/mobile/android/base/tests/test_bug720538.java
@@ -1,7 +1,6 @@
-#filter substitution
-package @ANDROID_PACKAGE_NAME@.tests;
+package org.mozilla.gecko.tests;
 
-import @ANDROID_PACKAGE_NAME@.*;
+import org.mozilla.gecko.*;
 
 public class test_bug720538 extends PixelTest {
     @Override
diff --git a/mobile/android/geckoview_library/AndroidManifest.xml b/mobile/android/geckoview_library/AndroidManifest.xml
index 12aed5b1bc5a..a46e277b038d 100644
--- a/mobile/android/geckoview_library/AndroidManifest.xml
+++ b/mobile/android/geckoview_library/AndroidManifest.xml
@@ -3,13 +3,8 @@
     android:versionCode="1"
     android:versionName="1.0" >
 
-    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
     <uses-permission android:name="android.permission.INTERNET"/>
-    <uses-permission android:name="android.permission.GET_ACCOUNTS"/>
-
     <uses-sdk
         android:minSdkVersion="8"
         android:targetSdkVersion="17" />
diff --git a/mobile/android/geckoview_library/Makefile.in b/mobile/android/geckoview_library/Makefile.in
index bea346740dbe..ebc4521b6bd3 100644
--- a/mobile/android/geckoview_library/Makefile.in
+++ b/mobile/android/geckoview_library/Makefile.in
@@ -9,11 +9,32 @@ GECKOVIEW_LIBRARY_FILES := \
   .project \
   AndroidManifest.xml \
   project.properties \
+  build.xml \
   $(NULL)
 
+
+PP_TARGETS = properties
+
+properties = local.properties.in
+properties_PATH = .
+properties_deps := $(patsubst %.in,%,$(properties))
+
+GARBAGE = $(GECKOVIEW_LIBRARY_FILES) $(properties_deps)
+
+GARBAGE_DIRS = \
+  bin \
+  libs \
+  src \
+  .deps \
+  gen  \
+  res \
+  $(NULL)
+
+DEFINES += -DANDROID_SDK=$(ANDROID_SDK)
+
 include $(topsrcdir)/config/rules.mk
 
-package:
+package: $(properties_deps)
 	# Make directory for the zips
 	$(MKDIR) -p $(DIST)/geckoview_library
 
diff --git a/mobile/android/geckoview_library/build.xml b/mobile/android/geckoview_library/build.xml
new file mode 100644
index 000000000000..56bbc1109b9b
--- /dev/null
+++ b/mobile/android/geckoview_library/build.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="GeckoView" default="help">
+
+    <!-- The local.properties file is created and updated by the 'android' tool.
+         It contains the path to the SDK. It should *NOT* be checked into
+         Version Control Systems. -->
+    <property file="local.properties" />
+
+    <!-- The ant.properties file can be created by you. It is only edited by the
+         'android' tool to add properties to it.
+         This is the place to change some Ant specific build properties.
+         Here are some properties you may want to change/update:
+
+         source.dir
+             The name of the source directory. Default is 'src'.
+         out.dir
+             The name of the output directory. Default is 'bin'.
+
+         For other overridable properties, look at the beginning of the rules
+         files in the SDK, at tools/ant/build.xml
+
+         Properties related to the SDK location or the project target should
+         be updated using the 'android' tool with the 'update' action.
+
+         This file is an integral part of the build system for your
+         application and should be checked into Version Control Systems.
+
+         -->
+    <!--<property file="ant.properties" />-->
+
+    <!-- if sdk.dir was not set from one of the property file, then
+         get it from the ANDROID_HOME env var.
+         This must be done before we load project.properties since
+         the proguard config can use sdk.dir -->
+    <property environment="env" />
+    <condition property="sdk.dir" value="${env.ANDROID_HOME}">
+        <isset property="env.ANDROID_HOME" />
+    </condition>
+
+    <!-- The project.properties file is created and updated by the 'android'
+         tool, as well as ADT.
+
+         This contains project specific properties such as project target, and library
+         dependencies. Lower level build properties are stored in ant.properties
+         (or in .classpath for Eclipse projects).
+
+         This file is an integral part of the build system for your
+         application and should be checked into Version Control Systems. -->
+    <loadproperties srcFile="project.properties" />
+
+    <!-- quick check on sdk.dir -->
+    <fail
+            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
+            unless="sdk.dir"
+    />
+
+    <!--
+        Import per project custom build rules if present at the root of the project.
+        This is the place to put custom intermediary targets such as:
+            -pre-build
+            -pre-compile
+            -post-compile (This is typically used for code obfuscation.
+                           Compiled code location: ${out.classes.absolute.dir}
+                           If this is not done in place, override ${out.dex.input.absolute.dir})
+            -post-package
+            -post-build
+            -pre-clean
+    -->
+    <import file="custom_rules.xml" optional="true" />
+
+    <!-- Import the actual build file.
+
+         To customize existing targets, there are two options:
+         - Customize only one target:
+             - copy/paste the target into this file, *before* the
+               <import> task.
+             - customize it to your needs.
+         - Customize the whole content of build.xml
+             - copy/paste the content of the rules files (minus the top node)
+               into this file, replacing the <import> task.
+             - customize to your needs.
+
+         ***********************
+         ****** IMPORTANT ******
+         ***********************
+         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
+         in order to avoid having your file be overridden by tools such as "android update project"
+    -->
+    <!-- version-tag: 1 -->
+    <import file="${sdk.dir}/tools/ant/build.xml" />
+
+</project>
diff --git a/mobile/android/geckoview_library/local.properties.in b/mobile/android/geckoview_library/local.properties.in
new file mode 100644
index 000000000000..383f158aca0a
--- /dev/null
+++ b/mobile/android/geckoview_library/local.properties.in
@@ -0,0 +1,11 @@
+#filter substitution
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must *NOT* be checked into Version Control Systems,
+# as it contains information specific to your local configuration.
+
+# location of the SDK. This is only used by Ant
+# For customization when using a Version Control System, please read the
+# header note.
+sdk.dir=@ANDROID_SDK@/../../
diff --git a/mobile/android/themes/core/aboutReader.css b/mobile/android/themes/core/aboutReader.css
index 39a8936cdfc5..506f2fc1b461 100644
--- a/mobile/android/themes/core/aboutReader.css
+++ b/mobile/android/themes/core/aboutReader.css
@@ -66,7 +66,7 @@ body {
 
 .header > h1 {
   font-size: 2.625em;
-  font-weight: 300;
+  font-weight: 700;
   line-height: 1.1em;
   width: 100%;
   margin: 0px;
@@ -75,10 +75,6 @@ body {
   padding: 0px;
 }
 
-.serif > .header > h1 {
-  font-weight: 700;
-}
-
 .header > .credits {
   padding: 0px;
   margin: 0px;
diff --git a/modules/libjar/nsJARInputStream.cpp b/modules/libjar/nsJARInputStream.cpp
index 7cac781f9bcb..0834a4ab6b3f 100644
--- a/modules/libjar/nsJARInputStream.cpp
+++ b/modules/libjar/nsJARInputStream.cpp
@@ -281,12 +281,8 @@ nsJARInputStream::ContinueInflate(char* aBuffer, uint32_t aCount,
         inflateEnd(&mZs);
 
         // stop returning valid data as soon as we know we have a bad CRC
-        if (mOutCrc != mInCrc) {
-            // asserting because while this rarely happens, you definitely
-            // want to catch it in debug builds!
-            NS_NOTREACHED(0);
+        if (mOutCrc != mInCrc)
             return NS_ERROR_FILE_CORRUPTED;
-        }
     }
 
     return NS_OK;
diff --git a/netwerk/dns/effective_tld_names.dat b/netwerk/dns/effective_tld_names.dat
index 0d377755f7d1..a79f30f65a52 100644
--- a/netwerk/dns/effective_tld_names.dat
+++ b/netwerk/dns/effective_tld_names.dat
@@ -349,7 +349,7 @@ z.bg
 6.bg
 7.bg
 8.bg
-9.bg	 	 	
+9.bg
 
 // bh : http://en.wikipedia.org/wiki/.bh
 bh
@@ -787,7 +787,7 @@ org.ee
 fie.ee
 
 // eg : http://en.wikipedia.org/wiki/.eg
-eg  
+eg
 com.eg
 edu.eg
 eun.eg
@@ -1003,7 +1003,7 @@ org.hk
 网絡.hk
 组织.hk
 組織.hk
-組织.hk 
+組织.hk
 
 // hm : http://en.wikipedia.org/wiki/.hm
 hm
@@ -1180,9 +1180,9 @@ int.is
 it
 gov.it
 edu.it
-// list of reserved geo-names : 
+// list of reserved geo-names :
 // http://www.nic.it/documenti/regolamenti-e-linee-guida/regolamento-assegnazione-versione-6.0.pdf
-// (There is also a list of reserved geo-names corresponding to Italian 
+// (There is also a list of reserved geo-names corresponding to Italian
 // municipalities : http://www.nic.it/documenti/appendice-c.pdf , but it is
 // not included here.)
 agrigento.it
@@ -4255,7 +4255,7 @@ bv.nl
 // no : http://www.norid.no/regelverk/index.en.html
 // The Norwegian registry has declined to notify us of updates. The web pages
 // referenced below are the official source of the data. There is also an
-// announce mailing list: 
+// announce mailing list:
 // https://postlister.uninett.no/sympa/info/norid-diskusjon
 no
 // Norid generic domains : http://www.norid.no/regelverk/vedlegg-c.en.html
@@ -6287,9 +6287,9 @@ lib.wi.us
 lib.wv.us
 lib.wy.us
 
-// k12.ma.us contains school districts in Massachusetts. The 4LDs are 
+// k12.ma.us contains school districts in Massachusetts. The 4LDs are
 //  managed indepedently except for private (PVT), charter (CHTR) and
-//  parochial (PAROCH) schools.  Those are delegated dorectly to the 
+//  parochial (PAROCH) schools.  Those are delegated dorectly to the
 //  5LD operators.   <k12-ma-hostmaster _ at _ rsuc.gweep.net>
 pvt.k12.ma.us
 chtr.k12.ma.us
@@ -6397,10 +6397,10 @@ yt
 // http://nic.ae/english/arabicdomain/rules.jsp
 امارات
 
-// xn--54b7fta0cc ("Bangla" Bangla) : BD  
+// xn--54b7fta0cc ("Bangla" Bangla) : BD
 বাংলা
 
-// xn--fiqs8s ("China" Chinese-Han-Simplified <.Zhonggou>) : CN 
+// xn--fiqs8s ("China" Chinese-Han-Simplified <.Zhonggou>) : CN
 // CNNIC
 // http://cnnic.cn/html/Dir/2005/10/11/3218.htm
 中国
@@ -6410,60 +6410,60 @@ yt
 // http://cnnic.cn/html/Dir/2005/10/11/3218.htm
 中國
 
-// xn--lgbbat1ad8j ("Algeria / Al Jazair" Arabic) : DZ  
+// xn--lgbbat1ad8j ("Algeria / Al Jazair" Arabic) : DZ
 الجزائر
 
 // xn--wgbh1c ("Egypt" Arabic .masr) : EG
 // http://www.dotmasr.eg/
 مصر
 
-// xn--node ("ge" Georgian (Mkhedruli)) : GE  
+// xn--node ("ge" Georgian (Mkhedruli)) : GE
 გე
 
 // xn--j6w193g ("Hong Kong" Chinese-Han) : HK
 // https://www2.hkirc.hk/register/rules.jsp
 香港
 
-// xn--h2brj9c ("Bharat" Devanagari) : IN  
+// xn--h2brj9c ("Bharat" Devanagari) : IN
 // India
 भारत
 
-// xn--mgbbh1a71e ("Bharat" Arabic) : IN  
+// xn--mgbbh1a71e ("Bharat" Arabic) : IN
 // India
 بھارت
 
-// xn--fpcrj9c3d ("Bharat" Telugu) : IN  
+// xn--fpcrj9c3d ("Bharat" Telugu) : IN
 // India
 భారత్
 
-// xn--gecrj9c ("Bharat" Gujarati) : IN  
+// xn--gecrj9c ("Bharat" Gujarati) : IN
 // India
 ભારત
 
-// xn--s9brj9c ("Bharat" Gurmukhi) : IN  
+// xn--s9brj9c ("Bharat" Gurmukhi) : IN
 // India
 ਭਾਰਤ
 
-// xn--45brj9c ("Bharat" Bengali) : IN  
+// xn--45brj9c ("Bharat" Bengali) : IN
 // India
 ভারত
 
-// xn--xkc2dl3a5ee0h ("India" Tamil) : IN  
+// xn--xkc2dl3a5ee0h ("India" Tamil) : IN
 // India
 இந்தியா
 
-// xn--mgba3a4f16a ("Iran" Persian) : IR  
+// xn--mgba3a4f16a ("Iran" Persian) : IR
 ایران
 
-// xn--mgba3a4fra ("Iran" Arabic) : IR  
+// xn--mgba3a4fra ("Iran" Arabic) : IR
 ايران
 
 // xn--mgbayh7gpa ("al-Ordon" Arabic) : JO
-// National Information Technology Center (NITC) 
+// National Information Technology Center (NITC)
 // Royal Scientific Society, Al-Jubeiha
 الاردن
 
-// xn--3e0b707e ("Republic of Korea" Hangul) : KR  
+// xn--3e0b707e ("Republic of Korea" Hangul) : KR
 한국
 
 // xn--fzc2c9e2c ("Lanka" Sinhalese-Sinhala) : LK
@@ -6474,10 +6474,10 @@ yt
 // http://nic.lk
 இலங்கை
 
-// xn--mgbc0a9azcg ("Morocco / al-Maghrib" Arabic) : MA  
+// xn--mgbc0a9azcg ("Morocco / al-Maghrib" Arabic) : MA
 المغرب
 
-// xn--mgb9awbf ("Oman" Arabic) : OM  
+// xn--mgb9awbf ("Oman" Arabic) : OM
 عمان
 
 // xn--ygbi2ammx ("Falasteen" Arabic) : PS
@@ -6485,7 +6485,7 @@ yt
 // http://www.pnina.ps
 فلسطين
 
-// xn--90a3ac ("srb" Cyrillic) : RS  
+// xn--90a3ac ("srb" Cyrillic) : RS
 срб
 
 // xn--p1ai ("rf" Russian-Cyrillic) : RU
@@ -6500,19 +6500,19 @@ yt
 // http://www.nic.net.sa/
 السعودية
 
-// xn--mgberp4a5d4a87g ("AlSaudiah" Arabic) variant : SA  
+// xn--mgberp4a5d4a87g ("AlSaudiah" Arabic) variant : SA
 السعودیة
 
-// xn--mgbqly7c0a67fbc ("AlSaudiah" Arabic) variant : SA  
+// xn--mgbqly7c0a67fbc ("AlSaudiah" Arabic) variant : SA
 السعودیۃ
 
-// xn--mgbqly7cvafr ("AlSaudiah" Arabic) variant : SA  
+// xn--mgbqly7cvafr ("AlSaudiah" Arabic) variant : SA
 السعوديه
 
-// xn--ogbpf8fl ("Syria" Arabic) : SY  
+// xn--ogbpf8fl ("Syria" Arabic) : SY
 سورية
 
-// xn--mgbtf8fl ("Syria" Arabic) variant : SY  
+// xn--mgbtf8fl ("Syria" Arabic) variant : SY
 سوريا
 
 // xn--yfro4i67o Singapore ("Singapore" Chinese-Han) : SG
@@ -6537,13 +6537,13 @@ yt
 // http://www.twnic.net/english/dn/dn_07a.htm
 台湾
 
-// xn--nnx388a ("Taiwan") variant : TW  
+// xn--nnx388a ("Taiwan") variant : TW
 臺灣
 
-// xn--j1amh ("ukr" Cyrillic) : UA  
+// xn--j1amh ("ukr" Cyrillic) : UA
 укр
 
-// xn--mgb2ddes ("AlYemen" Arabic) : YE  
+// xn--mgb2ddes ("AlYemen" Arabic) : YE
 اليمن
 
 // xxx : http://icmregistry.com
@@ -6619,124 +6619,124 @@ tattoo
 // xn--fiq228c5hs : 2013-09-09 TLD Registry Limited
 中文网
 
-// land : 2013-09-10 Pine Moon, LLC 
+// land : 2013-09-10 Pine Moon, LLC
 land
 
-// plumbing : 2013-09-10 Spring Tigers, LLC 
+// plumbing : 2013-09-10 Spring Tigers, LLC
 plumbing
 
-// contractors : 2013-09-10 Magic Woods, LLC 
+// contractors : 2013-09-10 Magic Woods, LLC
 contractors
 
-// sexy : 2013-09-11 Uniregistry,Corp. 
+// sexy : 2013-09-11 Uniregistry,Corp.
 sexy
 
-// menu : 2013-09-11 Wedding TLD2, LLC 
+// menu : 2013-09-11 Wedding TLD2, LLC
 menu
 
-// xn--rhqv96g : 2013-09-11 Stable Tone Limited 
+// xn--rhqv96g : 2013-09-11 Stable Tone Limited
 世界
 
-// uno : 2013-09-11 Dot Latin, LLC 
+// uno : 2013-09-11 Dot Latin, LLC
 uno
 
-// gallery : 2013-09-13 Sugar House, LLC 
+// gallery : 2013-09-13 Sugar House, LLC
 gallery
 
-// technology : 2013-09-13 Auburn Falls 
+// technology : 2013-09-13 Auburn Falls
 technology
 
-// xn--3bst00m : 2013-09-13 Eagle Horizon Limited 
+// xn--3bst00m : 2013-09-13 Eagle Horizon Limited
 集团
 
-// reviews : 2013-09-13 Extra Cover, LLC 
+// reviews : 2013-09-13 Extra Cover, LLC
 reviews
 
-// guide : 2013-09-13 Snow Moon, LLC 
+// guide : 2013-09-13 Snow Moon, LLC
 guide
 
-// xn--6qq986b3x1 : 2013-09-13 Tycoon Treasure Limited 
+// xn--6qq986b3x1 : 2013-09-13 Tycoon Treasure Limited
 我爱你
 
-// graphics : 2013-09-13 Over Madison, LLC 
+// graphics : 2013-09-13 Over Madison, LLC
 graphics
 
-// construction : 2013-09-13 Fox Dynamite, LLC 
+// construction : 2013-09-13 Fox Dynamite, LLC
 construction
 
-// onl : 2013-09-16 I-Registry Ltd. 
+// onl : 2013-09-16 I-Registry Ltd.
 onl
 
-// xn--q9jyb4c : 2013-09-17 Charleston Road Registry 
+// xn--q9jyb4c : 2013-09-17 Charleston Road Registry
 みんな
 
-// diamonds : 2013-09-23 John Edge, LLC 
+// diamonds : 2013-09-23 John Edge, LLC
 diamonds
 
-// kiwi : 2013-09-23 Dot Kiwi Limited 
+// kiwi : 2013-09-23 Dot Kiwi Limited
 kiwi
 
-// enterprises : 2013-09-23 Snow Oaks LLC 
+// enterprises : 2013-09-23 Snow Oaks LLC
 enterprises
 
-// today : 2013-09-23 Pearl Woods, LLC 
+// today : 2013-09-23 Pearl Woods, LLC
 today
 
-// futbol : 2013-09-23 Atomic Falls, LLC 
+// futbol : 2013-09-23 Atomic Falls, LLC
 futbol
 
-// photography : 2013-09-23 Sugar Glen, LLC 
+// photography : 2013-09-23 Sugar Glen, LLC
 photography
 
-// tips : 2013-09-23 Corn Willow, LLC 
+// tips : 2013-09-23 Corn Willow, LLC
 tips
 
-// directory : 2013-09-23 Extra Madison, LLC 
+// directory : 2013-09-23 Extra Madison, LLC
 directory
 
-// kitchen : 2013-09-23 Just Goodbye, LLC 
+// kitchen : 2013-09-23 Just Goodbye, LLC
 kitchen
 
-// xn--6frz82g : 2013-09-24 Afilias Limited 
+// xn--6frz82g : 2013-09-24 Afilias Limited
 移动
 
-// kim : 2013-09-24 Afilias Limited 
+// kim : 2013-09-24 Afilias Limited
 kim
 
-// xn--cg4bki : 2013-09-27 Samsung SDS Co., LTD 
+// xn--cg4bki : 2013-09-27 Samsung SDS Co., LTD
 삼성
 
-// monash : 2013-10-01 Monash University 
+// monash : 2013-10-01 Monash University
 monash
 
-// wed : 2013-10-02 Atgron, Inc. 
+// wed : 2013-10-02 Atgron, Inc.
 wed
 
-// pink : 2013-10-02 Afilias Limited 
+// pink : 2013-10-02 Afilias Limited
 pink
 
-// ruhr : 2013-10-02 regiodot GmbH & Co. KG 
+// ruhr : 2013-10-02 regiodot GmbH & Co. KG
 ruhr
 
-// buzz : 2013-10-03 DOTSTRATEGY CO. 
+// buzz : 2013-10-03 DOTSTRATEGY CO.
 buzz
 
-// careers : 2013-10-03 Wild Corner, LLC 
+// careers : 2013-10-03 Wild Corner, LLC
 careers
 
-// shoes : 2013-10-03 Binky Galley, LLC 
+// shoes : 2013-10-03 Binky Galley, LLC
 shoes
 
-// xn--4gbrim : 2013-10-07 Suhub Electronic Establishment 
+// xn--4gbrim : 2013-10-07 Suhub Electronic Establishment
 موقع
 
-// career : 2013-10-09 dotCareer, LLC 
+// career : 2013-10-09 dotCareer, LLC
 career
 
-// otsuka : 2013-10-11 Otsuka Holdings Co. Ltd. 
+// otsuka : 2013-10-11 Otsuka Holdings Co. Ltd.
 otsuka
 
-// xn--fiQ64b : 2013-10-14 CITIC Group Corporation 
+// xn--fiQ64b : 2013-10-14 CITIC Group Corporation
 中信
 
 // ===END ICANN DOMAINS===
@@ -6762,7 +6762,7 @@ us-gov-west-1.compute.amazonaws.com
 us-west-1.compute.amazonaws.com
 us-west-2.compute.amazonaws.com
 
-// Amazon Elastic Beanstalk : https://aws.amazon.com/elasticbeanstalk/ 
+// Amazon Elastic Beanstalk : https://aws.amazon.com/elasticbeanstalk/
 // Requested by Adam Stein <astein@amazon.com> 2013-04-02
 elasticbeanstalk.com
 
diff --git a/netwerk/test/unit/data/test_psl.txt b/netwerk/test/unit/data/test_psl.txt
index 7726b8c0b65f..35c8ccf27787 100644
--- a/netwerk/test/unit/data/test_psl.txt
+++ b/netwerk/test/unit/data/test_psl.txt
@@ -76,3 +76,23 @@ checkPublicSuffix('www.test.ak.us', 'test.ak.us');
 checkPublicSuffix('k12.ak.us', null);
 checkPublicSuffix('test.k12.ak.us', 'test.k12.ak.us');
 checkPublicSuffix('www.test.k12.ak.us', 'test.k12.ak.us');
+// IDN labels.
+checkPublicSuffix('食狮.com.cn', '食狮.com.cn');
+checkPublicSuffix('食狮.公司.cn', '食狮.公司.cn');
+checkPublicSuffix('www.食狮.公司.cn', '食狮.公司.cn');
+checkPublicSuffix('shishi.公司.cn', 'shishi.公司.cn');
+checkPublicSuffix('公司.cn', null);
+checkPublicSuffix('食狮.中国', '食狮.中国');
+checkPublicSuffix('www.食狮.中国', '食狮.中国');
+checkPublicSuffix('shishi.中国', 'shishi.中国');
+checkPublicSuffix('中国', null);
+// Same as above, but punycoded.
+checkPublicSuffix('xn--85x722f.com.cn', 'xn--85x722f.com.cn');
+checkPublicSuffix('xn--85x722f.xn--55qx5d.cn', 'xn--85x722f.xn--55qx5d.cn');
+checkPublicSuffix('www.xn--85x722f.xn--55qx5d.cn', 'xn--85x722f.xn--55qx5d.cn');
+checkPublicSuffix('shishi.xn--55qx5d.cn', 'shishi.xn--55qx5d.cn');
+checkPublicSuffix('xn--55qx5d.cn', null);
+checkPublicSuffix('xn--85x722f.xn--fiqs8s', 'xn--85x722f.xn--fiqs8s');
+checkPublicSuffix('www.xn--85x722f.xn--fiqs8s', 'xn--85x722f.xn--fiqs8s');
+checkPublicSuffix('shishi.xn--fiqs8s', 'shishi.xn--fiqs8s');
+checkPublicSuffix('xn--fiqs8s', null);
diff --git a/netwerk/test/unit/test_psl.js b/netwerk/test/unit/test_psl.js
index 8a450ac7e95c..91124eaa0fdb 100644
--- a/netwerk/test/unit/test_psl.js
+++ b/netwerk/test/unit/test_psl.js
@@ -1,6 +1,9 @@
 var etld = Cc["@mozilla.org/network/effective-tld-service;1"]
              .getService(Ci.nsIEffectiveTLDService);
 
+var idna = Cc["@mozilla.org/network/idn-service;1"]
+           .getService(Ci.nsIIDNService);
+
 function run_test()
 {
   var file = do_get_file("data/test_psl.txt");
@@ -10,7 +13,7 @@ function run_test()
   var scriptLoader = Cc["@mozilla.org/moz/jssubscript-loader;1"]
                        .getService(Ci.mozIJSSubScriptLoader);
   var srvScope = {};
-  scriptLoader.loadSubScript(uri.spec, srvScope);
+  scriptLoader.loadSubScript(uri.spec, srvScope, "utf-8");
 }
 
 function checkPublicSuffix(host, expectedSuffix)
@@ -21,5 +24,11 @@ function checkPublicSuffix(host, expectedSuffix)
   } catch (e if e.name == "NS_ERROR_INSUFFICIENT_DOMAIN_LEVELS" ||
                 e.name == "NS_ERROR_ILLEGAL_VALUE") {
   }
+  // The EffectiveTLDService always gives back punycoded labels.
+  // The test suite wants to get back what it put in.
+  if (actualSuffix !== null && expectedSuffix !== null &&
+      /(^|\.)xn--/.test(actualSuffix) && !/(^|\.)xn--/.test(expectedSuffix)) {
+    actualSuffix = idna.convertACEtoUTF8(actualSuffix);
+  }
   do_check_eq(actualSuffix, expectedSuffix);
 }
diff --git a/security/manager/ssl/src/nsCrypto.cpp b/security/manager/ssl/src/nsCrypto.cpp
index 2dc7527a11f2..f9d7e29b024b 100644
--- a/security/manager/ssl/src/nsCrypto.cpp
+++ b/security/manager/ssl/src/nsCrypto.cpp
@@ -553,11 +553,14 @@ nsConvertToActualKeyGenParams(uint32_t keyGenMech, char *params,
               next_input, name, name_len, value, value_len,
               next_input))
       {
-        if (PL_strncmp(name, "curve", std::min(name_len, 5)) == 0)
+        // use only the first specified curve
+        if (!curve && PL_strncmp(name, "curve", std::min(name_len, 5)) == 0)
         {
           curve = PL_strndup(value, value_len);
         }
-        else if (PL_strncmp(name, "popcert", std::min(name_len, 7)) == 0)
+        // use only the first specified popcert
+        else if (!keyPairInfo->ecPopCert &&
+                 PL_strncmp(name, "popcert", std::min(name_len, 7)) == 0)
         {
           char *certstr = PL_strndup(value, value_len);
           if (certstr) {
diff --git a/security/manager/ssl/tests/mochitest/bugs/test_generateCRMFRequest.html b/security/manager/ssl/tests/mochitest/bugs/test_generateCRMFRequest.html
index 3cf1a5ba18c1..457c9ac67e23 100644
--- a/security/manager/ssl/tests/mochitest/bugs/test_generateCRMFRequest.html
+++ b/security/manager/ssl/tests/mochitest/bugs/test_generateCRMFRequest.html
@@ -56,8 +56,63 @@
       // which gets interpreted as an empty string.
       is(e.toString(), "Error: error:invalid key generation argument:", "expected exception");
     }
+
+    // Test that only the first of repeated keygen parameters are used.
+    try {
+      var curveCrmfObject = crypto.generateCRMFRequest("CN=a", "a", "a", null,
+                              "", 1024, "curve=secp521r1;curve=nistp384",
+                              "ec-dual-use");
+      ok(curveCrmfObject, "generateCRMFRequest succeeded");
+      var curveRequest = curveCrmfObject.request;
+      var curveBytes = atob(curveRequest.replace(/\r\n/g, ""));
+
+      // nistp384 encoded in the request (as ASN1)
+      var badIdentifier = [ 0x06, 0x05, 0x2B, 0x81, 0x04, 0x00, 0x22 ];
+      ok(!findIdentifierInString(badIdentifier, curveBytes),
+         "didn't find bad identifier in curve request");
+
+      // secp512r1 encoded in the request (as ASN1)
+      var goodIdentifier = [ 0x06, 0x05, 0x2B, 0x81, 0x04, 0x00, 0x23 ];
+      ok(findIdentifierInString(goodIdentifier, curveBytes),
+         "found good identifier in curve request");
+
+      // The popcert=MII... values are base-64 encodings of self-signed
+      // certificates. The key of the first one is a secp521r1 key, whereas
+      // the second is nistp384.
+      var popcertCrmfObject = crypto.generateCRMFRequest("CN=a", "a", "a",
+                                null, "", 1024, "popcert=MIIBjjCB8aADAgECAgUAnVEmVTAJBgcqhkjOPQQBMAwxCjAIBgNVBAMTAWkwHhcNMTMxMTA2MjE1NDUxWhcNMTQwMjA2MjE1NDUxWjAMMQowCAYDVQQDEwFpMIGbMBAGByqGSM49AgEGBSuBBAAjA4GGAAQA5juM0J3Od2Ih4s0ZiTkzVkh96J4yO12/L71df3GWy/Ex3LaGcew/EucY5ZITEqNHn22+3pKf3pwL6GJ/zA/foJwBspiE42ITo2BHHXl2Uuf1QK70UH5gzaqf1Cc4lPv3ibOf3EAmHx0a8sdDxRlUN2+V38iYWnMmV1qf4jM15fsYEDMwCQYHKoZIzj0EAQOBjAAwgYgCQgDO34oQkVDNkwtto1OAEbFZgq1xP9aqc+Nt7vnOuEGTISdFXCjlhon7SysTejFhO8d8wG500NrlJEmaie9FJbmWpQJCARcVtnC0K+ilxz307GyuANTaLEd7vBJxTAho8l6xkibNoxY1D9+hcc6ECbK7PCtAaysZoAVx5XhJlsnFdJdDj3wG;popcert=MIIBRDCBy6ADAgECAgUAnVEotzAJBgcqhkjOPQQBMAwxCjAIBgNVBAMTAWkwHhcNMTMxMTA2MjIwMDExWhcNMTQwMjA2MjIwMDExWjAMMQowCAYDVQQDEwFpMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEXjFpZ9bodzikeN4C8p2mVj1Ia1t+8zIndSavQHmxaD3+kvhkt18+P20ZagfBOaVEQZdArZ6KxBeW9oYZqaNpqHLveGlKYi6u9z5FyozAx4MXzyLdfu+bzOLIsryKRnLFMAkGByqGSM49BAEDaQAwZgIxAJDawIJLQ5iZsJVC3vV1YEKsI2aNEicdZ3YTMp/zUy+64Z2/cjyyfa7d5m1xKLDBogIxANHOQoy/7DioCyWNDDzx5QK0M24dOURVWRXsxjAjrg4vDmV/fkVzwpUzIr5fMgXEyQ==", "ec-dual-use");
+      ok(popcertCrmfObject, "generateCRMFRequest succeeded");
+      var popcertRequest = popcertCrmfObject.request;
+      var popcertBytes = atob(popcertRequest.replace(/\r\n/g, ""));
+      ok(!findIdentifierInString(badIdentifier, popcertBytes),
+         "didn't find bad identifier in popcert request");
+
+      ok(findIdentifierInString(goodIdentifier, popcertBytes),
+         "found good identifier in popcert request");
+    } catch (e) {
+      ok(false, "unexpected exception: " + e);
+    }
     SimpleTest.finish();
   }
+
+  function findIdentifierInString(identifier, str) {
+    var matches = 0;
+    for (var i = 0; i < str.length - identifier.length;
+         i += (matches != 0 ? matches : 1)) {
+      matches = 0;
+      for (var j = 0; j < identifier.length; j++) {
+        if (identifier[j] == str.charCodeAt(i + j)) {
+          matches++;
+        } else {
+          break;
+        }
+      }
+      if (matches == identifier.length) {
+        return true;
+      }
+    }
+    return false;
+  }
 </script>
 </body>
 </html>
diff --git a/testing/mochitest/runtestsremote.py b/testing/mochitest/runtestsremote.py
index c20d297624db..43ef2219f804 100644
--- a/testing/mochitest/runtestsremote.py
+++ b/testing/mochitest/runtestsremote.py
@@ -644,8 +644,8 @@ def main():
 
             options.app = "am"
             options.browserArgs = ["instrument", "-w", "-e", "deviceroot", deviceRoot, "-e", "class"]
-            options.browserArgs.append("%s.tests.%s" % (options.remoteappname, test['name']))
-            options.browserArgs.append("org.mozilla.roboexample.test/%s.FennecInstrumentationTestRunner" % options.remoteappname)
+            options.browserArgs.append("org.mozilla.gecko.tests.%s" % test['name'])
+            options.browserArgs.append("org.mozilla.roboexample.test/org.mozilla.gecko.FennecInstrumentationTestRunner")
 
             # If the test is for checking the import from bookmarks then make sure there is data to import
             if test['name'] == "testImportFromAndroid":
diff --git a/testing/talos/talos.json b/testing/talos/talos.json
index 5f1824811ec8..77f292d4b9c6 100644
--- a/testing/talos/talos.json
+++ b/testing/talos/talos.json
@@ -1,11 +1,11 @@
 {
     "talos.zip": {
-        "url": "http://talos-bundles.pvt.build.mozilla.org/zips/talos.e00ebeed2477.zip",
+        "url": "http://talos-bundles.pvt.build.mozilla.org/zips/talos.0987e4cbd219.zip",
         "path": ""
     },
     "global": {
         "talos_repo": "http://hg.mozilla.org/build/talos",
-        "talos_revision": "e00ebeed2477"
+        "talos_revision": "0987e4cbd219"
     },
     "suites": {
         "chromez": {
diff --git a/toolkit/components/search/nsSearchService.js b/toolkit/components/search/nsSearchService.js
index 397aa0850dbb..f18aa6eb7fa2 100644
--- a/toolkit/components/search/nsSearchService.js
+++ b/toolkit/components/search/nsSearchService.js
@@ -1191,8 +1191,8 @@ Engine.prototype = {
   _updateURL: null,
   // The url to check for a new icon
   _iconUpdateURL: null,
-  // A reference to the timer used for lazily serializing the engine to file
-  _serializeTimer: null,
+  /* Deferred serialization task. */
+  _lazySerializeTask: null,
 
   /**
    * Retrieves the data from the engine's file. If the engine's dataType is
@@ -2363,28 +2363,15 @@ Engine.prototype = {
     return doc;
   },
 
-  _lazySerializeToFile: function SRCH_ENG_serializeToFile() {
-    if (this._serializeTimer) {
-      // Reset the timer
-      this._serializeTimer.delay = LAZY_SERIALIZE_DELAY;
-    } else {
-      this._serializeTimer = Cc["@mozilla.org/timer;1"].
-                             createInstance(Ci.nsITimer);
-      var timerCallback = {
-        self: this,
-        notify: function SRCH_ENG_notify(aTimer) {
-          try {
-            this.self._serializeToFile();
-          } catch (ex) {
-            LOG("Serialization from timer callback failed:\n" + ex);
-          }
-          this.self._serializeTimer = null;
-        }
-      };
-      this._serializeTimer.initWithCallback(timerCallback,
-                                            LAZY_SERIALIZE_DELAY,
-                                            Ci.nsITimer.TYPE_ONE_SHOT);
+  get lazySerializeTask() {
+    if (!this._lazySerializeTask) {
+      let task = function taskCallback() {
+        this._serializeToFile();
+      }.bind(this);
+      this._lazySerializeTask = new DeferredTask(task, LAZY_SERIALIZE_DELAY);
     }
+
+    return this._lazySerializeTask;
   },
 
   /**
@@ -2415,6 +2402,9 @@ Engine.prototype = {
     }
 
     closeSafeOutputStream(fos);
+
+    Services.obs.notifyObservers(file.clone(), SEARCH_SERVICE_TOPIC,
+                                 "write-engine-to-disk-complete");
   },
 
   /**
@@ -2660,7 +2650,7 @@ Engine.prototype = {
     url.addParam(aName, aValue);
 
     // Serialize the changes to file lazily
-    this._lazySerializeToFile();
+    this.lazySerializeTask.start();
   },
 
 #ifdef ANDROID
@@ -3236,25 +3226,16 @@ SearchService.prototype = {
     });
   },
 
-  _batchTimer: null,
-  _batchCacheInvalidation: function SRCH_SVC__batchCacheInvalidation() {
-    let callback = {
-      self: this,
-      notify: function SRCH_SVC_batchTimerNotify(aTimer) {
-        LOG("_batchCacheInvalidation: Invalidating engine cache");
-        this.self._buildCache();
-        this.self._batchTimer = null;
-      }
-    };
-
-    if (!this._batchTimer) {
-      this._batchTimer = Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer);
-      this._batchTimer.initWithCallback(callback, CACHE_INVALIDATION_DELAY,
-                                        Ci.nsITimer.TYPE_ONE_SHOT);
-    } else {
-      this._batchTimer.delay = CACHE_INVALIDATION_DELAY;
-      LOG("_batchCacheInvalidation: Batch timer reset");
+  _batchTask: null,
+  get batchTask() {
+    if (!this._batchTask) {
+      let task = function taskCallback() {
+        LOG("batchTask: Invalidating engine cache");
+        this._buildCache();
+      }.bind(this);
+      this._batchTask = new DeferredTask(task, CACHE_INVALIDATION_DELAY);
     }
+    return this._batchTask;
   },
 
   _addEngineToStore: function SRCH_SVC_addEngineToStore(aEngine) {
@@ -3885,7 +3866,7 @@ SearchService.prototype = {
     engine._initFromMetadata(aName, aIconURL, aAlias, aDescription,
                              aMethod, aTemplate);
     this._addEngineToStore(engine);
-    this._batchCacheInvalidation();
+    this.batchTask.start();
   },
 
   addEngine: function SRCH_SVC_addEngine(aEngineURL, aDataType, aIconURL,
@@ -3948,10 +3929,10 @@ SearchService.prototype = {
       engineToRemove.hidden = true;
       engineToRemove.alias = null;
     } else {
-      // Cancel the lazy serialization timer if it's running
-      if (engineToRemove._serializeTimer) {
-        engineToRemove._serializeTimer.cancel();
-        engineToRemove._serializeTimer = null;
+      // Cancel the serialized task if it's running
+      if (engineToRemove._lazySerializeTask) {
+        engineToRemove._lazySerializeTask.cancel();
+        engineToRemove._lazySerializeTask = null;
       }
 
       // Remove the engine file from disk (this might throw)
@@ -4149,21 +4130,20 @@ SearchService.prototype = {
               LOG("nsSearchService::observe: setting current");
               this.currentEngine = aEngine;
             }
-            this._batchCacheInvalidation();
+            this.batchTask.start();
             break;
           case SEARCH_ENGINE_CHANGED:
           case SEARCH_ENGINE_REMOVED:
-            this._batchCacheInvalidation();
+            this.batchTask.start();
             break;
         }
         break;
 
       case QUIT_APPLICATION_TOPIC:
         this._removeObservers();
-        if (this._batchTimer) {
+        if (this._batchTask) {
           // Flush to disk immediately
-          this._batchTimer.cancel();
-          this._buildCache();
+          this._batchTask.flush();
         }
         engineMetadataService.flush();
         break;
diff --git a/toolkit/components/search/tests/xpcshell/test_serialize_file.js b/toolkit/components/search/tests/xpcshell/test_serialize_file.js
new file mode 100644
index 000000000000..84cf289be1ad
--- /dev/null
+++ b/toolkit/components/search/tests/xpcshell/test_serialize_file.js
@@ -0,0 +1,92 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/*
+ * test_serialize_file: Add test engines
+ *
+ * Ensure that :
+ * - File is created.
+ * - File size is bigger than 0.
+ * - lazySerializeTask updates the file.
+ */
+
+const Ci = Components.interfaces;
+const Cu = Components.utils;
+
+Cu.import("resource://testing-common/httpd.js");
+Cu.import("resource://gre/modules/NetUtil.jsm");
+
+add_test(function test_batchTask() {
+  let observer = function(aSubject, aTopic, aData) {
+    if (aTopic == "browser-search-engine-modified" && aData == "engine-loaded") {
+      let engine1 = Services.search.getEngineByName("Test search engine");
+      let engine2 = Services.search.getEngineByName("Sherlock test search engine");
+      if (engine1 && engine2) {
+        Services.obs.removeObserver(observer, aTopic);
+        // Test that files are written correctly.
+        let engineFile1 = engine1.wrappedJSObject._file;
+        let engineFile2 = engine2.wrappedJSObject._file;
+        do_check_true(engineFile1.exists());
+        do_check_true(engineFile2.exists());
+        do_check_neq(engineFile1.fileSize, 0);
+        do_check_neq(engineFile2.fileSize, 0);
+        run_next_test();
+      }
+    }
+  }
+
+  Services.obs.addObserver(observer, "browser-search-engine-modified", false);
+  Services.search.addEngine("http://localhost:4444/data/engine.xml",
+                            Ci.nsISearchEngine.DATA_XML, null, false);
+  Services.search.addEngine("http://localhost:4444/data/engine.src",
+                            Ci.nsISearchEngine.DATA_TEXT,
+                            "http://localhost:4444/data/ico-size-16x16-png.ico",
+                            false);
+});
+
+add_test(function test_addParam() {
+  let engine = Services.search.getEngineByName("Test search engine");
+  engine.addParam("param-name", "param-value", null);
+
+  function readAsyncFile(aFile, aCallback) {
+    NetUtil.asyncFetch(aFile, function(inputStream, status) {
+      do_check_true(Components.isSuccessCode(status));
+
+      let data = NetUtil.readInputStreamToString(inputStream, inputStream.available());
+      aCallback(data);
+    });
+  }
+
+  let observer = function(aSubject, aTopic, aData) {
+    // The sherlock engine file may still be updated because the icon takes
+    // time be loaded, therefore, the engine name is checked here.
+    aSubject.QueryInterface(Ci.nsIFile);
+    if (aTopic == "browser-search-service" &&
+        aData == "write-engine-to-disk-complete" &&
+        aSubject.leafName == "test-search-engine.xml") {
+      Services.obs.removeObserver(observer, aTopic);
+
+      let engineFile = engine.wrappedJSObject._file;
+
+      readAsyncFile(engineFile, function(engineData) {
+        do_check_true(engineData.indexOf("param-name") > 0);
+        run_next_test();
+      });
+    }
+  }
+  Services.obs.addObserver(observer, "browser-search-service", false);
+});
+
+function run_test() {
+  updateAppInfo();
+
+  let httpServer = new HttpServer();
+  httpServer.start(4444);
+  httpServer.registerDirectory("/", do_get_cwd());
+
+  do_register_cleanup(function cleanup() {
+    httpServer.stop(function() {});
+  });
+
+  run_next_test();
+}
diff --git a/toolkit/components/search/tests/xpcshell/xpcshell.ini b/toolkit/components/search/tests/xpcshell/xpcshell.ini
index 8540282ca75d..23562f09bb57 100644
--- a/toolkit/components/search/tests/xpcshell/xpcshell.ini
+++ b/toolkit/components/search/tests/xpcshell/xpcshell.ini
@@ -29,6 +29,7 @@ support-files =
 [test_notifications.js]
 [test_addEngine_callback.js]
 [test_multipleIcons.js]
+[test_serialize_file.js]
 [test_async.js]
 [test_sync.js]
 [test_sync_fallback.js]
diff --git a/toolkit/devtools/server/actors/script.js b/toolkit/devtools/server/actors/script.js
index 715c9d527130..66b0d8efd9ec 100644
--- a/toolkit/devtools/server/actors/script.js
+++ b/toolkit/devtools/server/actors/script.js
@@ -49,7 +49,7 @@ BreakpointStore.prototype = {
    *            the whole line)
    *          - actor (optional)
    */
-  addBreakpoint: function BS_addBreakpoint(aBreakpoint) {
+  addBreakpoint: function (aBreakpoint) {
     let { url, line, column } = aBreakpoint;
 
     if (column != null) {
@@ -79,7 +79,7 @@ BreakpointStore.prototype = {
    *          - line
    *          - column (optional)
    */
-  removeBreakpoint: function BS_removeBreakpoint({ url, line, column }) {
+  removeBreakpoint: function ({ url, line, column }) {
     if (column != null) {
       if (this._breakpoints[url]) {
         if (this._breakpoints[url][line]) {
@@ -115,7 +115,7 @@ BreakpointStore.prototype = {
    *          - line
    *          - column (optional)
    */
-  getBreakpoint: function BS_getBreakpoint(aLocation) {
+  getBreakpoint: function (aLocation) {
     let { url, line, column } = aLocation;
     dbg_assert(url != null);
     dbg_assert(line != null);
@@ -141,7 +141,7 @@ BreakpointStore.prototype = {
    *          - column (optional)
    * @returns The stored breakpoint if it exists, null otherwise.
    */
-  hasBreakpoint: function BS_hasBreakpoint(aLocation) {
+  hasBreakpoint: function (aLocation) {
     let { url, line, column } = aLocation;
     dbg_assert(url != null);
     dbg_assert(line != null);
@@ -167,7 +167,7 @@ BreakpointStore.prototype = {
    *          - line (optional; requires the url property)
    *          - column (optional; requires the line property)
    */
-  findBreakpoints: function BS_findBreakpoints(aSearchParams={}) {
+  findBreakpoints: function (aSearchParams={}) {
     if (aSearchParams.column != null) {
       dbg_assert(aSearchParams.line != null);
     }
@@ -191,7 +191,7 @@ BreakpointStore.prototype = {
     }
   },
 
-  _iterUrls: function BS__iterUrls(aUrl) {
+  _iterUrls: function (aUrl) {
     if (aUrl) {
       if (this._breakpoints[aUrl] || this._wholeLineBreakpoints[aUrl]) {
         yield aUrl;
@@ -209,7 +209,7 @@ BreakpointStore.prototype = {
     }
   },
 
-  _iterLines: function BS__iterLines(aUrl, aLine) {
+  _iterLines: function (aUrl, aLine) {
     if (aLine != null) {
       if ((this._wholeLineBreakpoints[aUrl]
            && this._wholeLineBreakpoints[aUrl][aLine])
@@ -237,7 +237,7 @@ BreakpointStore.prototype = {
     }
   },
 
-  _iterColumns: function BS__iterColumns(aUrl, aLine, aColumn) {
+  _iterColumns: function (aUrl, aLine, aColumn) {
     if (!this._breakpoints[aUrl] || !this._breakpoints[aUrl][aLine]) {
       return;
     }
@@ -513,7 +513,7 @@ ThreadActor.prototype = {
    * them in a stack) because we can pause within client evals.
    */
   _threadPauseEventLoops: null,
-  _pushThreadPause: function TA__pushThreadPause() {
+  _pushThreadPause: function () {
     if (!this._threadPauseEventLoops) {
       this._threadPauseEventLoops = [];
     }
@@ -521,13 +521,13 @@ ThreadActor.prototype = {
     this._threadPauseEventLoops.push(eventLoop);
     eventLoop.enter();
   },
-  _popThreadPause: function TA__popThreadPause() {
+  _popThreadPause: function () {
     const eventLoop = this._threadPauseEventLoops.pop();
     dbg_assert(eventLoop, "Should have an event loop.");
     eventLoop.resolve();
   },
 
-  clearDebuggees: function TA_clearDebuggees() {
+  clearDebuggees: function () {
     if (this.dbg) {
       this.dbg.removeAllDebuggees();
     }
@@ -541,7 +541,7 @@ ThreadActor.prototype = {
    *
    * @returns the Debugger.Object that corresponds to the global.
    */
-  addDebuggee: function TA_addDebuggee(aGlobal) {
+  addDebuggee: function (aGlobal) {
     let globalDebugObject;
     try {
       globalDebugObject = this.dbg.addDebuggee(aGlobal);
@@ -555,7 +555,7 @@ ThreadActor.prototype = {
   /**
    * Initialize the Debugger.
    */
-  _initDebugger: function TA__initDebugger() {
+  _initDebugger: function () {
     this.dbg = new Debugger();
     this.dbg.uncaughtExceptionHook = this.uncaughtExceptionHook.bind(this);
     this.dbg.onDebuggerStatement = this.onDebuggerStatement.bind(this);
@@ -568,7 +568,7 @@ ThreadActor.prototype = {
   /**
    * Remove a debuggee global from the JSInspector.
    */
-  removeDebugee: function TA_removeDebuggee(aGlobal) {
+  removeDebugee: function (aGlobal) {
     try {
       this.dbg.removeDebuggee(aGlobal);
     } catch(ex) {
@@ -582,7 +582,7 @@ ThreadActor.prototype = {
    *
    * @returns the Debugger.Object that corresponds to the window.
    */
-  _addDebuggees: function TA__addDebuggees(aWindow) {
+  _addDebuggees: function (aWindow) {
     let globalDebugObject = this.addDebuggee(aWindow);
     let frames = aWindow.frames;
     if (frames) {
@@ -598,7 +598,7 @@ ThreadActor.prototype = {
    * depending on the debugging context being required (chrome or content).
    */
   globalManager: {
-    findGlobals: function TA_findGlobals() {
+    findGlobals: function () {
       this.globalDebugObject = this._addDebuggees(this.global);
     },
 
@@ -609,7 +609,7 @@ ThreadActor.prototype = {
      * @param aGlobal Debugger.Object
      *        The new global object that was created.
      */
-    onNewGlobal: function TA_onNewGlobal(aGlobal) {
+    onNewGlobal: function (aGlobal) {
       // Content debugging only cares about new globals in the contant window,
       // like iframe children.
       if (aGlobal.hostAnnotations &&
@@ -627,7 +627,7 @@ ThreadActor.prototype = {
     }
   },
 
-  disconnect: function TA_disconnect() {
+  disconnect: function () {
     dumpn("in ThreadActor.prototype.disconnect");
     if (this._state == "paused") {
       this.onResume();
@@ -656,12 +656,12 @@ ThreadActor.prototype = {
   /**
    * Disconnect the debugger and put the actor in the exited state.
    */
-  exit: function TA_exit() {
+  exit: function () {
     this.disconnect();
   },
 
   // Request handlers
-  onAttach: function TA_onAttach(aRequest) {
+  onAttach: function (aRequest) {
     if (this.state === "exited") {
       return { type: "exited" };
     }
@@ -706,7 +706,7 @@ ThreadActor.prototype = {
     }
   },
 
-  onDetach: function TA_onDetach(aRequest) {
+  onDetach: function (aRequest) {
     this.disconnect();
     dumpn("ThreadActor.prototype.onDetach: returning 'detached' packet");
     return {
@@ -714,7 +714,7 @@ ThreadActor.prototype = {
     };
   },
 
-  onReconfigure: function TA_onReconfigure(aRequest) {
+  onReconfigure: function (aRequest) {
     if (this.state == "exited") {
       return { error: "wrongState" };
     }
@@ -738,8 +738,7 @@ ThreadActor.prototype = {
    *        Hook to modify the packet before it is sent. Feel free to return a
    *        promise.
    */
-  _pauseAndRespond: function TA__pauseAndRespond(aFrame, aReason,
-                                                 onPacket=function (k) { return k; }) {
+  _pauseAndRespond: function (aFrame, aReason, onPacket=function (k) { return k; }) {
     try {
       let packet = this._paused(aFrame);
       if (!packet) {
@@ -777,7 +776,7 @@ ThreadActor.prototype = {
    *        The request packet received over the RDP.
    * @returns A response packet.
    */
-  _forceCompletion: function TA__forceCompletion(aRequest) {
+  _forceCompletion: function (aRequest) {
     // TODO: remove this when Debugger.Frame.prototype.pop is implemented in
     // bug 736733.
     return {
@@ -786,7 +785,7 @@ ThreadActor.prototype = {
     };
   },
 
-  _makeOnEnterFrame: function TA__makeOnEnterFrame({ pauseAndRespond }) {
+  _makeOnEnterFrame: function ({ pauseAndRespond }) {
     return aFrame => {
       const generatedLocation = getFrameLocation(aFrame);
       let { url } = this.synchronize(this.sources.getOriginalLocation(
@@ -798,7 +797,7 @@ ThreadActor.prototype = {
     };
   },
 
-  _makeOnPop: function TA__makeOnPop({ thread, pauseAndRespond, createValueGrip }) {
+  _makeOnPop: function ({ thread, pauseAndRespond, createValueGrip }) {
     return function (aCompletion) {
       // onPop is called with 'this' set to the current frame.
 
@@ -830,8 +829,8 @@ ThreadActor.prototype = {
     };
   },
 
-  _makeOnStep: function TA__makeOnStep({ thread, pauseAndRespond, startFrame,
-                                         startLocation }) {
+  _makeOnStep: function ({ thread, pauseAndRespond, startFrame,
+                           startLocation }) {
     return function () {
       // onStep is called with 'this' set to the current frame.
 
@@ -876,7 +875,7 @@ ThreadActor.prototype = {
   /**
    * Define the JS hook functions for stepping.
    */
-  _makeSteppingHooks: function TA__makeSteppingHooks(aStartLocation) {
+  _makeSteppingHooks: function (aStartLocation) {
     // Bind these methods and state because some of the hooks are called
     // with 'this' set to the current frame. Rather than repeating the
     // binding in each _makeOnX method, just do it once here and pass it
@@ -907,7 +906,7 @@ ThreadActor.prototype = {
    * @returns A promise that resolves to true once the hooks are attached, or is
    *          rejected with an error packet.
    */
-  _handleResumeLimit: function TA__handleResumeLimit(aRequest) {
+  _handleResumeLimit: function (aRequest) {
     let steppingType = aRequest.resumeLimit.type;
     if (["step", "next", "finish"].indexOf(steppingType) == -1) {
       return reject({ error: "badParameterType",
@@ -949,7 +948,7 @@ ThreadActor.prototype = {
    * @param Debugger.Frame aFrame
    *        The frame we want to clear the stepping hooks from.
    */
-  _clearSteppingHooks: function TA__clearSteppingHooks(aFrame) {
+  _clearSteppingHooks: function (aFrame) {
     while (aFrame) {
       aFrame.onStep = undefined;
       aFrame.onPop = undefined;
@@ -963,7 +962,7 @@ ThreadActor.prototype = {
    * @param Object aRequest
    *        The resume request packet received over the RDP.
    */
-  _maybeListenToEvents: function TA__maybeListenToEvents(aRequest) {
+  _maybeListenToEvents: function (aRequest) {
     // Break-on-DOMEvents is only supported in content debugging.
     let events = aRequest.pauseOnDOMEvents;
     if (this.global && events &&
@@ -979,7 +978,7 @@ ThreadActor.prototype = {
   /**
    * Handle a protocol request to resume execution of the debuggee.
    */
-  onResume: function TA_onResume(aRequest) {
+  onResume: function (aRequest) {
     if (this._state !== "paused") {
       return {
         error: "wrongState",
@@ -1161,7 +1160,7 @@ ThreadActor.prototype = {
   /**
    * Helper method that returns the next frame when stepping.
    */
-  _getNextStepFrame: function TA__getNextStepFrame(aFrame) {
+  _getNextStepFrame: function (aFrame) {
     let stepFrame = aFrame.reportedPop ? aFrame.older : aFrame;
     if (!stepFrame || !stepFrame.script) {
       stepFrame = null;
@@ -1169,7 +1168,7 @@ ThreadActor.prototype = {
     return stepFrame;
   },
 
-  onClientEvaluate: function TA_onClientEvaluate(aRequest) {
+  onClientEvaluate: function (aRequest) {
     if (this.state !== "paused") {
       return { error: "wrongState",
                message: "Debuggee must be paused to evaluate code." };
@@ -1205,7 +1204,7 @@ ThreadActor.prototype = {
     return packet;
   },
 
-  onFrames: function TA_onFrames(aRequest) {
+  onFrames: function (aRequest) {
     if (this.state !== "paused") {
       return { error: "wrongState",
                message: "Stack frames are only available while the debuggee is paused."};
@@ -1247,7 +1246,7 @@ ThreadActor.prototype = {
     });
   },
 
-  onReleaseMany: function TA_onReleaseMany(aRequest) {
+  onReleaseMany: function (aRequest) {
     if (!aRequest.actors) {
       return { error: "missingParameter",
                message: "no actors were specified" };
@@ -1271,7 +1270,7 @@ ThreadActor.prototype = {
   /**
    * Handle a protocol request to set a breakpoint.
    */
-  onSetBreakpoint: function TA_onSetBreakpoint(aRequest) {
+  onSetBreakpoint: function (aRequest) {
     if (this.state !== "paused") {
       return { error: "wrongState",
                message: "Breakpoints can only be set while the debuggee is paused."};
@@ -1355,7 +1354,7 @@ ThreadActor.prototype = {
    *        The location of the breakpoint (in the generated source, if source
    *        mapping).
    */
-  _setBreakpoint: function TA__setBreakpoint(aLocation) {
+  _setBreakpoint: function (aLocation) {
     let actor;
     let storedBp = this.breakpointStore.getBreakpoint(aLocation);
     if (storedBp.actor) {
@@ -1508,9 +1507,9 @@ ThreadActor.prototype = {
    *        A Map object which maps Debugger.Script instances to arrays of
    *        offset mappings. This is an out param.
    */
-  _findClosestOffsetMappings: function TA__findClosestOffsetMappings(aTargetLocation,
-                                                                     aScript,
-                                                                     aScriptsAndOffsetMappings) {
+  _findClosestOffsetMappings: function (aTargetLocation,
+                                        aScript,
+                                        aScriptsAndOffsetMappings) {
     // If we are given a column, we will try and break only at that location,
     // otherwise we will break anytime we get on that line.
 
@@ -1562,7 +1561,7 @@ ThreadActor.prototype = {
   /**
    * Get the script and source lists from the debugger.
    */
-  _discoverSources: function TA__discoverSources() {
+  _discoverSources: function () {
     // Only get one script per url.
     const sourcesToScripts = new Map();
     for (let s of this.dbg.findScripts()) {
@@ -1575,7 +1574,7 @@ ThreadActor.prototype = {
                 for (script of sourcesToScripts.values())]);
   },
 
-  onSources: function TA_onSources(aRequest) {
+  onSources: function (aRequest) {
     return this._discoverSources().then(() => {
       return {
         sources: [s.form() for (s of this.sources.iter())]
@@ -1601,7 +1600,7 @@ ThreadActor.prototype = {
   /**
    * Handle a protocol request to pause the debuggee.
    */
-  onInterrupt: function TA_onInterrupt(aRequest) {
+  onInterrupt: function (aRequest) {
     if (this.state == "exited") {
       return { type: "exited" };
     } else if (this.state == "paused") {
@@ -1641,7 +1640,7 @@ ThreadActor.prototype = {
   /**
    * Handle a protocol request to retrieve all the event listeners on the page.
    */
-  onEventListeners: function TA_onEventListeners(aRequest) {
+  onEventListeners: function (aRequest) {
     // This request is only supported in content debugging.
     if (!this.global) {
       return {
@@ -1694,7 +1693,7 @@ ThreadActor.prototype = {
   /**
    * Return the Debug.Frame for a frame mentioned by the protocol.
    */
-  _requestFrame: function TA_requestFrame(aFrameID) {
+  _requestFrame: function (aFrameID) {
     if (!aFrameID) {
       return this.youngestFrame;
     }
@@ -1706,7 +1705,7 @@ ThreadActor.prototype = {
     return undefined;
   },
 
-  _paused: function TA__paused(aFrame) {
+  _paused: function (aFrame) {
     // We don't handle nested pauses correctly.  Don't try - if we're
     // paused, just continue running whatever code triggered the pause.
     // We don't want to actually have nested pauses (although we
@@ -1773,7 +1772,7 @@ ThreadActor.prototype = {
     return packet;
   },
 
-  _resumed: function TA_resumed() {
+  _resumed: function () {
     this._state = "running";
 
     // Drop the actors in the pause actor pool.
@@ -1790,7 +1789,7 @@ ThreadActor.prototype = {
    *
    * @returns A list of actor IDs whose frames have been popped.
    */
-  _updateFrames: function TA_updateFrames() {
+  _updateFrames: function () {
     let popped = [];
 
     // Create the actor pool that will hold the still-living frames.
@@ -1819,7 +1818,7 @@ ThreadActor.prototype = {
     return popped;
   },
 
-  _createFrameActor: function TA_createFrameActor(aFrame) {
+  _createFrameActor: function (aFrame) {
     if (aFrame.actor) {
       return aFrame.actor;
     }
@@ -1843,7 +1842,7 @@ ThreadActor.prototype = {
    *         functions or functions scoped to a non-debuggee global.
    */
   createEnvironmentActor:
-  function TA_createEnvironmentActor(aEnvironment, aPool) {
+  function (aEnvironment, aPool) {
     if (!aEnvironment) {
       return undefined;
     }
@@ -1863,7 +1862,7 @@ ThreadActor.prototype = {
    * Create a grip for the given debuggee value.  If the value is an
    * object, will create an actor with the given lifetime.
    */
-  createValueGrip: function TA_createValueGrip(aValue, aPool=false) {
+  createValueGrip: function (aValue, aPool=false) {
     if (!aPool) {
       aPool = this._pausePool;
     }
@@ -1905,7 +1904,7 @@ ThreadActor.prototype = {
    * Debugger-provided completion value.
    */
   createProtocolCompletionValue:
-  function TA_createProtocolCompletionValue(aCompletion) {
+  function (aCompletion) {
     let protoValue = {};
     if ("return" in aCompletion) {
       protoValue.return = this.createValueGrip(aCompletion.return);
@@ -1927,7 +1926,7 @@ ThreadActor.prototype = {
    * @param aPool ActorPool
    *        The actor pool where the new object actor will be added.
    */
-  objectGrip: function TA_objectGrip(aValue, aPool) {
+  objectGrip: function (aValue, aPool) {
     if (!aPool.objectActors) {
       aPool.objectActors = new WeakMap();
     }
@@ -1950,7 +1949,7 @@ ThreadActor.prototype = {
    * @param aValue Debugger.Object
    *        The debuggee object value.
    */
-  pauseObjectGrip: function TA_pauseObjectGrip(aValue) {
+  pauseObjectGrip: function (aValue) {
     if (!this._pausePool) {
       throw "Object grip requested while not paused.";
     }
@@ -1964,7 +1963,7 @@ ThreadActor.prototype = {
    * @param aActor object
    *        The object actor.
    */
-  threadObjectGrip: function TA_threadObjectGrip(aActor) {
+  threadObjectGrip: function (aActor) {
     // We want to reuse the existing actor ID, so we just remove it from the
     // current pool's weak map and then let pool.addActor do the rest.
     aActor.registeredPool.objectActors.delete(aActor.obj);
@@ -1979,7 +1978,7 @@ ThreadActor.prototype = {
    * @param aRequest object
    *        The protocol request object.
    */
-  onThreadGrips: function OA_onThreadGrips(aRequest) {
+  onThreadGrips: function (aRequest) {
     if (this.state != "paused") {
       return { error: "wrongState" };
     }
@@ -2006,7 +2005,7 @@ ThreadActor.prototype = {
    * @param aPool ActorPool
    *        The actor pool where the new actor will be added.
    */
-  longStringGrip: function TA_longStringGrip(aString, aPool) {
+  longStringGrip: function (aString, aPool) {
     if (!aPool.longStringActors) {
       aPool.longStringActors = {};
     }
@@ -2027,7 +2026,7 @@ ThreadActor.prototype = {
    * @param aString String
    *        The string we are creating a grip for.
    */
-  pauseLongStringGrip: function TA_pauseLongStringGrip (aString) {
+  pauseLongStringGrip: function (aString) {
     return this.longStringGrip(aString, this._pausePool);
   },
 
@@ -2037,7 +2036,7 @@ ThreadActor.prototype = {
    * @param aString String
    *        The string we are creating a grip for.
    */
-  threadLongStringGrip: function TA_pauseLongStringGrip (aString) {
+  threadLongStringGrip: function (aString) {
     return this.longStringGrip(aString, this._threadLifetimePool);
   },
 
@@ -2048,7 +2047,7 @@ ThreadActor.prototype = {
    * @param aString String
    *        The string we are checking the length of.
    */
-  _stringIsLong: function TA__stringIsLong(aString) {
+  _stringIsLong: function (aString) {
     return aString.length >= DebuggerServer.LONG_STRING_LENGTH;
   },
 
@@ -2062,7 +2061,7 @@ ThreadActor.prototype = {
    * @param aException exception
    *        The exception that was thrown in the debugger code.
    */
-  uncaughtExceptionHook: function TA_uncaughtExceptionHook(aException) {
+  uncaughtExceptionHook: function (aException) {
     dumpn("Got an exception: " + aException.message + "\n" + aException.stack);
   },
 
@@ -2073,7 +2072,7 @@ ThreadActor.prototype = {
    * @param aFrame Debugger.Frame
    *        The stack frame that contained the debugger statement.
    */
-  onDebuggerStatement: function TA_onDebuggerStatement(aFrame) {
+  onDebuggerStatement: function (aFrame) {
     // Don't pause if we are currently stepping (in or over) or the frame is
     // black-boxed.
     const generatedLocation = getFrameLocation(aFrame);
@@ -2094,7 +2093,7 @@ ThreadActor.prototype = {
    * @param aValue object
    *        The exception that was thrown.
    */
-  onExceptionUnwind: function TA_onExceptionUnwind(aFrame, aValue) {
+  onExceptionUnwind: function (aFrame, aValue) {
     let willBeCaught = false;
     for (let frame = aFrame; frame != null; frame = frame.older) {
       if (frame.script.isInCatchScope(frame.offset)) {
@@ -2142,12 +2141,12 @@ ThreadActor.prototype = {
    * @param aGlobal Debugger.Object
    *        A Debugger.Object instance whose referent is the global object.
    */
-  onNewScript: function TA_onNewScript(aScript, aGlobal) {
+  onNewScript: function (aScript, aGlobal) {
     this._addScript(aScript);
     this.sources.sourcesForScript(aScript);
   },
 
-  onNewSource: function TA_onNewSource(aSource) {
+  onNewSource: function (aSource) {
     this.conn.send({
       from: this.actorID,
       type: "newSource",
@@ -2163,7 +2162,7 @@ ThreadActor.prototype = {
    *        The url of the script's source that will be stored.
    * @returns true, if the script can be added, false otherwise.
    */
-  _allowSource: function TA__allowSource(aSourceUrl) {
+  _allowSource: function (aSourceUrl) {
     // Ignore anything we don't have a URL for (eval scripts, for example).
     if (!aSourceUrl)
       return false;
@@ -2181,7 +2180,7 @@ ThreadActor.prototype = {
   /**
    * Restore any pre-existing breakpoints to the scripts that we have access to.
    */
-  _restoreBreakpoints: function TA__restoreBreakpoints() {
+  _restoreBreakpoints: function () {
     for (let s of this.dbg.findScripts()) {
       this._addScript(s);
     }
@@ -2194,7 +2193,7 @@ ThreadActor.prototype = {
    *        The source script that will be stored.
    * @returns true, if the script was added; false otherwise.
    */
-  _addScript: function TA__addScript(aScript) {
+  _addScript: function (aScript) {
     if (!this._allowSource(aScript.url)) {
       return false;
     }
@@ -2220,7 +2219,7 @@ ThreadActor.prototype = {
   /**
    * Get prototypes and properties of multiple objects.
    */
-  onPrototypesAndProperties: function TA_onPrototypesAndProperties(aRequest) {
+  onPrototypesAndProperties: function (aRequest) {
     let result = {};
     for (let actorID of aRequest.actors) {
       // This code assumes that there are no lazily loaded actors returned
@@ -2300,7 +2299,7 @@ function PauseScopedActor()
  * @param aMethod Function
  *        The function we are decorating.
  */
-PauseScopedActor.withPaused = function PSA_withPaused(aMethod) {
+PauseScopedActor.withPaused = function (aMethod) {
   return function () {
     if (this.isPaused()) {
       return aMethod.apply(this, arguments);
@@ -2315,7 +2314,7 @@ PauseScopedActor.prototype = {
   /**
    * Returns true if we are in the paused state.
    */
-  isPaused: function PSA_isPaused() {
+  isPaused: function () {
     // When there is not a ThreadActor available (like in the webconsole) we
     // have to be optimistic and assume that we are paused so that we can
     // respond to requests.
@@ -2325,7 +2324,7 @@ PauseScopedActor.prototype = {
   /**
    * Returns the wrongState response packet for this actor.
    */
-  _wrongState: function PSA_wrongState() {
+  _wrongState: function () {
     return {
       error: "wrongState",
       message: this.constructor.name +
@@ -2391,7 +2390,7 @@ SourceActor.prototype = {
     return this.threadActor.prettyPrintWorker;
   },
 
-  form: function SA_form() {
+  form: function () {
     return {
       actor: this.actorID,
       url: this._url,
@@ -2401,13 +2400,13 @@ SourceActor.prototype = {
     };
   },
 
-  disconnect: function SA_disconnect() {
+  disconnect: function () {
     if (this.registeredPool && this.registeredPool.sourceActors) {
       delete this.registeredPool.sourceActors[this.actorID];
     }
   },
 
-  _getSourceText: function SA__getSourceText() {
+  _getSourceText: function () {
     const toResolvedContent = t => resolve({
       content: t,
       contentType: this._contentType
@@ -2431,7 +2430,7 @@ SourceActor.prototype = {
   /**
    * Handler for the "source" packet.
    */
-  onSource: function SA_onSource() {
+  onSource: function () {
     return resolve(this._init)
       .then(this._getSourceText)
       .then(({ content, contentType }) => {
@@ -2491,7 +2490,7 @@ SourceActor.prototype = {
    *          is resolved with `{ code, mappings }` where `code` is the pretty
    *          printed code, and `mappings` is an array of source mappings.
    */
-  _sendToPrettyPrintWorker: function SA__sendToPrettyPrintWorker(aIndent) {
+  _sendToPrettyPrintWorker: function (aIndent) {
     return ({ content }) => {
       const deferred = promise.defer();
       const id = Math.random();
@@ -2529,7 +2528,7 @@ SourceActor.prototype = {
    *
    * Note that the source map is modified in place.
    */
-  _invertSourceMap: function SA__invertSourceMap({ code, mappings }) {
+  _invertSourceMap: function ({ code, mappings }) {
     const generator = new SourceMapGenerator({ file: this._url });
     return DevToolsUtils.yieldingEach(mappings, m => {
       let mapping = {
@@ -2586,7 +2585,7 @@ SourceActor.prototype = {
    * pretty printing a source mapped source, we need to compose the existing
    * source map with our new one.
    */
-  _saveMap: function SA__saveMap({ map }) {
+  _saveMap: function ({ map }) {
     if (this._sourceMap) {
       // Compose the source maps
       this._oldSourceMap = this._sourceMap;
@@ -2604,7 +2603,7 @@ SourceActor.prototype = {
   /**
    * Handler for the "disablePrettyPrint" packet.
    */
-  onDisablePrettyPrint: function SA_onDisablePrettyPrint() {
+  onDisablePrettyPrint: function () {
     this._sourceMap = this._oldSourceMap;
     this.threadActor.sources.saveSourceMap(this._sourceMap,
                                            this._generatedSource || this._url);
@@ -2615,7 +2614,7 @@ SourceActor.prototype = {
   /**
    * Handler for the "blackbox" packet.
    */
-  onBlackBox: function SA_onBlackBox(aRequest) {
+  onBlackBox: function (aRequest) {
     this.threadActor.sources.blackBox(this.url);
     let packet = {
       from: this.actorID
@@ -2631,7 +2630,7 @@ SourceActor.prototype = {
   /**
    * Handler for the "unblackbox" packet.
    */
-  onUnblackBox: function SA_onUnblackBox(aRequest) {
+  onUnblackBox: function (aRequest) {
     this.threadActor.sources.unblackBox(this.url);
     return {
       from: this.actorID
@@ -2670,7 +2669,7 @@ ObjectActor.prototype = {
   /**
    * Returns a grip for this actor for returning in a protocol message.
    */
-  grip: function OA_grip() {
+  grip: function () {
     let g = {
       "type": "object",
       "class": this.obj.class,
@@ -2715,7 +2714,7 @@ ObjectActor.prototype = {
   /**
    * Releases this actor from the pool.
    */
-  release: function OA_release() {
+  release: function () {
     if (this.registeredPool.objectActors) {
       this.registeredPool.objectActors.delete(this.obj);
     }
@@ -2725,7 +2724,7 @@ ObjectActor.prototype = {
   /**
    * Force the magic Error properties to appear.
    */
-  _forceMagicProperties: function OA__forceMagicProperties() {
+  _forceMagicProperties: function () {
     if (this._forcedMagicProps) {
       return;
     }
@@ -2750,7 +2749,7 @@ ObjectActor.prototype = {
    * @param aRequest object
    *        The protocol request object.
    */
-  onOwnPropertyNames: function OA_onOwnPropertyNames(aRequest) {
+  onOwnPropertyNames: function (aRequest) {
     this._forceMagicProperties();
     return { from: this.actorID,
              ownPropertyNames: this.obj.getOwnPropertyNames() };
@@ -2763,7 +2762,7 @@ ObjectActor.prototype = {
    * @param aRequest object
    *        The protocol request object.
    */
-  onPrototypeAndProperties: function OA_onPrototypeAndProperties(aRequest) {
+  onPrototypeAndProperties: function (aRequest) {
     this._forceMagicProperties();
     let ownProperties = Object.create(null);
     let names;
@@ -2797,7 +2796,7 @@ ObjectActor.prototype = {
    *         An object that maps property names to safe getter descriptors as
    *         defined by the remote debugging protocol.
    */
-  _findSafeGetterValues: function OA__findSafeGetterValues(aOwnProperties)
+  _findSafeGetterValues: function (aOwnProperties)
   {
     let safeGetterValues = Object.create(null);
     let obj = this.obj;
@@ -2865,7 +2864,7 @@ ObjectActor.prototype = {
    *         A Set of names of safe getters. This result is cached for each
    *         Debugger.Object.
    */
-  _findSafeGetters: function OA__findSafeGetters(aObject)
+  _findSafeGetters: function (aObject)
   {
     if (aObject._safeGetters) {
       return aObject._safeGetters;
@@ -2901,7 +2900,7 @@ ObjectActor.prototype = {
    * @param aRequest object
    *        The protocol request object.
    */
-  onPrototype: function OA_onPrototype(aRequest) {
+  onPrototype: function (aRequest) {
     return { from: this.actorID,
              prototype: this.threadActor.createValueGrip(this.obj.proto) };
   },
@@ -2913,7 +2912,7 @@ ObjectActor.prototype = {
    * @param aRequest object
    *        The protocol request object.
    */
-  onProperty: function OA_onProperty(aRequest) {
+  onProperty: function (aRequest) {
     if (!aRequest.name) {
       return { error: "missingParameter",
                message: "no property name was specified" };
@@ -2929,7 +2928,7 @@ ObjectActor.prototype = {
    * @param aRequest object
    *        The protocol request object.
    */
-  onDisplayString: function OA_onDisplayString(aRequest) {
+  onDisplayString: function (aRequest) {
     let toString;
     try {
       // Attempt to locate the object's "toString" method.
@@ -2967,7 +2966,7 @@ ObjectActor.prototype = {
    * @param string aName
    *        The property that the descriptor is generated for.
    */
-  _propertyDescriptor: function OA_propertyDescriptor(aName) {
+  _propertyDescriptor: function (aName) {
     let desc;
     try {
       desc = this.obj.getOwnPropertyDescriptor(aName);
@@ -3012,7 +3011,7 @@ ObjectActor.prototype = {
    * @param aRequest object
    *        The protocol request object.
    */
-  onDecompile: function OA_onDecompile(aRequest) {
+  onDecompile: function (aRequest) {
     if (this.obj.class !== "Function") {
       return { error: "objectNotFunction",
                message: "decompile request is only valid for object grips " +
@@ -3029,7 +3028,7 @@ ObjectActor.prototype = {
    * @param aRequest object
    *        The protocol request object.
    */
-  onParameterNames: function OA_onParameterNames(aRequest) {
+  onParameterNames: function (aRequest) {
     if (this.obj.class !== "Function") {
       return { error: "objectNotFunction",
                message: "'parameterNames' request is only valid for object " +
@@ -3045,7 +3044,7 @@ ObjectActor.prototype = {
    * @param aRequest object
    *        The protocol request object.
    */
-  onRelease: function OA_onRelease(aRequest) {
+  onRelease: function (aRequest) {
     this.release();
     return {};
   },
@@ -3056,7 +3055,7 @@ ObjectActor.prototype = {
    * @param aRequest object
    *        The protocol request object.
    */
-  onScope: function OA_onScope(aRequest) {
+  onScope: function (aRequest) {
     if (this.obj.class !== "Function") {
       return { error: "objectNotFunction",
                message: "scope request is only valid for object grips with a" +
@@ -3127,7 +3126,7 @@ update(PauseScopedObjectActor.prototype, {
    * @param aRequest object
    *        The protocol request object.
    */
-  onThreadGrip: PauseScopedActor.withPaused(function OA_onThreadGrip(aRequest) {
+  onThreadGrip: PauseScopedActor.withPaused(function (aRequest) {
     this.threadActor.threadObjectGrip(this);
     return {};
   }),
@@ -3138,7 +3137,7 @@ update(PauseScopedObjectActor.prototype, {
    * @param aRequest object
    *        The protocol request object.
    */
-  onRelease: PauseScopedActor.withPaused(function OA_onRelease(aRequest) {
+  onRelease: PauseScopedActor.withPaused(function (aRequest) {
     if (this.registeredPool !== this.threadActor.threadLifetimePool) {
       return { error: "notReleasable",
                message: "Only thread-lifetime actors can be released." };
@@ -3171,7 +3170,7 @@ LongStringActor.prototype = {
 
   actorPrefix: "longString",
 
-  disconnect: function LSA_disconnect() {
+  disconnect: function () {
     // Because longStringActors is not a weak map, we won't automatically leave
     // it so we need to manually leave on disconnect so that we don't leak
     // memory.
@@ -3183,7 +3182,7 @@ LongStringActor.prototype = {
   /**
    * Returns a grip for this actor for returning in a protocol message.
    */
-  grip: function LSA_grip() {
+  grip: function () {
     return {
       "type": "longString",
       "initial": this.string.substring(
@@ -3199,7 +3198,7 @@ LongStringActor.prototype = {
    * @param aRequest object
    *        The protocol request object.
    */
-  onSubstring: function LSA_onSubString(aRequest) {
+  onSubstring: function (aRequest) {
     return {
       "from": this.actorID,
       "substring": this.string.substring(aRequest.start, aRequest.end)
@@ -3209,7 +3208,7 @@ LongStringActor.prototype = {
   /**
    * Handle a request to release this LongStringActor instance.
    */
-  onRelease: function LSA_onRelease() {
+  onRelease: function () {
     // TODO: also check if registeredPool === threadActor.threadLifetimePool
     // when the web console moves aray from manually releasing pause-scoped
     // actors.
@@ -3260,7 +3259,7 @@ FrameActor.prototype = {
    * Finalization handler that is called when the actor is being evicted from
    * the pool.
    */
-  disconnect: function FA_disconnect() {
+  disconnect: function () {
     this.conn.removeActorPool(this._frameLifetimePool);
     this._frameLifetimePool = null;
   },
@@ -3268,7 +3267,7 @@ FrameActor.prototype = {
   /**
    * Returns a frame form for use in a protocol message.
    */
-  form: function FA_form() {
+  form: function () {
     let form = { actor: this.actorID,
                  type: this.frame.type };
     if (this.frame.type === "call") {
@@ -3294,7 +3293,7 @@ FrameActor.prototype = {
     return form;
   },
 
-  _args: function FA__args() {
+  _args: function () {
     if (!this.frame.arguments) {
       return [];
     }
@@ -3309,7 +3308,7 @@ FrameActor.prototype = {
    * @param aRequest object
    *        The protocol request object.
    */
-  onPop: function FA_onPop(aRequest) {
+  onPop: function (aRequest) {
     // TODO: remove this when Debugger.Frame.prototype.pop is implemented
     if (typeof this.frame.pop != "function") {
       return { error: "notImplemented",
@@ -3361,7 +3360,7 @@ BreakpointActor.prototype = {
    * @param ThreadActor aThreadActor
    *        The parent thread actor that contains this breakpoint.
    */
-  addScript: function BA_addScript(aScript, aThreadActor) {
+  addScript: function (aScript, aThreadActor) {
     this.threadActor = aThreadActor;
     this.scripts.push(aScript);
   },
@@ -3382,7 +3381,7 @@ BreakpointActor.prototype = {
    * @param aFrame Debugger.Frame
    *        The stack frame that contained the breakpoint.
    */
-  hit: function BA_hit(aFrame) {
+  hit: function (aFrame) {
     // Don't pause if we are currently stepping (in or over) or the frame is
     // black-boxed.
     let { url } = this.threadActor.synchronize(
@@ -3413,7 +3412,7 @@ BreakpointActor.prototype = {
    * @param aRequest object
    *        The protocol request object.
    */
-  onDelete: function BA_onDelete(aRequest) {
+  onDelete: function (aRequest) {
     // Remove from the breakpoint store.
     this.threadActor.breakpointStore.removeBreakpoint(this.location);
     this.threadActor._hooks.removeFromParentPool(this);
@@ -3450,7 +3449,7 @@ EnvironmentActor.prototype = {
   /**
    * Return an environment form for use in a protocol message.
    */
-  form: function EA_form() {
+  form: function () {
     let form = { actor: this.actorID };
 
     // What is this environment's type?
@@ -3490,7 +3489,7 @@ EnvironmentActor.prototype = {
    * Return the identifier bindings object as required by the remote protocol
    * specification.
    */
-  _bindings: function EA_bindings() {
+  _bindings: function () {
     let bindings = { arguments: [], variables: {} };
 
     // TODO: this part should be removed in favor of the commented-out part
@@ -3579,7 +3578,7 @@ EnvironmentActor.prototype = {
    * @param aRequest object
    *        The protocol request object.
    */
-  onAssign: function EA_onAssign(aRequest) {
+  onAssign: function (aRequest) {
     // TODO: enable the commented-out part when getVariableDescriptor lands
     // (bug 725815).
     /*let desc = this.obj.getVariableDescriptor(aRequest.name);
@@ -3607,7 +3606,7 @@ EnvironmentActor.prototype = {
    * @param aRequest object
    *        The protocol request object.
    */
-  onBindings: function EA_onBindings(aRequest) {
+  onBindings: function (aRequest) {
     return { from: this.actorID,
              bindings: this._bindings() };
   }
@@ -3696,7 +3695,7 @@ update(ChromeDebuggerActor.prototype, {
    * before use.
    */
   globalManager: {
-    findGlobals: function CDA_findGlobals() {
+    findGlobals: function () {
       // Add every global known to the debugger as debuggee.
       this.dbg.addAllGlobalsAsDebuggees();
     },
@@ -3708,7 +3707,7 @@ update(ChromeDebuggerActor.prototype, {
      * @param aGlobal Debugger.Object
      *        The new global object that was created.
      */
-    onNewGlobal: function CDA_onNewGlobal(aGlobal) {
+    onNewGlobal: function (aGlobal) {
       this.addDebuggee(aGlobal);
       // Notify the client.
       this.conn.send({
@@ -3772,8 +3771,7 @@ ThreadSources.prototype = {
    *        The content type of the source, if immediately available.
    * @returns a SourceActor representing the source at aURL or null.
    */
-  source: function TS_source({ url, sourceMap, generatedSource, text,
-                               contentType }) {
+  source: function ({ url, sourceMap, generatedSource, text, contentType }) {
     if (!this._allow(url)) {
       return null;
     }
@@ -3803,7 +3801,7 @@ ThreadSources.prototype = {
   /**
    * Only to be used when we aren't source mapping.
    */
-  _sourceForScript: function TS__sourceForScript(aScript) {
+  _sourceForScript: function (aScript) {
     const spec = {
       url: aScript.url
     };
@@ -3837,7 +3835,7 @@ ThreadSources.prototype = {
    * use it to find all of |aScript|'s *original* sources; return a promise
    * of an array of source actors for those.
    */
-  sourcesForScript: function TS_sourcesForScript(aScript) {
+  sourcesForScript: function (aScript) {
     if (!this._useSourceMaps || !aScript.sourceMapURL) {
       return resolve([this._sourceForScript(aScript)].filter(isNotNull));
     }
@@ -3864,7 +3862,7 @@ ThreadSources.prototype = {
    * |aScript|; if we already have such a promise extant, return that.
    * |aScript| must have a non-null sourceMapURL.
    */
-  sourceMap: function TS_sourceMap(aScript) {
+  sourceMap: function (aScript) {
     dbg_assert(aScript.sourceMapURL, "Script should have a sourceMapURL");
     let sourceMapURL = this._normalize(aScript.sourceMapURL, aScript.url);
     let map = this._fetchSourceMap(sourceMapURL, aScript.url)
@@ -3877,7 +3875,7 @@ ThreadSources.prototype = {
    * Save the given source map so that we can use it to query source locations
    * down the line.
    */
-  saveSourceMap: function TS_saveSourceMap(aSourceMap, aGeneratedSource) {
+  saveSourceMap: function (aSourceMap, aGeneratedSource) {
     if (!aSourceMap) {
       delete this._sourceMapsByGeneratedSource[aGeneratedSource];
       return null;
@@ -3902,7 +3900,7 @@ ThreadSources.prototype = {
    *        source map, and the source map's sources are relative, we resolve
    *        them from aScriptURL.
    */
-  _fetchSourceMap: function TS__fetchSourceMap(aAbsSourceMapURL, aScriptURL) {
+  _fetchSourceMap: function (aAbsSourceMapURL, aScriptURL) {
     return fetch(aAbsSourceMapURL, { loadFromCache: false })
       .then(({ content }) => {
         let map = new SourceMapConsumer(content);
@@ -3914,8 +3912,7 @@ ThreadSources.prototype = {
   /**
    * Sets the source map's sourceRoot to be relative to the source map url.
    */
-  _setSourceMapRoot: function TS__setSourceMapRoot(aSourceMap, aAbsSourceMapURL,
-                                                   aScriptURL) {
+  _setSourceMapRoot: function (aSourceMap, aAbsSourceMapURL, aScriptURL) {
     const base = this._dirname(
       aAbsSourceMapURL.indexOf("data:") === 0
         ? aScriptURL
@@ -3925,7 +3922,7 @@ ThreadSources.prototype = {
       : base;
   },
 
-  _dirname: function TS__dirname(aPath) {
+  _dirname: function (aPath) {
     return Services.io.newURI(
       ".", null, Services.io.newURI(aPath, null, null)).spec;
   },
@@ -3934,7 +3931,7 @@ ThreadSources.prototype = {
    * Returns a promise of the location in the original source if the source is
    * source mapped, otherwise a promise of the same location.
    */
-  getOriginalLocation: function TS_getOriginalLocation({ url, line, column }) {
+  getOriginalLocation: function ({ url, line, column }) {
     if (url in this._sourceMapsByGeneratedSource) {
       return this._sourceMapsByGeneratedSource[url]
         .then((aSourceMap) => {
@@ -3973,7 +3970,7 @@ ThreadSources.prototype = {
    * the tables this function uses; thus, it won't know that S's original
    * source URLs map to S until P is resolved.
    */
-  getGeneratedLocation: function TS_getGeneratedLocation({ url, line, column }) {
+  getGeneratedLocation: function ({ url, line, column }) {
     if (url in this._sourceMapsByOriginalSource) {
       return this._sourceMapsByOriginalSource[url]
         .then((aSourceMap) => {
@@ -4005,7 +4002,7 @@ ThreadSources.prototype = {
    *        The URL of the source which we are checking whether it is black
    *        boxed or not.
    */
-  isBlackBoxed: function TS_isBlackBoxed(aURL) {
+  isBlackBoxed: function (aURL) {
     return ThreadSources._blackBoxedSources.has(aURL);
   },
 
@@ -4015,7 +4012,7 @@ ThreadSources.prototype = {
    * @param aURL String
    *        The URL of the source which we are black boxing.
    */
-  blackBox: function TS_blackBox(aURL) {
+  blackBox: function (aURL) {
     ThreadSources._blackBoxedSources.add(aURL);
   },
 
@@ -4025,7 +4022,7 @@ ThreadSources.prototype = {
    * @param aURL String
    *        The URL of the source which we are no longer black boxing.
    */
-  unblackBox: function TS_unblackBox(aURL) {
+  unblackBox: function (aURL) {
     ThreadSources._blackBoxedSources.delete(aURL);
   },
 
@@ -4035,7 +4032,7 @@ ThreadSources.prototype = {
    * @param aURL String
    *        The URL of the source that might be pretty printed.
    */
-  isPrettyPrinted: function TS_isPrettyPrinted(aURL) {
+  isPrettyPrinted: function (aURL) {
     return ThreadSources._prettyPrintedSources.has(aURL);
   },
 
@@ -4045,14 +4042,14 @@ ThreadSources.prototype = {
    * @param aURL String
    *        The URL of the source to be pretty printed.
    */
-  prettyPrint: function TS_prettyPrint(aURL, aIndent) {
+  prettyPrint: function (aURL, aIndent) {
     ThreadSources._prettyPrintedSources.set(aURL, aIndent);
   },
 
   /**
    * Return the indent the given URL was pretty printed by.
    */
-  prettyPrintIndent: function TS_prettyPrintIndent(aURL) {
+  prettyPrintIndent: function (aURL) {
     return ThreadSources._prettyPrintedSources.get(aURL);
   },
 
@@ -4062,14 +4059,14 @@ ThreadSources.prototype = {
    * @param aURL String
    *        The URL of the source that is no longer pretty printed.
    */
-  disablePrettyPrint: function TS_disablePrettyPrint(aURL) {
+  disablePrettyPrint: function (aURL) {
     ThreadSources._prettyPrintedSources.delete(aURL);
   },
 
   /**
    * Normalize multiple relative paths towards the base paths on the right.
    */
-  _normalize: function TS__normalize(...aURLs) {
+  _normalize: function (...aURLs) {
     dbg_assert(aURLs.length > 1, "Should have more than 1 URL");
     let base = Services.io.newURI(aURLs.pop(), null, null);
     let url;
@@ -4079,7 +4076,7 @@ ThreadSources.prototype = {
     return base.spec;
   },
 
-  iter: function TS_iter() {
+  iter: function () {
     for (let url in this._sourceActors) {
       yield this._sourceActors[url];
     }
diff --git a/widget/windows/winrt/MetroInput.cpp b/widget/windows/winrt/MetroInput.cpp
index 65947328f780..2164fb3846cc 100644
--- a/widget/windows/winrt/MetroInput.cpp
+++ b/widget/windows/winrt/MetroInput.cpp
@@ -178,7 +178,12 @@ namespace {
   {
     nsTArray<nsRefPtr<Touch> > *touches =
               static_cast<nsTArray<nsRefPtr<Touch> > *>(aTouchList);
-    touches->AppendElement(aData);
+    nsRefPtr<Touch> copy = new Touch(aData->mIdentifier,
+               aData->mRefPoint,
+               aData->mRadius,
+               aData->mRotationAngle,
+               aData->mForce);
+    touches->AppendElement(copy);
     aData->mChanged = false;
     return PL_DHASH_NEXT;
   }
@@ -441,10 +446,6 @@ MetroInput::InitTouchEventTouchList(WidgetTouchEvent* aEvent)
 bool
 MetroInput::ShouldDeliverInputToRecognizer()
 {
-  // If the event is destined for chrome deliver all events to the recognizer.
-  if (mChromeHitTestCacheForTouch) {
-    return true;
-  }
   return mRecognizerWantsEvents;
 }
 
@@ -1150,6 +1151,7 @@ MetroInput::DeliverNextQueuedTouchEvent()
       // the touch block for content.
       if (mContentConsumingTouch) {
         mWidget->ApzContentConsumingTouch();
+        DispatchTouchCancel(event);
       } else {
         mWidget->ApzContentIgnoringTouch();
       }
@@ -1194,8 +1196,7 @@ MetroInput::DispatchTouchCancel(WidgetTouchEvent* aEvent)
   MOZ_ASSERT(aEvent);
   // Send a touchcancel for each pointer id we have a corresponding start
   // for. Note we can't rely on mTouches here since touchends remove points
-  // from it. The only time we end up in here is if the apz is consuming
-  // events, so this array shouldn't be very large.
+  // from it.
   WidgetTouchEvent touchEvent(true, NS_TOUCH_CANCEL, mWidget.Get());
   nsTArray< nsRefPtr<dom::Touch> >& touches = aEvent->touches;
   for (uint32_t i = 0; i < touches.Length(); ++i) {
@@ -1213,9 +1214,13 @@ MetroInput::DispatchTouchCancel(WidgetTouchEvent* aEvent)
   if (!touchEvent.touches.Length()) {
     return;
   }
-
-  DUMP_TOUCH_IDS("DOM(4)", &touchEvent);
-  mWidget->DispatchEvent(&touchEvent, sThrowawayStatus);
+  if (mContentConsumingTouch) {
+    DUMP_TOUCH_IDS("APZC(3)", &touchEvent);
+    mWidget->ApzReceiveInputEvent(&touchEvent);
+  } else {
+    DUMP_TOUCH_IDS("DOM(5)", &touchEvent);
+    mWidget->DispatchEvent(&touchEvent, sThrowawayStatus);
+  }
 }
 
 void
diff --git a/xpcom/io/nsLocalFileWin.cpp b/xpcom/io/nsLocalFileWin.cpp
index 6ce411c16069..c8cd7911f159 100644
--- a/xpcom/io/nsLocalFileWin.cpp
+++ b/xpcom/io/nsLocalFileWin.cpp
@@ -48,6 +48,7 @@
 #include "nsTraceRefcntImpl.h"
 #include "nsXPCOMCIDInternal.h"
 #include "nsThreadUtils.h"
+#include "nsXULAppAPI.h"
 
 using namespace mozilla;
 
@@ -204,7 +205,9 @@ private:
         SHELLEXECUTEINFOW seinfo;
         memset(&seinfo, 0, sizeof(seinfo));
         seinfo.cbSize = sizeof(SHELLEXECUTEINFOW);
-        seinfo.fMask  = 0;
+        if (XRE_GetWindowsEnvironment() == WindowsEnvironmentType_Metro) {
+          seinfo.fMask  = SEE_MASK_FLAG_LOG_USAGE;
+        }
         seinfo.hwnd   = nullptr;
         seinfo.lpVerb = nullptr;
         seinfo.lpFile = mResolvedPath.get();