From f5c979d319202562e9eaefe6afbf7edbf6b67674 Mon Sep 17 00:00:00 2001
From: Mark Banner <standard8@mozilla.com>
Date: Thu, 30 Apr 2015 07:40:49 +0100
Subject: [PATCH 01/88] Bug 1158112 - Move the Loop modules into a
 sub-directory and prepare eslint for enabling more rules for Loop. r=dmose

---
 browser/components/loop/.eslintignore         | 10 ++-
 browser/components/loop/.eslintrc             | 90 +++++++++----------
 browser/components/loop/content/js/.eslintrc  | 15 ++++
 .../components/loop/content/shared/.eslintrc  | 14 ---
 browser/components/loop/modules/.eslintrc     | 17 ++++
 .../loop/{ => modules}/CardDavImporter.jsm    |  0
 .../loop/{ => modules}/GoogleImporter.jsm     |  0
 .../loop/{ => modules}/LoopCalls.jsm          |  0
 .../loop/{ => modules}/LoopContacts.jsm       |  0
 .../loop/{ => modules}/LoopRooms.jsm          |  0
 .../loop/{ => modules}/LoopStorage.jsm        |  0
 .../loop/{ => modules}/MozLoopAPI.jsm         |  0
 .../loop/{ => modules}/MozLoopPushHandler.jsm |  0
 .../loop/{ => modules}/MozLoopService.jsm     |  0
 .../loop/{ => modules}/MozLoopWorker.js       |  0
 browser/components/loop/moz.build             | 20 ++---
 browser/components/loop/standalone/.eslintrc  | 14 ---
 .../components/loop/standalone/package.json   |  4 +-
 browser/components/loop/test/.eslintrc        |  7 ++
 19 files changed, 98 insertions(+), 93 deletions(-)
 create mode 100644 browser/components/loop/content/js/.eslintrc
 delete mode 100644 browser/components/loop/content/shared/.eslintrc
 create mode 100644 browser/components/loop/modules/.eslintrc
 rename browser/components/loop/{ => modules}/CardDavImporter.jsm (100%)
 rename browser/components/loop/{ => modules}/GoogleImporter.jsm (100%)
 rename browser/components/loop/{ => modules}/LoopCalls.jsm (100%)
 rename browser/components/loop/{ => modules}/LoopContacts.jsm (100%)
 rename browser/components/loop/{ => modules}/LoopRooms.jsm (100%)
 rename browser/components/loop/{ => modules}/LoopStorage.jsm (100%)
 rename browser/components/loop/{ => modules}/MozLoopAPI.jsm (100%)
 rename browser/components/loop/{ => modules}/MozLoopPushHandler.jsm (100%)
 rename browser/components/loop/{ => modules}/MozLoopService.jsm (100%)
 rename browser/components/loop/{ => modules}/MozLoopWorker.js (100%)
 delete mode 100644 browser/components/loop/standalone/.eslintrc
 create mode 100644 browser/components/loop/test/.eslintrc

diff --git a/browser/components/loop/.eslintignore b/browser/components/loop/.eslintignore
index 33359955167..c3a825f5e59 100644
--- a/browser/components/loop/.eslintignore
+++ b/browser/components/loop/.eslintignore
@@ -1,7 +1,9 @@
-# We still need to fix warnings in this file.
-MozLoopWorker.js
-# This file currently uses es7 features
-MozLoopAPI.jsm
+# This file currently uses a non-standard (and not on a standards track)
+# if statement within catch.
+modules/MozLoopWorker.js
+# This file currently uses es7 features eslint issue:
+# https://github.com/eslint/espree/issues/125
+modules/MozLoopAPI.jsm
 # Libs we don't need to check
 content/libs
 content/shared/libs
diff --git a/browser/components/loop/.eslintrc b/browser/components/loop/.eslintrc
index 607babeaa46..783d58657e7 100644
--- a/browser/components/loop/.eslintrc
+++ b/browser/components/loop/.eslintrc
@@ -1,3 +1,5 @@
+// Note: there are extra allowances for files used solely in Firefox desktop,
+// see content/js/.eslintrc and modules/.eslintrc
 {
   "plugins": [
     "react"
@@ -5,18 +7,6 @@
   "ecmaFeatures": {
     "forOf": true,
     "jsx": true,
-    // These are on for this directory for .jsm and content/js files.
-    // If adding more items here, consider turning them off for the following
-    // files if they aren't supported by all browsers.
-    // content/shared/.eslintrc
-    // content/standalone/.eslintrc
-    "blockBindings": true,
-    "arrowFunctions": true,
-    "destructuring": true,
-    "generators": true,
-    "spread": true,
-    "restParams": true,
-    "objectLiteralShorthandMethods": true
   },
   "env": {
     "browser": true,
@@ -43,49 +33,50 @@
     // problems they find, one at a time.
 
     // Eslint built-in rules are documented at <http://eslint.org/docs/rules/>
-    "camelcase": 0,
-    "comma-dangle": 0,
-    "comma-spacing": 0,
-    "consistent-return": 0,
-    "curly": 0,
-    "dot-notation": 0,
-    "eol-last": 0,
-    "eqeqeq": 0,
-    "global-strict": 0,
-    "key-spacing": 0,
-    "new-cap": 0,
-    "no-catch-shadow": 0,
-    "no-console": 0,
-    "no-empty": 0,
-    "no-extra-bind": 0,
-    "no-extra-boolean-cast": 0,
-    "no-extra-semi": 0,
-    "no-multi-spaces": 0,
-    "no-new": 0,
-    "no-redeclare": 0,
-    "no-return-assign": 0,
-    "no-shadow": 0,
-    "no-spaced-func": 0,
-    "no-trailing-spaces": 0,
-    "no-undef": 0,
-    "no-underscore-dangle": 0,
-    "no-unused-expressions": 0,
-    "no-unused-vars": 0,
-    "no-use-before-define": 0,
-    "no-wrap-func": 0,
-    "quotes": 0,
-    "semi": 0,
-    "semi-spacing": 0,
-    "space-infix-ops": 0,
-    "space-return-throw-case": 0,
-    "strict": 0,
-    "yoda": 0,
+    "camelcase": 0,               // TODO: Remove (use default)
+    "comma-dangle": 0,            // TODO: Remove (use default)
+    "comma-spacing": 0,           // TODO: Remove (use default)
+    "consistent-return": 0,       // TODO: Remove (use default)
+    "curly": 0,                   // TODO: Remove (use default)
+    "dot-notation": 0,            // TODO: Remove (use default)
+    "eol-last": 0,                // TODO: Remove (use default)
+    "eqeqeq": 0,                  // TBD. Might need to be separate for content & chrome
+    "global-strict": 0,           // Leave as zero (this will be unsupported in eslint 1.0.0)
+    "key-spacing": 0,             // TODO: Remove (use default)
+    "new-cap": 0,                 // TODO: Remove (use default)
+    "no-catch-shadow": 0,         // TODO: Remove (use default)
+    "no-console": 0,              // Leave as 0. We use console logging in content code.
+    "no-empty": 0,                // TODO: Remove (use default)
+    "no-extra-bind": 0,           // Leave as 0
+    "no-extra-boolean-cast": 0,   // TODO: Remove (use default)
+    "no-extra-semi": 0,           // TODO: Remove (use default)
+    "no-multi-spaces": 0,         // TBD.
+    "no-new": 0,                  // TODO: Remove (use default)
+    "no-redeclare": 0,            // TODO: Remove (use default)
+    "no-return-assign": 0,        // TODO: Remove (use default)
+    "no-shadow": 0,               // TODO: Remove (use default)
+    "no-spaced-func": 0,          // TODO: Remove (use default)
+    "no-trailing-spaces": 0,      // TODO: Remove (use default)
+    "no-undef": 0,                // TODO: Remove (use default)
+    "no-underscore-dangle": 0,    // Leave as 0. Commonly used for private variables.
+    "no-unused-expressions": 0,   // TODO: Remove (use default)
+    "no-unused-vars": 0,          // TODO: Remove (use default)
+    "no-use-before-define": 0,    // TODO: Remove (use default)
+    "no-wrap-func": 0,            // TODO: Remove (use default)
+    "quotes": 0,                  // [2, "double", "avoid-escape"],
+    "semi": 0,                    // TODO: Remove (use default)
+    "semi-spacing": 0,            // TODO: Remove (use default)
+    "space-infix-ops": 0,         // TODO: Remove (use default)
+    "space-return-throw-case": 0, // TODO: Remove (use default)
+    "strict": 0,                  // [2, "function"],
+    "yoda": 0,                    // [2, "never"],
     // eslint-plugin-react rules. These are documented at
     // <https://github.com/yannickcr/eslint-plugin-react#list-of-supported-rules>
     "react/jsx-quotes": [2, "double", "avoid-escape"],
     "react/jsx-no-undef": 2,
     // Need to fix instances where this is failing.
     "react/jsx-sort-props": 0,
+    "react/jsx-sort-prop-types": 0,
     "react/jsx-uses-vars": 2,
     // Need to fix the couple of instances which don't
     // currently pass this rule.
@@ -101,6 +92,7 @@
     "react/react-in-jsx-scope": 0,
     // These ones we don't want to ever enable
     "react/display-name": 0,
+    "react/jsx-boolean-value": 0,
     "react/no-multi-comp": 0
   }
 }
diff --git a/browser/components/loop/content/js/.eslintrc b/browser/components/loop/content/js/.eslintrc
new file mode 100644
index 00000000000..bcce1c501c1
--- /dev/null
+++ b/browser/components/loop/content/js/.eslintrc
@@ -0,0 +1,15 @@
+{
+  "ecmaFeatures": {
+   // These are on for this directory for .jsm and content/js files.
+    "blockBindings": true,
+    "arrowFunctions": true,
+    "destructuring": true,
+    "generators": true,
+    "spread": true,
+    "restParams": true,
+    "objectLiteralShorthandMethods": true
+  },
+  "rules": {
+    "generator-star-spacing": [2, "after"]
+  }
+}
diff --git a/browser/components/loop/content/shared/.eslintrc b/browser/components/loop/content/shared/.eslintrc
deleted file mode 100644
index 19cce829002..00000000000
--- a/browser/components/loop/content/shared/.eslintrc
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "ecmaFeatures": {
-    // Turn off top-level items needed for the jsm files, but not wanted
-    // for shared code as we can't support them.
-    "blockBindings": false,
-    "arrowFunctions": false,
-    "destructuring": false,
-    "forOf": true,
-    "generators": false,
-    "spread": false,
-    "restParams": false,
-    "objectLiteralShorthandMethods": false
-  }
-}
diff --git a/browser/components/loop/modules/.eslintrc b/browser/components/loop/modules/.eslintrc
new file mode 100644
index 00000000000..bd58bc5876d
--- /dev/null
+++ b/browser/components/loop/modules/.eslintrc
@@ -0,0 +1,17 @@
+{
+  "ecmaFeatures": {
+    "arrowFunctions": true,
+    "blockBindings": true,
+    "destructuring": true,
+    "generators": true,
+    "restParams": true,
+    "spread": true,
+    "objectLiteralShorthandMethods": true,
+  },
+  "rules": {
+    "generator-star-spacing": [2, "after"],
+    // We should fix the errors and enable this (set to 2)
+    "no-var": 0,
+    "strict": [2, "global"]
+  }
+}
diff --git a/browser/components/loop/CardDavImporter.jsm b/browser/components/loop/modules/CardDavImporter.jsm
similarity index 100%
rename from browser/components/loop/CardDavImporter.jsm
rename to browser/components/loop/modules/CardDavImporter.jsm
diff --git a/browser/components/loop/GoogleImporter.jsm b/browser/components/loop/modules/GoogleImporter.jsm
similarity index 100%
rename from browser/components/loop/GoogleImporter.jsm
rename to browser/components/loop/modules/GoogleImporter.jsm
diff --git a/browser/components/loop/LoopCalls.jsm b/browser/components/loop/modules/LoopCalls.jsm
similarity index 100%
rename from browser/components/loop/LoopCalls.jsm
rename to browser/components/loop/modules/LoopCalls.jsm
diff --git a/browser/components/loop/LoopContacts.jsm b/browser/components/loop/modules/LoopContacts.jsm
similarity index 100%
rename from browser/components/loop/LoopContacts.jsm
rename to browser/components/loop/modules/LoopContacts.jsm
diff --git a/browser/components/loop/LoopRooms.jsm b/browser/components/loop/modules/LoopRooms.jsm
similarity index 100%
rename from browser/components/loop/LoopRooms.jsm
rename to browser/components/loop/modules/LoopRooms.jsm
diff --git a/browser/components/loop/LoopStorage.jsm b/browser/components/loop/modules/LoopStorage.jsm
similarity index 100%
rename from browser/components/loop/LoopStorage.jsm
rename to browser/components/loop/modules/LoopStorage.jsm
diff --git a/browser/components/loop/MozLoopAPI.jsm b/browser/components/loop/modules/MozLoopAPI.jsm
similarity index 100%
rename from browser/components/loop/MozLoopAPI.jsm
rename to browser/components/loop/modules/MozLoopAPI.jsm
diff --git a/browser/components/loop/MozLoopPushHandler.jsm b/browser/components/loop/modules/MozLoopPushHandler.jsm
similarity index 100%
rename from browser/components/loop/MozLoopPushHandler.jsm
rename to browser/components/loop/modules/MozLoopPushHandler.jsm
diff --git a/browser/components/loop/MozLoopService.jsm b/browser/components/loop/modules/MozLoopService.jsm
similarity index 100%
rename from browser/components/loop/MozLoopService.jsm
rename to browser/components/loop/modules/MozLoopService.jsm
diff --git a/browser/components/loop/MozLoopWorker.js b/browser/components/loop/modules/MozLoopWorker.js
similarity index 100%
rename from browser/components/loop/MozLoopWorker.js
rename to browser/components/loop/modules/MozLoopWorker.js
diff --git a/browser/components/loop/moz.build b/browser/components/loop/moz.build
index 5ed65838c6b..a2cbc2469d8 100644
--- a/browser/components/loop/moz.build
+++ b/browser/components/loop/moz.build
@@ -13,18 +13,18 @@ BROWSER_CHROME_MANIFESTS += [
 ]
 
 EXTRA_JS_MODULES.loop += [
-    'CardDavImporter.jsm',
     'content/shared/js/crypto.js',
     'content/shared/js/utils.js',
-    'GoogleImporter.jsm',
-    'LoopCalls.jsm',
-    'LoopContacts.jsm',
-    'LoopRooms.jsm',
-    'LoopStorage.jsm',
-    'MozLoopAPI.jsm',
-    'MozLoopPushHandler.jsm',
-    'MozLoopService.jsm',
-    'MozLoopWorker.js',
+    'modules/CardDavImporter.jsm',
+    'modules/GoogleImporter.jsm',
+    'modules/LoopCalls.jsm',
+    'modules/LoopContacts.jsm',
+    'modules/LoopRooms.jsm',
+    'modules/LoopStorage.jsm',
+    'modules/MozLoopAPI.jsm',
+    'modules/MozLoopPushHandler.jsm',
+    'modules/MozLoopService.jsm',
+    'modules/MozLoopWorker.js',
 ]
 
 with Files('**'):
diff --git a/browser/components/loop/standalone/.eslintrc b/browser/components/loop/standalone/.eslintrc
deleted file mode 100644
index 19cce829002..00000000000
--- a/browser/components/loop/standalone/.eslintrc
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "ecmaFeatures": {
-    // Turn off top-level items needed for the jsm files, but not wanted
-    // for shared code as we can't support them.
-    "blockBindings": false,
-    "arrowFunctions": false,
-    "destructuring": false,
-    "forOf": true,
-    "generators": false,
-    "spread": false,
-    "restParams": false,
-    "objectLiteralShorthandMethods": false
-  }
-}
diff --git a/browser/components/loop/standalone/package.json b/browser/components/loop/standalone/package.json
index d3e3c23e0ee..b7214f8c5a3 100644
--- a/browser/components/loop/standalone/package.json
+++ b/browser/components/loop/standalone/package.json
@@ -12,8 +12,8 @@
   },
   "dependencies": {},
   "devDependencies": {
-    "eslint": "0.18.x",
-    "eslint-plugin-react": "2.0.x",
+    "eslint": "0.20.x",
+    "eslint-plugin-react": "2.2.x",
     "express": "3.x"
   },
   "scripts": {
diff --git a/browser/components/loop/test/.eslintrc b/browser/components/loop/test/.eslintrc
new file mode 100644
index 00000000000..7de540fc5d4
--- /dev/null
+++ b/browser/components/loop/test/.eslintrc
@@ -0,0 +1,7 @@
+{
+  "rules": {
+    // This is useful for some of the tests, e.g.
+    // expect(new Foo()).to.Throw(/error/)
+    "no-new": 0
+  }
+}

From 22d1ca1c4ece45cf58bce30aaea23eaca6a03514 Mon Sep 17 00:00:00 2001
From: Mark Banner <standard8@mozilla.com>
Date: Thu, 30 Apr 2015 07:40:49 +0100
Subject: [PATCH 02/88] Bug 1146305 - IDN links should be properly displayed in
 Hello rooms for context in conversations. r=mikedeboer

---
 .../components/loop/content/js/roomViews.js   | 19 +++++++++++--
 .../components/loop/content/js/roomViews.jsx  | 19 +++++++++++--
 .../loop/content/shared/js/utils.js           | 28 +++++++++++++++++++
 .../content/js/standaloneRoomViews.js         | 11 ++++++--
 .../content/js/standaloneRoomViews.jsx        | 11 ++++++--
 .../loop/test/desktop-local/roomViews_test.js | 17 +++++++++++
 .../components/loop/test/shared/utils_test.js | 25 +++++++++++++++++
 .../standalone/standaloneRoomViews_test.js    | 21 ++++++++++++++
 8 files changed, 139 insertions(+), 12 deletions(-)

diff --git a/browser/components/loop/content/js/roomViews.js b/browser/components/loop/content/js/roomViews.js
index f39a5b1f39a..7416ac62c24 100644
--- a/browser/components/loop/content/js/roomViews.js
+++ b/browser/components/loop/content/js/roomViews.js
@@ -11,10 +11,11 @@ var loop = loop || {};
 loop.roomViews = (function(mozL10n) {
   "use strict";
 
-  var sharedActions = loop.shared.actions;
-  var sharedMixins = loop.shared.mixins;
   var ROOM_STATES = loop.store.ROOM_STATES;
   var SCREEN_SHARE_STATES = loop.shared.utils.SCREEN_SHARE_STATES;
+  var sharedActions = loop.shared.actions;
+  var sharedMixins = loop.shared.mixins;
+  var sharedUtils = loop.shared.utils;
   var sharedViews = loop.shared.views;
 
   /**
@@ -312,13 +313,25 @@ loop.roomViews = (function(mozL10n) {
       var thumbnail = URL && URL.thumbnail || "";
       var URLDescription = URL && URL.description || "";
       var location = URL && URL.location || "";
+      var locationData = null;
+      if (location) {
+        locationData = sharedUtils.formatURL(location);
+      }
+
+      if (!locationData) {
+        return null;
+      }
+
       return (
         React.createElement("div", {className: "room-context"}, 
           React.createElement("img", {className: "room-context-thumbnail", src: thumbnail}), 
           React.createElement("div", {className: "room-context-content"}, 
             React.createElement("div", {className: "room-context-label"}, mozL10n.get("context_inroom_label")), 
             React.createElement("div", {className: "room-context-description"}, URLDescription), 
-            React.createElement("a", {className: "room-context-url", href: location, target: "_blank"}, location), 
+            React.createElement("a", {className: "room-context-url", 
+               href: location, 
+               target: "_blank", 
+               title: locationData.location}, locationData.hostname), 
             this.props.roomData.roomDescription ?
               React.createElement("div", {className: "room-context-comment"}, this.props.roomData.roomDescription) :
               null, 
diff --git a/browser/components/loop/content/js/roomViews.jsx b/browser/components/loop/content/js/roomViews.jsx
index 294ff6eef57..67552ff62f6 100644
--- a/browser/components/loop/content/js/roomViews.jsx
+++ b/browser/components/loop/content/js/roomViews.jsx
@@ -11,10 +11,11 @@ var loop = loop || {};
 loop.roomViews = (function(mozL10n) {
   "use strict";
 
-  var sharedActions = loop.shared.actions;
-  var sharedMixins = loop.shared.mixins;
   var ROOM_STATES = loop.store.ROOM_STATES;
   var SCREEN_SHARE_STATES = loop.shared.utils.SCREEN_SHARE_STATES;
+  var sharedActions = loop.shared.actions;
+  var sharedMixins = loop.shared.mixins;
+  var sharedUtils = loop.shared.utils;
   var sharedViews = loop.shared.views;
 
   /**
@@ -312,13 +313,25 @@ loop.roomViews = (function(mozL10n) {
       var thumbnail = URL && URL.thumbnail || "";
       var URLDescription = URL && URL.description || "";
       var location = URL && URL.location || "";
+      var locationData = null;
+      if (location) {
+        locationData = sharedUtils.formatURL(location);
+      }
+
+      if (!locationData) {
+        return null;
+      }
+
       return (
         <div className="room-context">
           <img className="room-context-thumbnail" src={thumbnail}/>
           <div className="room-context-content">
             <div className="room-context-label">{mozL10n.get("context_inroom_label")}</div>
             <div className="room-context-description">{URLDescription}</div>
-            <a className="room-context-url" href={location} target="_blank">{location}</a>
+            <a className="room-context-url"
+               href={location}
+               target="_blank"
+               title={locationData.location}>{locationData.hostname}</a>
             {this.props.roomData.roomDescription ?
               <div className="room-context-comment">{this.props.roomData.roomDescription}</div> :
               null}
diff --git a/browser/components/loop/content/shared/js/utils.js b/browser/components/loop/content/shared/js/utils.js
index 3c0bbd0343c..e0a1d904966 100644
--- a/browser/components/loop/content/shared/js/utils.js
+++ b/browser/components/loop/content/shared/js/utils.js
@@ -271,6 +271,33 @@ var inChrome = typeof Components != "undefined" && "utils" in Components;
     };
   }
 
+  /**
+   * Formats a url for display purposes. This includes converting the
+   * domain to punycode, and then decoding the url.
+   *
+   * @param {String} url The url to format.
+   * @return {Object}    An object containing the hostname and full location.
+   */
+  function formatURL(url) {
+    // We're using new URL to pass this through the browser's ACE/punycode
+    // processing system. If the browser considers a url to need to be
+    // punycode encoded for it to be displayed, then new URL will do that for
+    // us. This saves us needing our own punycode library.
+    var urlObject;
+    try {
+      urlObject = new URL(url);
+    } catch (ex) {
+      console.error("Error occurred whilst parsing URL:", ex);
+      return null;
+    }
+
+    // Finally, ensure we look good.
+    return {
+      hostname: urlObject.hostname,
+      location: decodeURI(urlObject.href)
+    };
+  }
+
   /**
    * Generates and opens a mailto: url with call URL information prefilled.
    * Note: This only works for Desktop.
@@ -536,6 +563,7 @@ var inChrome = typeof Components != "undefined" && "utils" in Components;
     ROOM_INFO_FAILURES: ROOM_INFO_FAILURES,
     composeCallUrlEmail: composeCallUrlEmail,
     formatDate: formatDate,
+    formatURL: formatURL,
     getBoolPreference: getBoolPreference,
     getOS: getOS,
     getOSVersion: getOSVersion,
diff --git a/browser/components/loop/standalone/content/js/standaloneRoomViews.js b/browser/components/loop/standalone/content/js/standaloneRoomViews.js
index 56dd6b59752..de4e7522407 100644
--- a/browser/components/loop/standalone/content/js/standaloneRoomViews.js
+++ b/browser/components/loop/standalone/content/js/standaloneRoomViews.js
@@ -16,6 +16,7 @@ loop.standaloneRoomViews = (function(mozL10n) {
   var ROOM_STATES = loop.store.ROOM_STATES;
   var sharedActions = loop.shared.actions;
   var sharedMixins = loop.shared.mixins;
+  var sharedUtils = loop.shared.utils;
   var sharedViews = loop.shared.views;
 
   var StandaloneRoomInfoArea = React.createClass({displayName: "StandaloneRoomInfoArea",
@@ -248,7 +249,10 @@ loop.standaloneRoomViews = (function(mozL10n) {
         return null;
       }
 
-      var location = this.props.roomContextUrl.location;
+      var locationInfo = sharedUtils.formatURL(this.props.roomContextUrl.location);
+      if (!locationInfo) {
+        return null;
+      }
 
       var cx = React.addons.classSet;
 
@@ -262,9 +266,10 @@ loop.standaloneRoomViews = (function(mozL10n) {
             React.createElement("img", {src: this.props.roomContextUrl.thumbnail}), 
           React.createElement("div", {className: "standalone-context-url-description-wrapper"}, 
             this.props.roomContextUrl.description, 
-            React.createElement("br", null), React.createElement("a", {href: location, 
+            React.createElement("br", null), React.createElement("a", {href: locationInfo.location, 
                      onClick: this.recordClick, 
-                     target: "_blank"}, location)
+                     target: "_blank", 
+                     title: locationInfo.location}, locationInfo.hostname)
           )
         )
       );
diff --git a/browser/components/loop/standalone/content/js/standaloneRoomViews.jsx b/browser/components/loop/standalone/content/js/standaloneRoomViews.jsx
index 70169a2187f..cf2c779af28 100644
--- a/browser/components/loop/standalone/content/js/standaloneRoomViews.jsx
+++ b/browser/components/loop/standalone/content/js/standaloneRoomViews.jsx
@@ -16,6 +16,7 @@ loop.standaloneRoomViews = (function(mozL10n) {
   var ROOM_STATES = loop.store.ROOM_STATES;
   var sharedActions = loop.shared.actions;
   var sharedMixins = loop.shared.mixins;
+  var sharedUtils = loop.shared.utils;
   var sharedViews = loop.shared.views;
 
   var StandaloneRoomInfoArea = React.createClass({
@@ -248,7 +249,10 @@ loop.standaloneRoomViews = (function(mozL10n) {
         return null;
       }
 
-      var location = this.props.roomContextUrl.location;
+      var locationInfo = sharedUtils.formatURL(this.props.roomContextUrl.location);
+      if (!locationInfo) {
+        return null;
+      }
 
       var cx = React.addons.classSet;
 
@@ -262,9 +266,10 @@ loop.standaloneRoomViews = (function(mozL10n) {
             <img src={this.props.roomContextUrl.thumbnail} />
           <div className="standalone-context-url-description-wrapper">
             {this.props.roomContextUrl.description}
-            <br /><a href={location}
+            <br /><a href={locationInfo.location}
                      onClick={this.recordClick}
-                     target="_blank">{location}</a>
+                     target="_blank"
+                     title={locationInfo.location}>{locationInfo.hostname}</a>
           </div>
         </div>
       );
diff --git a/browser/components/loop/test/desktop-local/roomViews_test.js b/browser/components/loop/test/desktop-local/roomViews_test.js
index a3f9b1dd725..5de6359ba94 100644
--- a/browser/components/loop/test/desktop-local/roomViews_test.js
+++ b/browser/components/loop/test/desktop-local/roomViews_test.js
@@ -242,6 +242,23 @@ describe("loop.roomViews", function () {
 
         expect(view.getDOMNode().querySelector(".room-context")).to.not.eql(null);
       });
+
+      it("should format the context url for display", function() {
+        sandbox.stub(sharedUtils, "formatURL").returns({
+          location: "location",
+          hostname: "hostname"
+        });
+
+        view = mountTestComponent({
+          showContext: true,
+          roomData: {
+            roomContextUrls: [fakeContextURL]
+          }
+        });
+
+        expect(view.getDOMNode().querySelector(".room-context-url").textContent)
+          .eql("hostname");
+      });
     });
   });
 
diff --git a/browser/components/loop/test/shared/utils_test.js b/browser/components/loop/test/shared/utils_test.js
index 3412e117582..b40abccd1f1 100644
--- a/browser/components/loop/test/shared/utils_test.js
+++ b/browser/components/loop/test/shared/utils_test.js
@@ -145,6 +145,31 @@ describe("loop.shared.utils", function() {
     });
   });
 
+  describe("#formatURL", function() {
+    it("should decode encoded URIs", function() {
+      expect(sharedUtils.formatURL("http://invalid.com/?a=Foo%20Bar"))
+        .eql({
+          location: "http://invalid.com/?a=Foo Bar",
+          hostname: "invalid.com"
+        });
+    });
+
+    it("should change some idn urls to ascii encoded", function() {
+      // Note, this is based on the browser's list of what does/doesn't get
+      // altered for punycode, so if the list changes this could change in the
+      // future.
+      expect(sharedUtils.formatURL("http://\u0261oogle.com/"))
+        .eql({
+          location: "http://xn--oogle-qmc.com/",
+          hostname: "xn--oogle-qmc.com"
+        });
+    });
+
+    it("should return null if it the url is not valid", function() {
+      expect(sharedUtils.formatURL("hinvalid//url")).eql(null);
+    });
+  });
+
   describe("#composeCallUrlEmail", function() {
     var composeEmail;
 
diff --git a/browser/components/loop/test/standalone/standaloneRoomViews_test.js b/browser/components/loop/test/standalone/standaloneRoomViews_test.js
index 37019b9a267..5222452387b 100644
--- a/browser/components/loop/test/standalone/standaloneRoomViews_test.js
+++ b/browser/components/loop/test/standalone/standaloneRoomViews_test.js
@@ -13,6 +13,7 @@ describe("loop.standaloneRoomViews", function() {
   var FEEDBACK_STATES = loop.store.FEEDBACK_STATES;
   var ROOM_INFO_FAILURES = loop.shared.utils.ROOM_INFO_FAILURES;
   var sharedActions = loop.shared.actions;
+  var sharedUtils = loop.shared.utils;
 
   var sandbox, dispatcher, activeRoomStore, feedbackStore, dispatch;
 
@@ -96,6 +97,26 @@ describe("loop.standaloneRoomViews", function() {
       expect(view.getDOMNode().querySelector(".standalone-context-url")).not.eql(null);
     });
 
+    it("should format the url for display", function() {
+      sandbox.stub(sharedUtils, "formatURL").returns({
+          location: "location",
+          hostname: "hostname"
+        });
+
+      var view = mountTestComponent({
+        roomName: "Mike's room",
+        roomContextUrls: [{
+          description: "Mark's super page",
+          location: "http://invalid.com",
+          thumbnail: "data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw=="
+        }]
+      });
+
+      expect(view.getDOMNode()
+        .querySelector(".standalone-context-url-description-wrapper > a").textContent)
+        .eql("hostname");
+    });
+
     it("should not display context information if no urls are supplied", function() {
       var view = mountTestComponent({
         roomName: "Mike's room"

From 4cdd5904adb19f5dde78243d34990c2fb257fd9c Mon Sep 17 00:00:00 2001
From: Martin Tomes <tomesm@gmail.com>
Date: Thu, 30 Apr 2015 07:40:50 +0100
Subject: [PATCH 03/88] Bug 1084296 - Add an ellipsis to Loop's "Remove
 Contact" menu item. r=Standard8

---
 browser/components/loop/content/js/contacts.js            | 2 +-
 browser/components/loop/content/js/contacts.jsx           | 2 +-
 browser/locales/en-US/chrome/browser/loop/loop.properties | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/browser/components/loop/content/js/contacts.js b/browser/components/loop/content/js/contacts.js
index 6fecc1808a8..bb29539ce5f 100644
--- a/browser/components/loop/content/js/contacts.js
+++ b/browser/components/loop/content/js/contacts.js
@@ -222,7 +222,7 @@ loop.contacts = (function(_, mozL10n) {
                               "disabled": !this.props.canEdit }), 
               onClick: this.onItemClick, "data-action": "remove"}, 
             React.createElement("i", {className: "icon icon-remove"}), 
-            mozL10n.get("remove_contact_menu_button")
+            mozL10n.get("remove_contact_menu_button2")
           )
         )
       );
diff --git a/browser/components/loop/content/js/contacts.jsx b/browser/components/loop/content/js/contacts.jsx
index b78e60e6a99..b77f34eaa03 100644
--- a/browser/components/loop/content/js/contacts.jsx
+++ b/browser/components/loop/content/js/contacts.jsx
@@ -222,7 +222,7 @@ loop.contacts = (function(_, mozL10n) {
                               "disabled": !this.props.canEdit })}
               onClick={this.onItemClick} data-action="remove">
             <i className="icon icon-remove" />
-            {mozL10n.get("remove_contact_menu_button")}
+            {mozL10n.get("remove_contact_menu_button2")}
           </li>
         </ul>
       );
diff --git a/browser/locales/en-US/chrome/browser/loop/loop.properties b/browser/locales/en-US/chrome/browser/loop/loop.properties
index e6fa1dd8d99..4815148dc5b 100644
--- a/browser/locales/en-US/chrome/browser/loop/loop.properties
+++ b/browser/locales/en-US/chrome/browser/loop/loop.properties
@@ -127,9 +127,9 @@ import_failed_description_simple=Sorry, contact import failed
 import_failed_description_some=Some contacts could not be imported
 import_failed_support_button=Help
 
-## LOCALIZATION NOTE(remove_contact_menu_button): Displayed in the contact list in
+## LOCALIZATION NOTE(remove_contact_menu_button2): Displayed in the contact list in
 ## a pop-up menu next to the contact's name.
-remove_contact_menu_button=Remove Contact
+remove_contact_menu_button2=Remove Contact…
 ## LOCALIZATION NOTE(confirm_delete_contact_alert): This is an alert that is displayed
 ## to confirm deletion of a contact.
 confirm_delete_contact_alert=Are you sure you want to delete this contact?

From edb8cdbd2d19fdc471cdb2d46f4d15e773ede638 Mon Sep 17 00:00:00 2001
From: Mark Hammond <mhammond@skippinet.com.au>
Date: Thu, 30 Apr 2015 17:02:02 +1000
Subject: [PATCH 04/88] Bug 1151666 - avoid multiple verified email timers from
 running and avoid 'pending' calls in the test. r=zaach

---
 services/fxaccounts/FxAccounts.jsm            |  6 +++
 .../tests/xpcshell/test_accounts.js           | 46 ++++---------------
 2 files changed, 16 insertions(+), 36 deletions(-)

diff --git a/services/fxaccounts/FxAccounts.jsm b/services/fxaccounts/FxAccounts.jsm
index 3836b7e76b1..deb362f139e 100644
--- a/services/fxaccounts/FxAccounts.jsm
+++ b/services/fxaccounts/FxAccounts.jsm
@@ -1068,6 +1068,12 @@ FxAccountsInternal.prototype = {
   pollEmailStatus: function pollEmailStatus(currentState, sessionToken, why) {
     log.debug("entering pollEmailStatus: " + why);
     if (why == "start") {
+      if (this.currentTimer) {
+        log.debug("pollEmailStatus starting while existing timer is running");
+        clearTimeout(this.currentTimer);
+        this.currentTimer = null;
+      }
+
       // If we were already polling, stop and start again.  This could happen
       // if the user requested the verification email to be resent while we
       // were already polling for receipt of an earlier email.
diff --git a/services/fxaccounts/tests/xpcshell/test_accounts.js b/services/fxaccounts/tests/xpcshell/test_accounts.js
index 97d831d5953..656ec51b75f 100644
--- a/services/fxaccounts/tests/xpcshell/test_accounts.js
+++ b/services/fxaccounts/tests/xpcshell/test_accounts.js
@@ -39,11 +39,6 @@ const CONTENT_URL = "http://accounts.example.com/";
 Services.prefs.setCharPref("identity.fxaccounts.remote.profile.uri", PROFILE_SERVER_URL);
 Services.prefs.setCharPref("identity.fxaccounts.settings.uri", CONTENT_URL);
 
-
-function run_test() {
-  run_next_test();
-}
-
 /*
  * The FxAccountsClient communicates with the remote Firefox
  * Accounts auth server.  Mock the server calls, with a little
@@ -264,8 +259,6 @@ add_task(function* test_getCertificate() {
 
 // Sanity-check that our mocked client is working correctly
 add_test(function test_client_mock() {
-  do_test_pending();
-
   let fxa = new MockFxAccounts();
   let client = fxa.internal.fxAccountsClient;
   do_check_eq(client._verified, false);
@@ -275,7 +268,6 @@ add_test(function test_client_mock() {
   client.recoveryEmailStatus()
     .then(response => {
       do_check_eq(response.verified, false);
-      do_test_finished();
       run_next_test();
     });
 });
@@ -285,8 +277,6 @@ add_test(function test_client_mock() {
 // Polling should detect that the email is verified, and eventually
 // 'onverified' should be observed
 add_test(function test_verification_poll() {
-  do_test_pending();
-
   let fxa = new MockFxAccounts();
   let test_user = getTestUser("francine");
   let login_notification_received = false;
@@ -299,7 +289,6 @@ add_test(function test_verification_poll() {
       do_check_eq(user.verified, true);
       do_check_eq(user.email, test_user.email);
       do_check_true(login_notification_received);
-      do_test_finished();
       run_next_test();
     });
   });
@@ -326,8 +315,6 @@ add_test(function test_verification_poll() {
 // poll should time out.  No verifiedlogin event should be observed, and the
 // internal whenVerified promise should be rejected
 add_test(function test_polling_timeout() {
-  do_test_pending();
-
   // This test could be better - the onverified observer might fire on
   // somebody else's stack, and we're not making sure that we're not receiving
   // such a message. In other words, this tests either failure, or success, but
@@ -351,15 +338,13 @@ add_test(function test_polling_timeout() {
       },
       (fail) => {
         removeObserver();
-        do_test_finished();
-        run_next_test();
+        fxa.signOut().then(run_next_test);
       }
     );
   });
 });
 
 add_test(function test_getKeys() {
-  do_test_pending();
   let fxa = new MockFxAccounts();
   let user = getTestUser("eusebius");
 
@@ -384,7 +369,6 @@ add_test(function test_getKeys() {
           do_check_eq(user.kB, expandHex("66"));
           do_check_eq(user.keyFetchToken, undefined);
           do_check_eq(user.unwrapBKey, undefined);
-          do_test_finished();
           run_next_test();
         });
       });
@@ -394,8 +378,6 @@ add_test(function test_getKeys() {
 
 //  fetchAndUnwrapKeys with no keyFetchToken should trigger signOut
 add_test(function test_fetchAndUnwrapKeys_no_token() {
-  do_test_pending();
-
   let fxa = new MockFxAccounts();
   let user = getTestUser("lettuce.protheroe");
   delete user.keyFetchToken
@@ -403,7 +385,6 @@ add_test(function test_fetchAndUnwrapKeys_no_token() {
   makeObserver(ONLOGOUT_NOTIFICATION, function() {
     log.debug("test_fetchAndUnwrapKeys_no_token observed logout");
     fxa.internal.getUserAccountData().then(user => {
-      do_test_finished();
       run_next_test();
     });
   });
@@ -424,8 +405,6 @@ add_test(function test_fetchAndUnwrapKeys_no_token() {
 // signs in with a verified email.  Ensure that no sign-in events are triggered
 // on Alice's behalf.  In the end, Bob should be the signed-in user.
 add_test(function test_overlapping_signins() {
-  do_test_pending();
-
   let fxa = new MockFxAccounts();
   let alice = getTestUser("alice");
   let bob = getTestUser("bob");
@@ -436,7 +415,6 @@ add_test(function test_overlapping_signins() {
     fxa.internal.getUserAccountData().then(user => {
       do_check_eq(user.email, bob.email);
       do_check_eq(user.verified, true);
-      do_test_finished();
       run_next_test();
     });
   });
@@ -614,7 +592,7 @@ add_test(function test_accountStatus() {
                  (result) => {
                    do_check_false(result);
                    fxa.internal.fxAccountsClient._deletedOnServer = false;
-                   run_next_test();
+                   fxa.signOut().then(run_next_test);
                  }
                );
             }
@@ -667,7 +645,6 @@ add_test(function test_resend_email() {
 });
 
 add_test(function test_sign_out() {
-  do_test_pending();
   let fxa = new MockFxAccounts();
   let remoteSignOutCalled = false;
   let client = fxa.internal.fxAccountsClient;
@@ -678,7 +655,6 @@ add_test(function test_sign_out() {
     fxa.internal.getUserAccountData().then(user => {
       do_check_eq(user, null);
       do_check_true(remoteSignOutCalled);
-      do_test_finished();
       run_next_test();
     });
   });
@@ -686,7 +662,6 @@ add_test(function test_sign_out() {
 });
 
 add_test(function test_sign_out_with_remote_error() {
-  do_test_pending();
   let fxa = new MockFxAccounts();
   let client = fxa.internal.fxAccountsClient;
   let remoteSignOutCalled = false;
@@ -698,7 +673,6 @@ add_test(function test_sign_out_with_remote_error() {
     fxa.internal.getUserAccountData().then(user => {
       do_check_eq(user, null);
       do_check_true(remoteSignOutCalled);
-      do_test_finished();
       run_next_test();
     });
   });
@@ -848,7 +822,7 @@ add_test(function test_getOAuthToken_invalid_param() {
   fxa.getOAuthToken()
     .then(null, err => {
        do_check_eq(err.message, "INVALID_PARAMETER");
-       run_next_test();
+       fxa.signOut().then(run_next_test);
     });
 });
 
@@ -858,7 +832,7 @@ add_test(function test_getOAuthToken_invalid_scope_array() {
   fxa.getOAuthToken({scope: []})
     .then(null, err => {
        do_check_eq(err.message, "INVALID_PARAMETER");
-       run_next_test();
+       fxa.signOut().then(run_next_test);
     });
 });
 
@@ -872,7 +846,7 @@ add_test(function test_getOAuthToken_misconfigure_oauth_uri() {
        do_check_eq(err.message, "INVALID_PARAMETER");
        // revert the pref
        Services.prefs.setCharPref("identity.fxaccounts.remote.oauth.uri", "https://example.com/v1");
-       run_next_test();
+       fxa.signOut().then(run_next_test);
     });
 });
 
@@ -886,7 +860,7 @@ add_test(function test_getOAuthToken_no_account() {
   fxa.getOAuthToken({ scope: "profile" })
     .then(null, err => {
        do_check_eq(err.message, "NO_ACCOUNT");
-       run_next_test();
+       fxa.signOut().then(run_next_test);
     });
 });
 
@@ -898,7 +872,7 @@ add_test(function test_getOAuthToken_unverified() {
     fxa.getOAuthToken({ scope: "profile" })
       .then(null, err => {
          do_check_eq(err.message, "UNVERIFIED_ACCOUNT");
-         run_next_test();
+         fxa.signOut().then(run_next_test);
       });
   });
 });
@@ -1071,7 +1045,7 @@ add_test(function test_getSignedInUserProfile_error_uses_account_data() {
     fxa.getSignedInUserProfile()
       .catch(error => {
          do_check_eq(error.message, "UNKNOWN_ERROR");
-         run_next_test();
+         fxa.signOut().then(run_next_test);
       });
   });
 
@@ -1087,7 +1061,7 @@ add_test(function test_getSignedInUserProfile_unverified_account() {
     fxa.getSignedInUserProfile()
       .catch(error => {
          do_check_eq(error.message, "UNVERIFIED_ACCOUNT");
-         run_next_test();
+         fxa.signOut().then(run_next_test);
       });
   });
 
@@ -1103,7 +1077,7 @@ add_test(function test_getSignedInUserProfile_no_account_data() {
   fxa.getSignedInUserProfile()
     .catch(error => {
        do_check_eq(error.message, "NO_ACCOUNT");
-       run_next_test();
+       fxa.signOut().then(run_next_test);
     });
 
 });

From 88aa0f4fd2e11c66e4bdb64b7d9c83031c58365d Mon Sep 17 00:00:00 2001
From: Mark Hammond <mhammond@skippinet.com.au>
Date: Thu, 30 Apr 2015 17:13:40 +1000
Subject: [PATCH 05/88] Bug 1098343 (part 1) - support 'sticky' preferences,
 meaning a user value is retained even when it matches the default.
 r=bsmedberg

---
 modules/libpref/prefapi.cpp                   |  21 ++-
 modules/libpref/prefapi.h                     |   5 +-
 modules/libpref/prefread.cpp                  |  12 +-
 modules/libpref/prefread.h                    |   6 +-
 .../libpref/test/unit/data/testPrefSticky.js  |   2 +
 .../test/unit/data/testPrefStickyUser.js      |   5 +
 modules/libpref/test/unit/test_stickyprefs.js | 170 ++++++++++++++++++
 modules/libpref/test/unit/xpcshell.ini        |   2 +
 8 files changed, 213 insertions(+), 10 deletions(-)
 create mode 100644 modules/libpref/test/unit/data/testPrefSticky.js
 create mode 100644 modules/libpref/test/unit/data/testPrefStickyUser.js
 create mode 100644 modules/libpref/test/unit/test_stickyprefs.js

diff --git a/modules/libpref/prefapi.cpp b/modules/libpref/prefapi.cpp
index 5e82ba9b971..70b0e3a8dd5 100644
--- a/modules/libpref/prefapi.cpp
+++ b/modules/libpref/prefapi.cpp
@@ -140,7 +140,8 @@ static nsresult pref_DoCallback(const char* changed_pref);
 
 enum {
     kPrefSetDefault = 1,
-    kPrefForceSet = 2
+    kPrefForceSet = 2,
+    kPrefStickyDefault = 4,
 };
 static nsresult pref_HashPref(const char *key, PrefValue value, PrefType type, uint32_t flags);
 
@@ -340,7 +341,8 @@ pref_savePref(PLDHashTable *table, PLDHashEntryHdr *heh, uint32_t i, void *arg)
         (pref_ValueChanged(pref->defaultPref,
                            pref->userPref,
                            (PrefType) PREF_TYPE(pref)) ||
-         !(pref->flags & PREF_HAS_DEFAULT))) {
+         !(pref->flags & PREF_HAS_DEFAULT) ||
+         pref->flags & PREF_STICKY_DEFAULT)) {
         sourcePref = &pref->userPref;
     } else {
         if (argData->saveTypes == SAVE_ALL_AND_DEFAULTS) {
@@ -778,6 +780,8 @@ nsresult pref_HashPref(const char *key, PrefValue value, PrefType type, uint32_t
             {
                 pref_SetValue(&pref->defaultPref, &pref->flags, value, type);
                 pref->flags |= PREF_HAS_DEFAULT;
+                if (flags & kPrefStickyDefault)
+                    pref->flags |= PREF_STICKY_DEFAULT;
                 if (!PREF_HAS_USER_VALUE(pref))
                     valueChanged = true;
             }
@@ -787,9 +791,11 @@ nsresult pref_HashPref(const char *key, PrefValue value, PrefType type, uint32_t
     }
     else
     {
-        /* If new value is same as the default value, then un-set the user value.
+        /* If new value is same as the default value and it's not a "sticky"
+           pref, then un-set the user value.
            Otherwise, set the user value only if it has changed */
         if ((pref->flags & PREF_HAS_DEFAULT) &&
+            !(pref->flags & PREF_STICKY_DEFAULT) &&
             !pref_ValueChanged(pref->defaultPref, value, type) &&
             !(flags & kPrefForceSet))
         {
@@ -1002,7 +1008,12 @@ void PREF_ReaderCallback(void       *closure,
                          const char *pref,
                          PrefValue   value,
                          PrefType    type,
-                         bool        isDefault)
+                         bool        isDefault,
+                         bool        isStickyDefault)
 {
-    pref_HashPref(pref, value, type, isDefault ? kPrefSetDefault : kPrefForceSet);
+    uint32_t flags = isDefault ? kPrefSetDefault : kPrefForceSet;
+    if (isDefault && isStickyDefault) {
+        flags |= kPrefStickyDefault;
+    }
+    pref_HashPref(pref, value, type, flags);
 }
diff --git a/modules/libpref/prefapi.h b/modules/libpref/prefapi.h
index 675b384c475..f1e412a6781 100644
--- a/modules/libpref/prefapi.h
+++ b/modules/libpref/prefapi.h
@@ -61,6 +61,8 @@ typedef enum { PREF_INVALID = 0,
                PREF_LOCKED = 1, PREF_USERSET = 2, PREF_CONFIG = 4, PREF_REMOTE = 8,
                PREF_LILOCAL = 16, PREF_STRING = 32, PREF_INT = 64, PREF_BOOL = 128,
                PREF_HAS_DEFAULT = 256,
+               // pref is default pref with "sticky" semantics
+               PREF_STICKY_DEFAULT = 512,
                PREF_VALUETYPE_MASK = (PREF_STRING | PREF_INT | PREF_BOOL)
              } PrefType;
 
@@ -183,7 +185,8 @@ void PREF_ReaderCallback( void *closure,
                           const char *pref,
                           PrefValue   value,
                           PrefType    type,
-                          bool        isDefault);
+                          bool        isDefault,
+                          bool        isStickyDefault);
 
 #ifdef __cplusplus
 }
diff --git a/modules/libpref/prefread.cpp b/modules/libpref/prefread.cpp
index 01612ba9402..6c4d339894f 100644
--- a/modules/libpref/prefread.cpp
+++ b/modules/libpref/prefread.cpp
@@ -44,6 +44,7 @@ enum {
 
 static const char kUserPref[] = "user_pref";
 static const char kPref[] = "pref";
+static const char kPrefSticky[] = "sticky_pref";
 static const char kTrue[] = "true";
 static const char kFalse[] = "false";
 
@@ -129,7 +130,8 @@ pref_DoCallback(PrefParseState *ps)
     default:
         break;
     }
-    (*ps->reader)(ps->closure, ps->lb, value, ps->vtype, ps->fdefault);
+    (*ps->reader)(ps->closure, ps->lb, value, ps->vtype, ps->fdefault,
+                  ps->fstickydefault);
     return true;
 }
 
@@ -188,6 +190,7 @@ PREF_ParseBuf(PrefParseState *ps, const char *buf, int bufLen)
                 ps->vb    = nullptr;
                 ps->vtype = PREF_INVALID;
                 ps->fdefault = false;
+                ps->fstickydefault = false;
             }
             switch (c) {
             case '/':       /* begin comment block or line? */
@@ -198,7 +201,9 @@ PREF_ParseBuf(PrefParseState *ps, const char *buf, int bufLen)
                 break;
             case 'u':       /* indicating user_pref */
             case 'p':       /* indicating pref */
-                ps->smatch = (c == 'u' ? kUserPref : kPref);
+            case 's':       /* indicating sticky_pref */
+                ps->smatch = (c == 'u' ? kUserPref :
+                             (c == 's' ? kPrefSticky : kPref));
                 ps->sindex = 1;
                 ps->nextstate = PREF_PARSE_UNTIL_OPEN_PAREN;
                 state = PREF_PARSE_MATCH_STRING;
@@ -242,7 +247,8 @@ PREF_ParseBuf(PrefParseState *ps, const char *buf, int bufLen)
         /* name parsing */
         case PREF_PARSE_UNTIL_NAME:
             if (c == '\"' || c == '\'') {
-                ps->fdefault = (ps->smatch == kPref);
+                ps->fdefault = (ps->smatch == kPref || ps->smatch == kPrefSticky);
+                ps->fstickydefault = (ps->smatch == kPrefSticky);
                 ps->quotechar = c;
                 ps->nextstate = PREF_PARSE_UNTIL_COMMA; /* return here when done */
                 state = PREF_PARSE_QUOTED_STRING;
diff --git a/modules/libpref/prefread.h b/modules/libpref/prefread.h
index 4d5ce1e958f..3c317ff044d 100644
--- a/modules/libpref/prefread.h
+++ b/modules/libpref/prefread.h
@@ -26,12 +26,15 @@ extern "C" {
  *        preference type (PREF_STRING, PREF_INT, or PREF_BOOL)
  * @param defPref
  *        preference type (true: default, false: user preference)
+ * @param stickyPref
+ *        default preference marked as a "sticky" pref
  */
 typedef void (*PrefReader)(void       *closure,
                            const char *pref,
                            PrefValue   val,
                            PrefType    type,
-                           bool        defPref);
+                           bool        defPref,
+                           bool        stickyPref);
 
 /* structure fields are private */
 typedef struct PrefParseState {
@@ -52,6 +55,7 @@ typedef struct PrefParseState {
     char       *vb;         /* value buffer (ptr into lb)    */
     PrefType    vtype;      /* PREF_STRING,INT,BOOL          */
     bool        fdefault;   /* true if (default) pref     */
+    bool        fstickydefault; /* true if (sticky) pref     */
 } PrefParseState;
 
 /**
diff --git a/modules/libpref/test/unit/data/testPrefSticky.js b/modules/libpref/test/unit/data/testPrefSticky.js
new file mode 100644
index 00000000000..69b3165fb48
--- /dev/null
+++ b/modules/libpref/test/unit/data/testPrefSticky.js
@@ -0,0 +1,2 @@
+pref("testPref.unsticky.bool", true);
+sticky_pref("testPref.sticky.bool", false);
diff --git a/modules/libpref/test/unit/data/testPrefStickyUser.js b/modules/libpref/test/unit/data/testPrefStickyUser.js
new file mode 100644
index 00000000000..0ea0906813e
--- /dev/null
+++ b/modules/libpref/test/unit/data/testPrefStickyUser.js
@@ -0,0 +1,5 @@
+// testPrefSticky.js defined this pref as a sticky_pref(). Once a sticky
+// pref has been changed, it's written as a user_pref().
+// So this test file reflects that scenario.
+// Note the default in testPrefSticky.js is also false.
+user_pref("testPref.sticky.bool", false);
diff --git a/modules/libpref/test/unit/test_stickyprefs.js b/modules/libpref/test/unit/test_stickyprefs.js
new file mode 100644
index 00000000000..c2c5a7c4b74
--- /dev/null
+++ b/modules/libpref/test/unit/test_stickyprefs.js
@@ -0,0 +1,170 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/licenses/publicdomain/  */
+
+Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
+Components.utils.import("resource://gre/modules/Services.jsm");
+
+const ps = Services.prefs;
+
+// Once we fetch the profile directory the xpcshell test harness will send
+// a profile-before-change notification at shutdown. This causes the prefs
+// service to flush the prefs file - and the prefs file it uses ends up being
+// testPrefSticky*.js in the test dir. This upsets things in confusing ways :)
+// We avoid this by ensuring our "temp" prefs.js is the current prefs file.
+do_get_profile();
+do_register_cleanup(saveAndReload);
+
+// A little helper to reset the service and load some pref files
+function resetAndLoad(filenames) {
+  ps.resetPrefs();
+  for (let filename of filenames) {
+    ps.readUserPrefs(do_get_file(filename));
+  }
+}
+
+// A little helper that saves the current state to a file in the profile
+// dir, then resets the service and re-reads the file it just saved.
+// Used to test what gets actually written - things the pref service decided
+// not to write don't exist at all after this call.
+function saveAndReload() {
+  let file = do_get_profile();
+  file.append("prefs.js");
+  ps.savePrefFile(file);
+
+  // Now reset the pref service and re-read what we saved.
+  ps.resetPrefs();
+  ps.readUserPrefs(file);
+}
+
+function run_test() {
+  run_next_test();
+}
+
+// A sticky pref should not be written if the value is unchanged.
+add_test(function notWrittenWhenUnchanged() {
+  resetAndLoad(["data/testPrefSticky.js"]);
+  Assert.strictEqual(ps.getBoolPref("testPref.unsticky.bool"), true);
+  Assert.strictEqual(ps.getBoolPref("testPref.sticky.bool"), false);
+
+  // write prefs - but we haven't changed the sticky one, so it shouldn't be written.
+  saveAndReload();
+  // sticky should not have been written to the new file.
+  try {
+    ps.getBoolPref("testPref.sticky.bool");
+    Assert.ok(false, "expected failure reading this pref");
+  } catch (ex) {
+    Assert.ok(ex, "exception reading regular pref");
+  }
+  run_next_test();
+});
+
+// Loading a sticky_pref then a user_pref for the same pref means it should
+// always be written.
+add_test(function writtenOnceLoadedWithoutChange() {
+  // Load the same pref file *as well as* a pref file that has a user_pref for
+  // our sticky with the default value. It should be re-written without us
+  // touching it.
+  resetAndLoad(["data/testPrefSticky.js", "data/testPrefStickyUser.js"]);
+  // reset and re-read what we just wrote - it should be written.
+  saveAndReload();
+  Assert.strictEqual(ps.getBoolPref("testPref.sticky.bool"), false,
+                     "user_pref was written with default value");
+  run_next_test();
+});
+
+// If a sticky pref is explicicitly changed, even to the default, it is written.
+add_test(function writtenOnceLoadedWithChangeNonDefault() {
+  // Load the same pref file *as well as* a pref file that has a user_pref for
+  // our sticky - then change the pref. It should be written.
+  resetAndLoad(["data/testPrefSticky.js", "data/testPrefStickyUser.js"]);
+  // Set a new val and check we wrote it.
+  ps.setBoolPref("testPref.sticky.bool", false);
+  saveAndReload();
+  Assert.strictEqual(ps.getBoolPref("testPref.sticky.bool"), false,
+                     "user_pref was written with custom value");
+  run_next_test();
+});
+
+// If a sticky pref is changed to the non-default value, it is written.
+add_test(function writtenOnceLoadedWithChangeNonDefault() {
+  // Load the same pref file *as well as* a pref file that has a user_pref for
+  // our sticky - then change the pref. It should be written.
+  resetAndLoad(["data/testPrefSticky.js", "data/testPrefStickyUser.js"]);
+  // Set a new val and check we wrote it.
+  ps.setBoolPref("testPref.sticky.bool", true);
+  saveAndReload();
+  Assert.strictEqual(ps.getBoolPref("testPref.sticky.bool"), true,
+                     "user_pref was written with custom value");
+  run_next_test();
+});
+
+// Test that prefHasUserValue always returns true whenever there is a sticky
+// value, even when that value matches the default. This is mainly for
+// about:config semantics - prefs with a sticky value always remain bold and
+// always offer "reset" (which fully resets and drops the sticky value as if
+// the pref had never changed.)
+add_test(function hasUserValue() {
+  // sticky pref without user value.
+  resetAndLoad(["data/testPrefSticky.js"]);
+  Assert.strictEqual(ps.getBoolPref("testPref.sticky.bool"), false);
+  Assert.ok(!ps.prefHasUserValue("testPref.sticky.bool"),
+            "should not initially reflect a user value");
+
+  ps.setBoolPref("testPref.sticky.bool", false);
+  Assert.ok(ps.prefHasUserValue("testPref.sticky.bool"),
+            "should reflect a user value after set to default");
+
+  ps.setBoolPref("testPref.sticky.bool", true);
+  Assert.ok(ps.prefHasUserValue("testPref.sticky.bool"),
+            "should reflect a user value after change to non-default");
+
+  ps.clearUserPref("testPref.sticky.bool");
+  Assert.ok(!ps.prefHasUserValue("testPref.sticky.bool"),
+            "should reset to no user value");
+  ps.setBoolPref("testPref.sticky.bool", false, "expected default");
+
+  // And make sure the pref immediately reflects a user value after load.
+  resetAndLoad(["data/testPrefSticky.js", "data/testPrefStickyUser.js"]);
+  Assert.strictEqual(ps.getBoolPref("testPref.sticky.bool"), false);
+  Assert.ok(ps.prefHasUserValue("testPref.sticky.bool"),
+            "should have a user value when loaded value is the default");
+  run_next_test();
+});
+
+// Test that clearUserPref removes the "sticky" value.
+add_test(function clearUserPref() {
+  // load things such that we have a sticky value which is the same as the
+  // default.
+  resetAndLoad(["data/testPrefSticky.js", "data/testPrefStickyUser.js"]);
+  ps.clearUserPref("testPref.sticky.bool");
+
+  // Once we save prefs the sticky pref should no longer be written.
+  saveAndReload();
+  try {
+    ps.getBoolPref("testPref.sticky.bool");
+    Assert.ok(false, "expected failure reading this pref");
+  } catch (ex) {
+    Assert.ok(ex, "pref doesn't have a sticky value");
+  }
+  run_next_test();
+});
+
+// Test that a pref observer gets a notification fired when a sticky pref
+// has it's value changed to the same value as the default. The reason for
+// this behaviour is that later we might have other code that cares about a
+// pref being sticky (IOW, we notify due to the "state" of the pref changing
+// even if the value has not)
+add_test(function observerFires() {
+  // load things so there's no sticky value.
+  resetAndLoad(["data/testPrefSticky.js"]);
+
+  function observe(subject, topic, data) {
+    Assert.equal(data, "testPref.sticky.bool");
+    ps.removeObserver("testPref.sticky.bool", observe);
+    run_next_test();
+  }
+  ps.addObserver("testPref.sticky.bool", observe, false);
+
+  ps.setBoolPref("testPref.sticky.bool", ps.getBoolPref("testPref.sticky.bool"));
+  // and the observer will fire triggering the next text.
+});
diff --git a/modules/libpref/test/unit/xpcshell.ini b/modules/libpref/test/unit/xpcshell.ini
index 443d96e3bb4..2ee36ed26f9 100644
--- a/modules/libpref/test/unit/xpcshell.ini
+++ b/modules/libpref/test/unit/xpcshell.ini
@@ -11,6 +11,8 @@ support-files =
 [test_bug506224.js]
 [test_bug577950.js]
 [test_bug790374.js]
+[test_stickyprefs.js]
+support-files = data/testPrefSticky.js data/testPrefStickyUser.js
 [test_changeType.js]
 [test_dirtyPrefs.js]
 [test_extprefs.js]

From 7b11b3f2841b05054448b7bbb15e0c511ad2b11d Mon Sep 17 00:00:00 2001
From: Mark Hammond <mhammond@skippinet.com.au>
Date: Thu, 30 Apr 2015 17:13:40 +1000
Subject: [PATCH 06/88] Bug 1098343 (part 2) - use sticky_pref to define
 devtools preferences that use different defaults on different channels.
 r=bgrins

---
 browser/app/profile/firefox.js | 8 ++++----
 modules/libpref/init/all.js    | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index f8989ed38ab..b3d120efd26 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -1327,8 +1327,8 @@ pref("services.sync.prefs.sync.xpinstall.whitelist.required", true);
 
 // Developer edition preferences
 #ifdef MOZ_DEV_EDITION
-pref("lightweightThemes.selectedThemeID", "firefox-devedition@mozilla.org");
-pref("browser.devedition.theme.enabled", true);
+sticky_pref("lightweightThemes.selectedThemeID", "firefox-devedition@mozilla.org");
+sticky_pref("browser.devedition.theme.enabled", true);
 #endif
 
 // Developer edition promo preferences
@@ -1507,9 +1507,9 @@ pref("devtools.webaudioeditor.inspectorWidth", 300);
 
 // Default theme ("dark" or "light")
 #ifdef MOZ_DEV_EDITION
-pref("devtools.theme", "dark");
+sticky_pref("devtools.theme", "dark");
 #else
-pref("devtools.theme", "light");
+sticky_pref("devtools.theme", "light");
 #endif
 
 // Display the introductory text
diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
index c8f4105743a..acc29098f8f 100644
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -786,9 +786,9 @@ pref("devtools.errorconsole.deprecation_warnings", true);
 
 // Disable debugging chrome
 #ifdef MOZ_DEV_EDITION
-pref("devtools.chrome.enabled", true);
+sticky_pref("devtools.chrome.enabled", true);
 #else
-pref("devtools.chrome.enabled", false);
+sticky_pref("devtools.chrome.enabled", false);
 #endif
 
 // Disable remote debugging protocol logging
@@ -796,9 +796,9 @@ pref("devtools.debugger.log", false);
 pref("devtools.debugger.log.verbose", false);
 // Disable remote debugging connections
 #ifdef MOZ_DEV_EDITION
-pref("devtools.debugger.remote-enabled", true);
+sticky_pref("devtools.debugger.remote-enabled", true);
 #else
-pref("devtools.debugger.remote-enabled", false);
+sticky_pref("devtools.debugger.remote-enabled", false);
 #endif
 pref("devtools.debugger.remote-port", 6000);
 // Force debugger server binding on the loopback interface

From b0d2ecc055fb615e5e18413271970b25c00f5d67 Mon Sep 17 00:00:00 2001
From: Ed Lee <edilee@mozilla.com>
Date: Tue, 7 Apr 2015 19:13:46 -0700
Subject: [PATCH 07/88] Bug 1152145 - Filter for specific suggested tiles
 adgroups/buckets/frecent_sites lists with display name [r=adw] Use a set of
 predefined lists of allowed sites with explicit names.

---
 browser/base/content/newtab/sites.js          |  2 +-
 .../test/newtab/browser_newtab_block.js       |  3 ++
 .../test/newtab/browser_newtab_enhanced.js    |  3 ++
 browser/modules/DirectoryLinksProvider.jsm    | 43 +++++++++++++++++++
 .../xpcshell/test_DirectoryLinksProvider.js   | 20 ++++++++-
 5 files changed, 69 insertions(+), 2 deletions(-)

diff --git a/browser/base/content/newtab/sites.js b/browser/base/content/newtab/sites.js
index eb56fddcb34..87e0bc47f1f 100644
--- a/browser/base/content/newtab/sites.js
+++ b/browser/base/content/newtab/sites.js
@@ -133,7 +133,7 @@ Site.prototype = {
 
     if (this.link.targetedSite) {
       this.node.setAttribute("suggested", true);
-      let targetedSite = `<strong> ${this.link.targetedSite} </strong>`;
+      let targetedSite = `<strong> ${this.link.targetedName} </strong>`;
       this._querySelector(".newtab-suggested").innerHTML =
         `<div class='newtab-suggested-bounds'> ${newTabString("suggested.button", [targetedSite])} </div>`;
     }
diff --git a/browser/base/content/test/newtab/browser_newtab_block.js b/browser/base/content/test/newtab/browser_newtab_block.js
index 9509786feec..47c645baac3 100644
--- a/browser/base/content/test/newtab/browser_newtab_block.js
+++ b/browser/base/content/test/newtab/browser_newtab_block.js
@@ -18,6 +18,8 @@ gDirectorySource = "data:application/json," + JSON.stringify({
 });
 
 function runTests() {
+  let origGetFrecentSitesName = DirectoryLinksProvider.getFrecentSitesName;
+  DirectoryLinksProvider.getFrecentSitesName = () => "";
   let origIsTopPlacesSite = NewTabUtils.isTopPlacesSite;
   NewTabUtils.isTopPlacesSite = (site) => false;
 
@@ -84,4 +86,5 @@ function runTests() {
   yield blockCell(1);
   yield addNewTabPageTab();
   checkGrid("1,2,3,4,5,6,7,8,9");
+  DirectoryLinksProvider.getFrecentSitesName = origGetFrecentSitesName;
 }
diff --git a/browser/base/content/test/newtab/browser_newtab_enhanced.js b/browser/base/content/test/newtab/browser_newtab_enhanced.js
index a2ff6cd551d..0750017923a 100644
--- a/browser/base/content/test/newtab/browser_newtab_enhanced.js
+++ b/browser/base/content/test/newtab/browser_newtab_enhanced.js
@@ -26,8 +26,11 @@ gDirectorySource = "data:application/json," + JSON.stringify({
 });
 
 function runTests() {
+  let origGetFrecentSitesName = DirectoryLinksProvider.getFrecentSitesName;
+  DirectoryLinksProvider.getFrecentSitesName = () => "";
   let origEnhanced = NewTabUtils.allPages.enhanced;
   registerCleanupFunction(() => {
+    DirectoryLinksProvider.getFrecentSitesName = origGetFrecentSitesName;
     Services.prefs.clearUserPref(PRELOAD_PREF);
     NewTabUtils.allPages.enhanced = origEnhanced;
   });
diff --git a/browser/modules/DirectoryLinksProvider.jsm b/browser/modules/DirectoryLinksProvider.jsm
index ff4c491c95f..20c2d99e1b6 100644
--- a/browser/modules/DirectoryLinksProvider.jsm
+++ b/browser/modules/DirectoryLinksProvider.jsm
@@ -50,6 +50,34 @@ const PREF_DIRECTORY_PING = "browser.newtabpage.directory.ping";
 // The preference that tells if newtab is enhanced
 const PREF_NEWTAB_ENHANCED = "browser.newtabpage.enhanced";
 
+// Only allow explicitly approved frecent sites with display name
+const ALLOWED_FRECENT_SITES = new Map([
+  [ 'airdroid.com,android-developers.blogspot.com,android.com,androidandme.com,androidapplications.com,androidapps.com,androidauthority.com,androidcentral.com,androidcommunity.com,androidfilehost.com,androidforums.com,androidguys.com,androidheadlines.com,androidpit.com,androidpolice.com,androidspin.com,androidtapp.com,androinica.com,droid-life.com,droidforums.net,droidviews.com,droidxforums.com,forum.xda-developers.com,phandroid.com,play.google.com,shopandroid.com,talkandroid.com,theandroidsoul.com,thedroidguy.com,videodroid.org',
+    'Technology' ],
+  [ 'assurancewireless.com,att.com,attsavings.com,boostmobile.com,budgetmobile.com,consumercellular.com,credomobile.com,gosmartmobile.com,h2owirelessnow.com,lycamobile.com,lycamobile.us,metropcs.com,myfamilymobile.com,polarmobile.com,qlinkwireless.com,republicwireless.com,sprint.com,straighttalk.com,t-mobile.com,tracfonewireless.com,verizonwireless.com,virginmobile.com,virginmobile.com.au,virginmobileusa.com,vodafone.co.uk,vodafone.com,vzwshop.com',
+    'Mobile Phone' ],
+  [ 'addons.mozilla.org,air.mozilla.org,blog.mozilla.org,bugzilla.mozilla.org,developer.mozilla.org,etherpad.mozilla.org,forums.mozillazine.org,hacks.mozilla.org,hg.mozilla.org,mozilla.org,planet.mozilla.org,quality.mozilla.org,support.mozilla.org,treeherder.mozilla.org,wiki.mozilla.org',
+    'Mozilla' ],
+  [ '3dprint.com,4sysops.com,access-programmers.co.uk,accountingweb.com,addictivetips.com,adweek.com,afterdawn.com,akihabaranews.com,anandtech.com,appsrumors.com,arstechnica.com,belkin.com,besttechinfo.com,betanews.com,bgr.com,botcrawl.com,breakingmuscle.com,canonrumors.com,cheap-phones.com,chip.de,chip.eu,cio.com,citeworld.com,cleanpcremove.com,cnet.com,commentcamarche.net,computer.org,computerhope.com,computershopper.com,computerweekly.com,contextures.com,coolest-gadgets.com,crn.com,csoonline.com,daniweb.com,data.com,datacenterknowledge.com,ddj.com,devicemag.com,digitaltrends.com,dottech.org,dpreview.com,dslreports.com,edugeek.net,eetimes.com,engadget.com,epic.com,eurekalert.org,eweek.com,experts-exchange.com,extremetech.com,fosshub.com,freesoftwaremagazine.com,funkyspacemonkey.com,futuremark.com,gadgetreview.com,ghacks.net,gizmodo.co.uk,gizmodo.com,globalsecurity.org,greenbot.com,gunup.com,guru3d.com,head-fi.org,hexus.net,hothardware.com,howtoforge.com,idg.com.au,idigitaltimes.com,idownloadblog.com,ihackmyi.com,ilounge.com,infomine.com,informationweek.com,intellireview.com,intomobile.com,iphonehacks.com,ismashphone.com,isource.com,it168.com,itechpost.com,itpro.co.uk,itworld.com,jailbreaknation.com,kioskea.net,laptoping.com,laptopmag.com,lightreading.com,livescience.com,malwaretips.com,mediaroom.com,mobilemag.com,modmyi.com,modmymobile.com,mophie.com,mozillazine.org,neoseeker.com,neowin.net,newscientist.com,newsoxy.com,nextadvisor.com,notebookcheck.com,notebookreview.com,nvidia.com,nwc.com,orafaq.com,osdir.com,osxdaily.com,our-hometown.com,pcadvisor.co.uk,pchome.net,pcmag.com,pconline.com.cn,pcpop.com,pcpro.co.uk,pcreview.co.uk,pcrisk.com,pcwelt.de,phonerebel.com,phonescoop.com,physorg.com,pocket-lint.com,post-theory.com,prnewswire.co.uk,prnewswire.com,programming4.us,quickpwn.com,readwrite.com,redmondpie.com,redorbit.com,reviewed.com,safer-networking.org,sciencedaily.com,sciencenews.org,scientificamerican.com,scientificblogging.com,sciverse.com,servicerow.com,sinfuliphone.com,singularityhub.com,slashdot.org,slashgear.com,softonic.com,softonic.com.br,softonic.fr,sophos.com,space.com,sparkfun.com,speedguide.net,stuff.tv,techdailynews.net,techdirt.com,techeblog.com,techhive.com,techie-buzz.com,technewsworld.com,techniqueworld.com,technobuffalo.com,technologyreview.com,technologytell.com,techpowerup.com,techpp.com,techrepublic.com,techshout.com,techweb.com,techworld.com,techworld.com.au,techworldtweets.com,telecomfile.com,tgdaily.com,theinquirer.net,thenextweb.com,theregister.co.uk,thermofisher.com,theverge.com,thewindowsclub.com,tomsguide.com,tomshardware.com,tomsitpro.com,toptenreviews.com,trustedreviews.com,tuaw.com,tweaktown.com,ubergizmo.com,unwiredview.com,venturebeat.com,wccftech.com,webmonkey.com,webpronews.com,windows7codecs.com,windowscentral.com,windowsitpro.com,windowstechies.com,winsupersite.com,wired.co.uk,wired.com,wp-themes.com,xda-developers.com,xml.com,zdnet.com,zmescience.com,zol.com.cn',
+    'Technology' ],
+  [ '9to5mac.com,appadvice.com,apple.com,appleinsider.com,appleturns.com,appsafari.com,cultofmac.com,everymac.com,insanelymac.com,iphoneunlockspot.com,isource.com,itunes.apple.com,lowendmac.com,mac-forums.com,macdailynews.com,macenstein.com,macgasm.net,macintouch.com,maclife.com,macnews.com,macnn.com,macobserver.com,macosx.com,macpaw.com,macrumors.com,macsales.com,macstories.net,macupdate.com,macuser.co.uk,macworld.co.uk,macworld.com,maxiapple.com,spymac.com,theapplelounge.com',
+    'Technology' ],
+  [ 'alistapart.com,answers.microsoft.com,backpack.openbadges.org,blog.chromium.org,caniuse.com,codefirefox.com,codepen.io,css-tricks.com,css3generator.com,cssdeck.com,csswizardry.com,devdocs.io,docs.angularjs.org,ghacks.net,github.com,html5demos.com,html5rocks.com,html5test.com,iojs.org,khanacademy.org,l10n.mozilla.org,learn.jquery.com,marketplace.firefox.com,mozilla-hispano.org,mozillians.org,news.ycombinator.com,npmjs.com,packagecontrol.io,quirksmode.org,readwrite.com,reps.mozilla.org,smashingmagazine.com,stackoverflow.com,status.modern.ie,teamtreehouse.com,tutorialspoint.com,udacity.com,validator.w3.org,w3.org,w3cschool.cc,w3schools.com,whatcanidoformozilla.org',
+    'Web Development' ],
+  [ 'classroom.google.com,codecademy.com,elearning.ut.ac.id,khanacademy.org,learn.jquery.com,teamtreehouse.com,tutorialspoint.com,udacity.com,w3cschool.cc,w3schools.com',
+    'Web Education' ],
+  [ 'abebooks.co.uk,abebooks.com,alibris.com,allaboutcircuits.com,allyoucanbooks.com,answersingenesis.org,artnet.com,audiobooks.com,barnesandnoble.com,barnesandnobleinc.com,bartleby.com,betterworldbooks.com,biggerbooks.com,bncollege.com,bookbyte.com,bookdepository.com,bookfinder.com,bookrenter.com,booksamillion.com,booksite.com,boundless.com,brookstone.com,btol.com,calibre-ebook.com,campusbookrentals.com,casadellibro.com,cbomc.com,cengagebrain.com,chapters.indigo.ca,christianbook.com,ciscopress.com,coursesmart.com,cqpress.com,crafterschoice.com,crossings.com,cshlp.org,deseretbook.com,directtextbook.com,discountmags.com,doubledaybookclub.com,doubledaylargeprint.com,doverpublications.com,ebooks.com,ecampus.com,fellabooks.net,fictionwise.com,flatworldknowledge.com,grolier.com,harpercollins.com,hayhouse.com,historybookclub.com,hpb.com,hpbmarketplace.com,interweave.com,iseeme.com,katiekazoo.com,knetbooks.com,learnoutloud.com,librarything.com,literaryguild.com,lulu.com,lww.com,macmillan.com,magazines.com,mbsdirect.net,militarybookclub.com,mypearsonstore.com,mysteryguild.com,netplaces.com,noble.com,novelguide.com,onespirit.com,oxfordjournals.org,paperbackswap.com,papy.co.jp,peachpit.com,penguin.com,penguingroup.com,pimsleur.com,powells.com,qpb.com,quepublishing.com,reviews.com,rhapsodybookclub.com,rodalestore.com,royalsocietypublishing.org,sagepub.com,scrubsmag.com,sfbc.com,simonandschuster.com,simonandschuster.net,simpletruths.com,teach12.net,textbooks.com,textbookx.com,thegoodcook.com,thriftbooks.com,tlsbooks.com,toshibabookplace.com,tumblebooks.com,urbookdownload.com,valorebooks.com,valuemags.com,wwnorton.com,zoobooks.com',
+    'Literature' ],
+  [ 'aceshowbiz.com,aintitcoolnews.com,askkissy.com,askmen.com,atraf.co.il,audioboom.com,beamly.com,blippitt.com,bollywoodlife.com,bossip.com,buzzlamp.com,celebdirtylaundry.com,celebfocus.com,celebitchy.com,celebrity-gossip.net,celebrityabout.com,celebwild.com,chisms.net,concertboom.com,crushable.com,cultbox.co.uk,dailyentertainmentnews.com,dayscafe.com,deadline.com,deathandtaxesmag.com,diaryofahollywoodstreetking.com,digitalspy.com,egotastic.com,empirenews.net,enelbrasero.com,everydaycelebs.com,ew.com,extratv.com,facade.com,fanaru.com,fhm.com,geektyrant.com,glamourpage.com,heatworld.com,hlntv.com,hollyscoop.com,hollywoodreporter.com,hollywoodtuna.com,hypable.com,infotransfer.net,insideedition.com,interaksyon.com,jezebel.com,justjared.com,justjaredjr.com,komando.com,koreaboo.com,maxgo.com,maxim.com,maxviral.com,mediatakeout.com,mosthappy.com,moviestalk.com,my.ology.com,ngoisao.net,nofilmschool.com,nolocreo.com,octane.tv,ouchpress.com,people.com,peopleenespanol.com,perezhilton.com,pinkisthenewblog.com,platotv.tv,playbill.com,playbillvault.com,playgroundmag.net,popeater.com,popnhop.com,popsugar.co.uk,popsugar.com,purepeople.com,radaronline.com,rantchic.com,reshareworthy.com,rinkworks.com,ripbird.com,sara-freder.com,screenjunkies.com,soapcentral.com,soapoperadigest.com,sobadsogood.com,splitsider.com,starcasm.net,starpulse.com,straightfromthea.com,stupidcelebrities.net,stupiddope.com,tbn.org,theawesomedaily.com,theawl.com,thefrisky.com,thefw.com,theresacaputo.com,thezooom.com,tvnotas.com.mx,twanatells.com,vanswarpedtour.com,vietgiaitri.com,viral.buzz,vulture.com,wakavision.com,worthytales.net,wwtdd.com,younghollywood.com',
+    'Entertainment News' ],
+  [ '247wallst.com,4-traders.com,advfn.com,agweb.com,allbusiness.com,barchart.com,barrons.com,beckershospitalreview.com,benzinga.com,bizjournals.com,bizsugar.com,bloomberg.com,bloomberglaw.com,business-standard.com,businessinsider.com,businessinsider.com.au,businesspundit.com,businessweek.com,businesswire.com,cboe.com,cheatsheet.com,chicagobusiness.com,cjonline.com,cnbc.com,cnnmoney.com,cqrcengage.com,dailyfinance.com,dailyfx.com,dealbreaker.com,djindexes.com,dowjones.com,easierstreetdaily.com,economist.com,economyandmarkets.com,economywatch.com,edweek.org,eleconomista.es,entrepreneur.com,etfdailynews.com,etfdb.com,ewallstreeter.com,fastcolabs.com,fastcompany.com,financeformulas.net,financialpost.com,flife.de,forbes.com,forexpros.com,fortune.com,foxbusiness.com,ft.com,ftpress.com,fx-exchange.com,hbr.org,howdofinance.com,ibtimes.com,inc.com,investopedia.com,investors.com,investorwords.com,journalofaccountancy.com,kiplinger.com,lendingandcredit.net,lfb.org,mainstreet.com,markettraders.com,marketwatch.com,maxkeiser.com,minyanville.com,ml.com,moneycontrol.com,moneymappress.com,moneynews.com,moneysavingexpert.com,morningstar.com,mortgagenewsdaily.com,motleyfool.com,mt.co.kr,nber.org,nyse.com,oilprice.com,pewsocialtrends.org,principal.com,qz.com,rantfinance.com,realclearmarkets.com,recode.net,reuters.ca,reuters.co.in,reuters.co.uk,reuters.com,rttnews.com,seekingalpha.com,smallbiztrends.com,streetinsider.com,thecheapinvestor.com,theeconomiccollapseblog.com,themoneyconverter.com,thestreet.com,tickertech.com,tradingeconomics.com,updown.com,valuewalk.com,wikinvest.com,wsj.com,zacks.com',
+    'Financial News' ],
+  [ '10tv.com,8newsnow.com,9news.com,abc.net.au,abc7.com,abc7chicago.com,abcnews.go.com,aclu.org,activistpost.com,ajc.com,al.com,alan.com,alarab.net,aljazeera.com,americanthinker.com,app.com,aristeguinoticias.com,azcentral.com,baltimoresun.com,becomingminimalist.com,beforeitsnews.com,bigstory.ap.org,blackamericaweb.com,bloomberg.com,bloombergview.com,boston.com,bostonherald.com,breitbart.com,buffalonews.com,c-span.org,canada.com,cbs46.com,cbsnews.com,chicagotribune.com,chron.com,citizensvoice.com,citylab.com,cleveland.com,cnn.com,coed.com,countercurrentnews.com,courant.com,ctvnews.ca,dailyherald.com,dailynews.com,dallasnews.com,delawareonline.com,democratandchronicle.com,democraticunderground.com,democrats.org,denverpost.com,desmoinesregister.com,dispatch.com,elcomercio.pe,english.aljazeera.net,examiner.com,farsnews.com,firstcoastnews.com,firstpost.com,firsttoknow.com,foreignpolicy.com,foxnews.com,freebeacon.com,freep.com,fresnobee.com,gazette.com,global.nytimes.com,heraldtribune.com,hindustantimes.com,hngn.com,humanevents.com,huzlers.com,indiatimes.com,indystar.com,irishtimes.com,jacksonville.com,jpost.com,jsonline.com,kansascity.com,kctv5.com,kentucky.com,kickerdaily.com,king5.com,kmov.com,knoxnews.com,kpho.com,kvue.com,kwqc.com,kxan.com,lainformacion.com,latimes.com,ldnews.com,lex18.com,linternaute.com,livemint.com,lostateminor.com,m24.ru,macleans.ca,manchestereveningnews.co.uk,marinecorpstimes.com,masslive.com,mavikocaeli.com.tr,mcall.com,medium.com,mentalfloss.com,mercurynews.com,metro.us,miamiherald.com,militarytimes.com,mk.ru,mlive.com,mondotimes.com,montrealgazette.com,msnbc.com,msnewsnow.com,mynews13.com,mysanantonio.com,mysuncoast.com,nbclosangeles.com,nbcnewyork.com,nbcphiladelphia.com,ndtv.com,newindianexpress.com,news.cincinnati.com,news.google.com,news.msn.com,news.yahoo.com,news10.net,news8000.com,newsday.com,newsdaymarketing.net,newsen.com,newsmax.com,newsobserver.com,newsok.com,newsru.ua,newstatesman.com,newszoom.com,nj.com,nola.com,northjersey.com,nouvelobs.com,npr.org,nwfdailynews.com,nwitimes.com,nydailynews.com,nytimes.com,observer.com,ocregister.com,okcfox.com,omaha.com,onenewspage.com,ontheissues.org,oregonlive.com,orlandosentinel.com,palmbeachpost.com,pe.com,pennlive.com,philly.com,pilotonline.com,polar.com,post-gazette.com,postandcourier.com,presstelegram.com,presstv.ir,propublica.org,providencejournal.com,realclearpolitics.com,recorderonline.com,reporterdock.com,reporterherald.com,respublica.al,reuters.com,rg.ru,roanoke.com,sacbee.com,scmp.com,scnow.com,sdpnoticias.com,seattletimes.com,semana.com,sfgate.com,sharepowered.com,sinembargo.mx,slate.com,sltrib.com,sotomayortv.com,sourcewatch.org,spectator.co.uk,squaremirror.com,star-telegram.com,staradvertiser.com,startribune.com,statesman.com,stltoday.com,streetwise.co,stuff.co.nz,success.com,suffolknewsherald.com,sun-sentinel.com,sunnewsnetwork.ca,suntimes.com,supernewschannel.com,surenews.com,svoboda.org,syracuse.com,tampabay.com,tbd.com,telegram.com,telegraph.co.uk,tennessean.com,the-open-mind.com,theadvocate.com,theage.com.au,theatlantic.com,thebarefootwriter.com,theblaze.com,thecalifornian.com,thedailysheeple.com,thefix.com,theintelligencer.net,thelocal.com,thenational.ae,thenewstribune.com,theparisreview.org,thereporter.com,therepublic.com,thestar.com,thetelegram.com,thetimes.co.uk,theuspatriot.com,time.com,timescall.com,timesdispatch.com,timesleaderonline.com,timesofisrael.com,toledoblade.com,toprightnews.com,townhall.com,tpnn.com,trendolizer.com,triblive.com,tribune.com.pk,tricities.com,troymessenger.com,trueactivist.com,truthandaction.org,tsn.ua,tulsaworld.com,twincities.com,upi.com,usatoday.com,utsandiego.com,vagazette.com,viralwomen.com,vitalworldnews.com,voasomali.com,vox.com,washingtonexaminer.com,washingtonpost.com,watchdog.org,wave3.com,wavy.com,wbay.com,wbtw.com,wcpo.com,wctrib.com,wdtn.com,weeklystandard.com,westernjournalism.com,wfsb.com,wgrz.com,whas11.com,winonadailynews.com,wishtv.com,wistv.com,wkbn.com,wkow.com,wlfi.com,wmtw.com,wmur.com,wopular.com,world-top-news.com,worldnews.com,wplol.us,wpsdlocal6.com,wptz.com,wric.com,wsmv.com,wthitv.com,wthr.com,wtnh.com,wtol.com,wtsp.com,wvec.com,wwlp.com,wwltv.com,wyff4.com,yonhapnews.co.kr,yourbreakingnews.com',
+    'News' ],
+  [ '2k.com,360game.vn,4399.com,a10.com,activision.com,addictinggames.com,alawar.com,alienwarearena.com,anagrammer.com,andkon.com,aq.com,arcadeprehacks.com,arcadeyum.com,arcgames.com,archeagegame.com,armorgames.com,askmrrobot.com,battle.net,battlefieldheroes.com,bigfishgames.com,bigpoint.com,bioware.com,bluesnews.com,boardgamegeek.com,bollyheaven.com,bubblebox.com,bukkit.org,bungie.net,buycraft.net,callofduty.com,candystand.com,cda.pl,challonge.com,championselect.net,cheapassgamer.com,cheatcc.com,cheatengine.org,cheathappens.com,chess.com,civfanatics.com,clashofclans-tools.com,clashofclansbuilder.com,comdotgame.com,commonsensemedia.org,coolrom.com,crazygames.com,csgolounge.com,curse.com,d20pfsrd.com,destructoid.com,diablofans.com,diablowiki.net,didigames.com,dota2.com,dota2lounge.com,dressupgames.com,dulfy.net,ebog.com,elderscrollsonline.com,elitedangerous.com,elitepvpers.com,emuparadise.me,enjoydressup.com,escapegames24.com,escapistmagazine.com,eventhubs.com,eveonline.com,farming-simulator.com,feed-the-beast.com,flashgames247.com,flightrising.com,flipline.com,flonga.com,freegames.ws,freeonlinegames.com,fresh-hotel.org,friv.com,friv.today,fullypcgames.net,funny-games.biz,funtrivia.com,futhead.com,g2a.com,gamasutra.com,game-debate.com,game-oldies.com,game321.com,gamebaby.com,gamebaby.net,gamebanana.com,gamefaqs.com,gamefly.com,gamefront.com,gamegape.com,gamehouse.com,gameinformer.com,gamejolt.com,gamemazing.com,gamemeteor.com,gamerankings.com,gamersgate.com,games-msn.com,games-workshop.com,games.com,games2girls.com,gamesbox.com,gamesfreak.net,gametop.com,gametracker.com,gametrailers.com,gamezhero.com,gbatemp.net,geforce.com,gematsu.com,giantbomb.com,girl.me,girlsgames123.com,girlsplay.com,gog.com,gogames.me,gonintendo.com,goodgamestudios.com,gosugamers.net,greenmangaming.com,gtaforums.com,gtainside.com,guildwars2.com,hackedarcadegames.com,hearthpwn.com,hirezstudios.com,hitbox.tv,hltv.org,howrse.com,icy-veins.com,indiedb.com,jayisgames.com,jigzone.com,joystiq.com,juegosdechicas.com,kabam.com,kbhgames.com,kerbalspaceprogram.com,king.com,kixeye.com,kizi.com,kogama.com,kongregate.com,kotaku.com,lolcounter.com,lolking.net,lolnexus.com,lolpro.com,lolskill.net,lootcrate.com,lumosity.com,mafa.com,mangafox.me,mangapark.com,mariowiki.com,maxgames.com,megagames.com,metacritic.com,mindjolt.com,minecraft.net,minecraftforum.net,minecraftservers.org,minecraftskins.com,mineplex.com,miniclip.com,mmo-champion.com,mmobomb.com,mmohuts.com,mmorpg.com,mmosite.com,mobafire.com,moddb.com,modxvm.com,mojang.com,moshimonsters.com,mousebreaker.com,moviestarplanet.com,mtgsalvation.com,muchgames.com,myonlinearcade.com,myplaycity.com,myrealgames.com,mythicspoiler.com,n4g.com,newgrounds.com,nexon.net,nexusmods.com,ninjakiwi.com,nintendo.com,nintendoeverything.com,nintendolife.com,nitrome.com,nosteam.ro,notdoppler.com,noxxic.com,operationsports.com,origin.com,ownedcore.com,pacogames.com,pathofexile.com,pcgamer.com,pch.com,pcsx2.net,penny-arcade.com,planetminecraft.com,plarium.com,playdota.com,playpink.com,playsides.com,playstationlifestyle.net,playstationtrophies.org,pog.com,pokemon.com,polygon.com,popcap.com,primarygames.com,probuilds.net,ps3hax.net,psnprofiles.com,psu.com,qq.com,r2games.com,resourcepack.net,retrogamer.com,rewardtv.com,riotgames.com,robertsspaceindustries.com,roblox.com,robocraftgame.com,rockpapershotgun.com,rockstargames.com,roosterteeth.com,runescape.com,schoolofdragons.com,screwattack.com,scufgaming.com,segmentnext.com,shacknews.com,shockwave.com,shoryuken.com,siliconera.com,silvergames.com,skydaz.com,smashbros.com,solomid.net,starcitygames.com,starsue.net,steamcommunity.com,steamgifts.com,strategywiki.org,supercheats.com,surrenderat20.net,swtor.com,tankionline.com,tcgplayer.com,teamfortress.com,teamliquid.net,tetrisfriends.com,thesims3.com,thesimsresource.com,thetechgame.com,topg.org,totaljerkface.com,toucharcade.com,transformice.com,trueachievements.com,twcenter.net,twitch.tv,twoplayergames.org,unity3d.com,vg247.com,vgchartz.com,videogamesblogger.com,warframe.com,warlight.net,warthunder.com,watchcartoononline.com,websudoku.com,wildstar-online.com,wildtangent.com,wineverygame.com,wizards.com,worldofsolitaire.com,worldoftanks.com,wowhead.com,wowprogress.com,wowwiki.com,xbox.com,xbox360iso.com,xboxachievements.com,xfire.com,xtremetop100.com,y8.com,yoyogames.com,zybez.net,zynga.com',
+    'Video Game' ],
+]);
+
 // Only allow link urls that are http(s)
 const ALLOWED_LINK_SCHEMES = new Set(["http", "https"]);
 
@@ -431,6 +459,14 @@ let DirectoryLinksProvider = {
            this._enhancedLinks.get(NewTabUtils.extractSite(link.url));
   },
 
+  /**
+   * Get the display name of an allowed frecent sites. Returns undefined for a
+   * unallowed frecent sites.
+   */
+  getFrecentSitesName(sites) {
+    return ALLOWED_FRECENT_SITES.get(sites.join(","));
+  },
+
   /**
    * Check if a url's scheme is in a Set of allowed schemes
    */
@@ -468,6 +504,13 @@ let DirectoryLinksProvider = {
       }.bind(this);
 
       rawLinks.suggested.filter(validityFilter).forEach((link, position) => {
+        // Only allow suggested links with approved frecent sites
+        let name = this.getFrecentSitesName(link.frecent_sites);
+        if (name == undefined) {
+          return;
+        }
+
+        link.targetedName = name;
         link.lastVisitDate = rawLinks.suggested.length - position;
 
         // We cache suggested tiles here but do not push any of them in the links list yet.
diff --git a/browser/modules/test/xpcshell/test_DirectoryLinksProvider.js b/browser/modules/test/xpcshell/test_DirectoryLinksProvider.js
index 7faa9d97ac4..1d5a1ac5249 100644
--- a/browser/modules/test/xpcshell/test_DirectoryLinksProvider.js
+++ b/browser/modules/test/xpcshell/test_DirectoryLinksProvider.js
@@ -269,6 +269,9 @@ add_task(function test_updateSuggestedTile() {
   let testObserver = new TestFirstRun();
   DirectoryLinksProvider.addObserver(testObserver);
 
+  let origGetFrecentSitesName = DirectoryLinksProvider.getFrecentSitesName;
+  DirectoryLinksProvider.getFrecentSitesName = () => "";
+
   yield promiseSetupDirectoryLinksProvider({linksURL: dataURI});
   let links = yield fetchData();
 
@@ -383,6 +386,7 @@ add_task(function test_updateSuggestedTile() {
 
   // Cleanup
   yield promiseCleanDirectoryLinksProvider();
+  DirectoryLinksProvider.getFrecentSitesName = origGetFrecentSitesName;
   NewTabUtils.isTopPlacesSite = origIsTopPlacesSite;
   NewTabUtils.getProviderLinks = origGetProviderLinks;
   DirectoryLinksProvider._getCurrentTopSiteCount = origCurrentTopSiteCount;
@@ -421,6 +425,9 @@ add_task(function test_suggestedLinksMap() {
 });
 
 add_task(function test_topSitesWithSuggestedLinks() {
+  let origGetFrecentSitesName = DirectoryLinksProvider.getFrecentSitesName;
+  DirectoryLinksProvider.getFrecentSitesName = () => "";
+
   let topSites = ["site0.com", "1040.com", "site2.com", "hrblock.com", "site4.com", "freetaxusa.com", "site6.com"];
   let origIsTopPlacesSite = NewTabUtils.isTopPlacesSite;
   NewTabUtils.isTopPlacesSite = function(site) {
@@ -468,6 +475,7 @@ add_task(function test_topSitesWithSuggestedLinks() {
   isIdentical([...DirectoryLinksProvider._topSitesWithSuggestedLinks], expectedTopSitesWithSuggestedLinks);
 
   // Cleanup.
+  DirectoryLinksProvider.getFrecentSitesName = origGetFrecentSitesName;
   NewTabUtils.isTopPlacesSite = origIsTopPlacesSite;
   NewTabUtils.getProviderLinks = origGetProviderLinks;
 });
@@ -479,7 +487,7 @@ add_task(function test_suggestedAttributes() {
   let origCurrentTopSiteCount = DirectoryLinksProvider._getCurrentTopSiteCount;
   DirectoryLinksProvider._getCurrentTopSiteCount = () => 8;
 
-  let frecent_sites = ["top.site.com"];
+  let frecent_sites = "addons.mozilla.org,air.mozilla.org,blog.mozilla.org,bugzilla.mozilla.org,developer.mozilla.org,etherpad.mozilla.org,forums.mozillazine.org,hacks.mozilla.org,hg.mozilla.org,mozilla.org,planet.mozilla.org,quality.mozilla.org,support.mozilla.org,treeherder.mozilla.org,wiki.mozilla.org".split(",");
   let imageURI = "https://image/";
   let title = "the title";
   let type = "affiliate";
@@ -514,6 +522,7 @@ add_task(function test_suggestedAttributes() {
   // Make sure we get the expected attributes on the suggested tile
   let link = gLinks.getLinks()[0];
   do_check_eq(link.imageURI, imageURI);
+  do_check_eq(link.targetedName, "Mozilla");
   do_check_eq(link.targetedSite, frecent_sites[0]);
   do_check_eq(link.title, title);
   do_check_eq(link.type, type);
@@ -528,6 +537,8 @@ add_task(function test_suggestedAttributes() {
 
 add_task(function test_frequencyCappedSites_views() {
   Services.prefs.setCharPref(kPingUrlPref, "");
+  let origGetFrecentSitesName = DirectoryLinksProvider.getFrecentSitesName;
+  DirectoryLinksProvider.getFrecentSitesName = () => "";
   let origIsTopPlacesSite = NewTabUtils.isTopPlacesSite;
   NewTabUtils.isTopPlacesSite = () => true;
 
@@ -594,6 +605,7 @@ add_task(function test_frequencyCappedSites_views() {
   checkFirstTypeAndLength("organic", 1);
 
   // Cleanup.
+  DirectoryLinksProvider.getFrecentSitesName = origGetFrecentSitesName;
   NewTabUtils.isTopPlacesSite = origIsTopPlacesSite;
   DirectoryLinksProvider._getCurrentTopSiteCount = origCurrentTopSiteCount;
   gLinks.removeProvider(DirectoryLinksProvider);
@@ -603,6 +615,8 @@ add_task(function test_frequencyCappedSites_views() {
 
 add_task(function test_frequencyCappedSites_click() {
   Services.prefs.setCharPref(kPingUrlPref, "");
+  let origGetFrecentSitesName = DirectoryLinksProvider.getFrecentSitesName;
+  DirectoryLinksProvider.getFrecentSitesName = () => "";
   let origIsTopPlacesSite = NewTabUtils.isTopPlacesSite;
   NewTabUtils.isTopPlacesSite = () => true;
 
@@ -663,6 +677,7 @@ add_task(function test_frequencyCappedSites_click() {
   checkFirstTypeAndLength("organic", 1);
 
   // Cleanup.
+  DirectoryLinksProvider.getFrecentSitesName = origGetFrecentSitesName;
   NewTabUtils.isTopPlacesSite = origIsTopPlacesSite;
   DirectoryLinksProvider._getCurrentTopSiteCount = origCurrentTopSiteCount;
   gLinks.removeProvider(DirectoryLinksProvider);
@@ -1139,6 +1154,8 @@ add_task(function test_DirectoryLinksProvider_getEnhancedLink() {
 });
 
 add_task(function test_DirectoryLinksProvider_enhancedURIs() {
+  let origGetFrecentSitesName = DirectoryLinksProvider.getFrecentSitesName;
+  DirectoryLinksProvider.getFrecentSitesName = () => "";
   let origIsTopPlacesSite = NewTabUtils.isTopPlacesSite;
   NewTabUtils.isTopPlacesSite = () => true;
   let origCurrentTopSiteCount = DirectoryLinksProvider._getCurrentTopSiteCount;
@@ -1182,6 +1199,7 @@ add_task(function test_DirectoryLinksProvider_enhancedURIs() {
   do_check_eq(links[0].enhancedImageURI, "data:,net1");
 
   // Cleanup.
+  DirectoryLinksProvider.getFrecentSitesName = origGetFrecentSitesName;
   NewTabUtils.isTopPlacesSite = origIsTopPlacesSite;
   DirectoryLinksProvider._getCurrentTopSiteCount = origCurrentTopSiteCount;
   gLinks.removeProvider(DirectoryLinksProvider);

From 208eb270b585956fe4ddc55db701665269054593 Mon Sep 17 00:00:00 2001
From: Ed Lee <edilee@mozilla.com>
Date: Wed, 1 Apr 2015 01:02:50 -0700
Subject: [PATCH 08/88] Bug 1148862 - Update pref to the new v3 endpoint
 [r=adw]

---
 browser/app/profile/firefox.js             | 4 ++--
 browser/modules/DirectoryLinksProvider.jsm | 5 -----
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index b3d120efd26..43d7c75f033 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -1646,10 +1646,10 @@ pref("browser.newtabpage.rows", 3);
 pref("browser.newtabpage.columns", 5);
 
 // directory tiles download URL
-pref("browser.newtabpage.directory.source", "https://tiles.services.mozilla.com/v2/links/fetch/%LOCALE%");
+pref("browser.newtabpage.directory.source", "https://tiles.services.mozilla.com/v3/links/fetch/%LOCALE%/%CHANNEL%");
 
 // endpoint to send newtab click and view pings
-pref("browser.newtabpage.directory.ping", "https://tiles.services.mozilla.com/v2/links/");
+pref("browser.newtabpage.directory.ping", "https://tiles.services.mozilla.com/v3/links/");
 
 // Enable the DOM fullscreen API.
 pref("full-screen-api.enabled", true);
diff --git a/browser/modules/DirectoryLinksProvider.jsm b/browser/modules/DirectoryLinksProvider.jsm
index 20c2d99e1b6..5d2519d635a 100644
--- a/browser/modules/DirectoryLinksProvider.jsm
+++ b/browser/modules/DirectoryLinksProvider.jsm
@@ -150,11 +150,6 @@ let DirectoryLinksProvider = {
     if (!this.__linksURL) {
       try {
         this.__linksURL = Services.prefs.getCharPref(this._observedPrefs["linksURL"]);
-
-        // Temporarily override the default for en-US until new endpoint is live
-        if (this.locale == "en-US" && !Services.prefs.prefHasUserValue(this._observedPrefs["linksURL"])) {
-          this.__linksURL = "data:text/plain;base64,ewogICAgImRpcmVjdG9yeSI6IFsKICAgICAgICB7CiAgICAgICAgICAgICJiZ0NvbG9yIjogIiIsCiAgICAgICAgICAgICJkaXJlY3RvcnlJZCI6IDQ5OCwKICAgICAgICAgICAgImVuaGFuY2VkSW1hZ2VVUkkiOiAiaHR0cHM6Ly9kdGV4NGt2YnBwb3Z0LmNsb3VkZnJvbnQubmV0L2ltYWdlcy9kMTFiYTBiMzA5NWJiMTlkODA5MmNkMjliZTljYmI5ZTE5NzY3MWVhLjI4MDg4LnBuZyIsCiAgICAgICAgICAgICJpbWFnZVVSSSI6ICJodHRwczovL2R0ZXg0a3ZicHBvdnQuY2xvdWRmcm9udC5uZXQvaW1hZ2VzLzEzMzJhNjhiYWRmMTFlM2Y3ZjY5YmY3MzY0ZTc5YzBhN2UyNzUzYmMuNTMxNi5wbmciLAogICAgICAgICAgICAidGl0bGUiOiAiTW96aWxsYSBDb21tdW5pdHkiLAogICAgICAgICAgICAidHlwZSI6ICJhZmZpbGlhdGUiLAogICAgICAgICAgICAidXJsIjogImh0dHA6Ly9jb250cmlidXRlLm1vemlsbGEub3JnLyIKICAgICAgICB9LAogICAgICAgIHsKICAgICAgICAgICAgImJnQ29sb3IiOiAiIiwKICAgICAgICAgICAgImRpcmVjdG9yeUlkIjogNTAwLAogICAgICAgICAgICAiZW5oYW5jZWRJbWFnZVVSSSI6ICJodHRwczovL2R0ZXg0a3ZicHBvdnQuY2xvdWRmcm9udC5uZXQvaW1hZ2VzL2NjNjM3NzRiN2E5YWFlMDJmZTM2YmM1Y2FmOTBjMWUyNWU2NmEyYmMuMTM3OTEucG5nIiwKICAgICAgICAgICAgImltYWdlVVJJIjogImh0dHBzOi8vZHRleDRrdmJwcG92dC5jbG91ZGZyb250Lm5ldC9pbWFnZXMvZTgyMmNkNDYyOGM1MTYyMzEzZjQ5ZjVkNDU1NmY4YWFmZGYzODc1MC4xMTUxMy5wbmciLAogICAgICAgICAgICAidGl0bGUiOiAiTW96aWxsYSBNYW5pZmVzdG8iLAogICAgICAgICAgICAidHlwZSI6ICJhZmZpbGlhdGUiLAogICAgICAgICAgICAidXJsIjogImh0dHBzOi8vd3d3Lm1vemlsbGEub3JnL2Fib3V0L21hbmlmZXN0by8iCiAgICAgICAgfSwKICAgICAgICB7CiAgICAgICAgICAgICJiZ0NvbG9yIjogIiIsCiAgICAgICAgICAgICJkaXJlY3RvcnlJZCI6IDUwMiwKICAgICAgICAgICAgImVuaGFuY2VkSW1hZ2VVUkkiOiAiaHR0cHM6Ly9kdGV4NGt2YnBwb3Z0LmNsb3VkZnJvbnQubmV0L2ltYWdlcy80MGU1NjMwNDA1ZDUwMzFjYTczMzkzYmQ3YmMwMDY0MTU2ZjJjYzgyLjEwOTg0LnBuZyIsCiAgICAgICAgICAgICJpbWFnZVVSSSI6ICJodHRwczovL2R0ZXg0a3ZicHBvdnQuY2xvdWRmcm9udC5uZXQvaW1hZ2VzLzQ5MGQ0MmQxZjlhNzZjMDc3Mzk2MjZkMWI4YTU2OTE2OWFlYzhmYmUuMTEwMzkucG5nIiwKICAgICAgICAgICAgInRpdGxlIjogIkN1c3RvbWl6ZSBGaXJlZm94IiwKICAgICAgICAgICAgInR5cGUiOiAiYWZmaWxpYXRlIiwKICAgICAgICAgICAgInVybCI6ICJodHRwOi8vZmFzdGVzdGZpcmVmb3guY29tL2ZpcmVmb3gvZGVza3RvcC9jdXN0b21pemUvIgogICAgICAgIH0sCiAgICAgICAgewogICAgICAgICAgICAiYmdDb2xvciI6ICIiLAogICAgICAgICAgICAiZGlyZWN0b3J5SWQiOiA1MDQsCiAgICAgICAgICAgICJlbmhhbmNlZEltYWdlVVJJIjogImh0dHBzOi8vZHRleDRrdmJwcG92dC5jbG91ZGZyb250Lm5ldC9pbWFnZXMvODc3ZjFjNTYxZTczNWY3YjlmNDE5ZmY5YWM3OWViOGM3NDgxMTE5ZC4xNjc0NC5wbmciLAogICAgICAgICAgICAiaW1hZ2VVUkkiOiAiaHR0cHM6Ly9kdGV4NGt2YnBwb3Z0LmNsb3VkZnJvbnQubmV0L2ltYWdlcy8yNWM5ZmJiMDczMDhiODRkMTYwZmMxYjc5NTkzNjRhMmMxOGY5M2I5LjY0MDQucG5nIiwKICAgICAgICAgICAgInRpdGxlIjogIkZpcmVmb3ggTWFya2V0cGxhY2UiLAogICAgICAgICAgICAidHlwZSI6ICJhZmZpbGlhdGUiLAogICAgICAgICAgICAidXJsIjogImh0dHBzOi8vbWFya2V0cGxhY2UuZmlyZWZveC5jb20vIgogICAgICAgIH0sCiAgICAgICAgewogICAgICAgICAgICAiYmdDb2xvciI6ICIjM2ZiNThlIiwKICAgICAgICAgICAgImRpcmVjdG9yeUlkIjogNTA1LAogICAgICAgICAgICAiZW5oYW5jZWRJbWFnZVVSSSI6ICJodHRwczovL2R0ZXg0a3ZicHBvdnQuY2xvdWRmcm9udC5uZXQvaW1hZ2VzLzcyMDEyMWU3NDYyZDhjNzg2M2I0ZGQ4ZmE3YjVjMTA4OWI1ZjVmYjIuMzM4NjIucG5nIiwKICAgICAgICAgICAgImltYWdlVVJJIjogImh0dHBzOi8vZHRleDRrdmJwcG92dC5jbG91ZGZyb250Lm5ldC9pbWFnZXMvMGU2MDMxNjc1YTljNDkxZGQwYzY1ZTljNjdjZmJmNTRhNTg4MGYxNy4yMjk1LnN2ZyIsCiAgICAgICAgICAgICJ0aXRsZSI6ICJNb3ppbGxhIFdlYm1ha2VyIiwKICAgICAgICAgICAgInR5cGUiOiAiYWZmaWxpYXRlIiwKICAgICAgICAgICAgInVybCI6ICJodHRwczovL3dlYm1ha2VyLm9yZy8%2FdXRtX3NvdXJjZT1kaXJlY3RvcnktdGlsZXMmdXRtX21lZGl1bT1maXJlZm94LWJyb3dzZXIiCiAgICAgICAgfSwKICAgICAgICB7CiAgICAgICAgICAgICJiZ0NvbG9yIjogIiIsCiAgICAgICAgICAgICJkaXJlY3RvcnlJZCI6IDUwNiwKICAgICAgICAgICAgImVuaGFuY2VkSW1hZ2VVUkkiOiAiaHR0cHM6Ly9kdGV4NGt2YnBwb3Z0LmNsb3VkZnJvbnQubmV0L2ltYWdlcy9kOTcxY2JhZmEwMzA5YTIwMWU1MThhY2RhYzRmMWVlNGRhYmM3ZWFhLjE1MTA5LnBuZyIsCiAgICAgICAgICAgICJpbWFnZVVSSSI6ICJodHRwczovL2R0ZXg0a3ZicHBvdnQuY2xvdWRmcm9udC5uZXQvaW1hZ2VzL2I0YWRjNThkZDNjMDJkYTM1NTEwNDk3N2I5MTAyNTUwNjBjZmQ2ZDguMTAzNTAucG5nIiwKICAgICAgICAgICAgInRpdGxlIjogIkZpcmVmb3ggU3luYyIsCiAgICAgICAgICAgICJ0eXBlIjogImFmZmlsaWF0ZSIsCiAgICAgICAgICAgICJ1cmwiOiAiaHR0cDovL21vemlsbGEtZXVyb3BlLm9yZy9maXJlZm94L3N5bmMiCiAgICAgICAgfSwKICAgICAgICB7CiAgICAgICAgICAgICJiZ0NvbG9yIjogIiIsCiAgICAgICAgICAgICJkaXJlY3RvcnlJZCI6IDUwNywKICAgICAgICAgICAgImVuaGFuY2VkSW1hZ2VVUkkiOiAiaHR0cHM6Ly9kdGV4NGt2YnBwb3Z0LmNsb3VkZnJvbnQubmV0L2ltYWdlcy8yMmZiODU2Y2Q1ODM2NTg1NWViNzI1YjE1NjVmMDhhNzI0NjRlMDM5LjE4NzE3LnBuZyIsCiAgICAgICAgICAgICJpbWFnZVVSSSI6ICJodHRwczovL2R0ZXg0a3ZicHBvdnQuY2xvdWRmcm9udC5uZXQvaW1hZ2VzLzA2OGUwY2NiZDg3MDFhMjhlMmYwNzhjNjQwZWUwNzJiOWExNmUyZTEuMTI0OTAucG5nIiwKICAgICAgICAgICAgInRpdGxlIjogIlByaXZhY3kgUHJpbmNpcGxlcyIsCiAgICAgICAgICAgICJ0eXBlIjogImFmZmlsaWF0ZSIsCiAgICAgICAgICAgICJ1cmwiOiAiaHR0cDovL2V1cm9wZS5tb3ppbGxhLm9yZy9wcml2YWN5L3lvdSIKICAgICAgICB9CiAgICBdLAogICAgInN1Z2dlc3RlZCI6IFsKICAgICAgICB7CiAgICAgICAgICAgICJiZ0NvbG9yIjogIiNjYWUxZjQiLAogICAgICAgICAgICAiZGlyZWN0b3J5SWQiOiA3MDIsCiAgICAgICAgICAgICJmcmVjZW50X3NpdGVzIjogWwogICAgICAgICAgICAgICAgImFkZG9ucy5tb3ppbGxhLm9yZyIsCiAgICAgICAgICAgICAgICAiYWlyLm1vemlsbGEub3JnIiwKICAgICAgICAgICAgICAgICJibG9nLm1vemlsbGEub3JnIiwKICAgICAgICAgICAgICAgICJidWd6aWxsYS5tb3ppbGxhLm9yZyIsCiAgICAgICAgICAgICAgICAiZGV2ZWxvcGVyLm1vemlsbGEub3JnIiwKICAgICAgICAgICAgICAgICJldGhlcnBhZC5tb3ppbGxhLm9yZyIsCiAgICAgICAgICAgICAgICAiaGFja3MubW96aWxsYS5vcmciLAogICAgICAgICAgICAgICAgImhnLm1vemlsbGEub3JnIiwKICAgICAgICAgICAgICAgICJtb3ppbGxhLm9yZyIsCiAgICAgICAgICAgICAgICAicGxhbmV0Lm1vemlsbGEub3JnIiwKICAgICAgICAgICAgICAgICJxdWFsaXR5Lm1vemlsbGEub3JnIiwKICAgICAgICAgICAgICAgICJzdXBwb3J0Lm1vemlsbGEub3JnIiwKICAgICAgICAgICAgICAgICJzdXBwb3J0Lm1vemlsbGEub3JnIiwKICAgICAgICAgICAgICAgICJ0cmVlaGVyZGVyLm1vemlsbGEub3JnIiwKICAgICAgICAgICAgICAgICJ3aWtpLm1vemlsbGEub3JnIgogICAgICAgICAgICBdLAogICAgICAgICAgICAiaW1hZ2VVUkkiOiAiaHR0cHM6Ly9kdGV4NGt2YnBwb3Z0LmNsb3VkZnJvbnQubmV0L2ltYWdlcy85ZWUyYjI2NTY3OGYyNzc1ZGUyZTRiZjY4MGRmNjAwYjUwMmU2MDM4LjM4NzUucG5nIiwKICAgICAgICAgICAgInRpdGxlIjogIlRoYW5rcyBmb3IgdGVzdGluZyEiLAogICAgICAgICAgICAidHlwZSI6ICJhZmZpbGlhdGUiLAogICAgICAgICAgICAidXJsIjogImh0dHBzOi8vd3d3Lm1vemlsbGEuY29tL2ZpcmVmb3gvdGlsZXMiCiAgICAgICAgfQogICAgXQp9Cg%3D%3D";
-        }
       }
       catch (e) {
         Cu.reportError("Error fetching directory links url from prefs: " + e);

From 6569f5989cd36f59b63ad044b189e5748c92999e Mon Sep 17 00:00:00 2001
From: Ed Lee <edilee@mozilla.com>
Date: Tue, 21 Apr 2015 23:32:04 -0700
Subject: [PATCH 09/88] Bug 1156876 - Convert wiki page technical doc into
 in-tree .rst [r=bsmedberg]

---
 browser/docs/DirectoryLinksProvider.rst | 248 ++++++++++++++++++++++++
 browser/docs/index.rst                  |   1 +
 2 files changed, 249 insertions(+)
 create mode 100644 browser/docs/DirectoryLinksProvider.rst

diff --git a/browser/docs/DirectoryLinksProvider.rst b/browser/docs/DirectoryLinksProvider.rst
new file mode 100644
index 00000000000..ec02779ad66
--- /dev/null
+++ b/browser/docs/DirectoryLinksProvider.rst
@@ -0,0 +1,248 @@
+=============================================
+Directory Links Architecture and Data Formats
+=============================================
+
+Directory links are enhancements to the new tab experience that combine content
+Firefox already knows about from user browsing with external content. There are
+3 kinds of links:
+
+- directory links fill in additional tiles on the new tab page if there would
+  have been empty tiles because the user has a clean profile or cleared history
+- suggested links are shown if certain triggering criteria matches the user's
+  browsing behavior, i.e., if the user has a top site that matches one of
+  several possible sites. E.g., only show a sports suggestion if the user has a
+  sport site as a top site
+- enhanced links replace a matching user's visible history tile from the same
+  site but only the visual aspects: title, image, and rollover image
+
+To power the above features, DirectoryLinksProvider module downloads, at most
+once per 24 hours, the directory source links as JSON with enough data for
+Firefox to determine what should be shown or not. This module also handles
+reporting back data about the tiles via asynchronous pings that don't return
+data from the server.
+
+For the directory source and ping endpoints, the default preference values point
+to Mozilla key-pinned servers with encryption. No cookies are set by the servers
+but not enforced by Firefox.
+
+- default directory source endpoint:
+  https://tiles.services.mozilla.com/v3/links/fetch/%LOCALE%/%CHANNEL%
+- default directory ping endpoint: https://tiles.services.mozilla.com/v3/links/
+
+
+Preferences
+===========
+
+There are two main preferences that control downloading links and reporting
+metrics.
+
+``browser.newtabpage.directory.source``
+---------------------------------------
+
+This endpoint tells Firefox where to download directory source file as a GET
+request. It should return JSON of the appropriate format containing the relevant
+links data. The value can be a data URI, e.g., an empty JSON object effectively
+turns off remote downloading: ``data:text/plain,{}``
+
+The preference value will have %LOCALE% and %CHANNEL% replaced by the
+appropriate values for the build of Firefox, e.g.,
+
+- directory source endpoint:
+  https://tiles.services.mozilla.com/v3/links/fetch/en-US/release
+
+``browser.newtabpage.directory.ping``
+-------------------------------------
+
+This endpoint tells Firefox where to report Tiles metrics as a POST request. The
+data is sent as a JSON blob. Setting it to empty effectively turns off reporting
+of Tiles data.
+
+A path segment will be appended to the endpoint of "view" or "click" depending
+on the type of ping, e.g.,
+
+- ``view`` ping endpoint: https://tiles.services.mozilla.com/v3/links/view
+- ``click`` ping endpoint: https://tiles.services.mozilla.com/v3/links/click
+
+
+Data Flow
+=========
+
+When Firefox starts, it checks for a cached directory source file. If one
+exists, it checks for its timestamp to determine if a new file should be
+downloaded.
+
+If a directory source file needs to be downloaded, a GET request is made then
+cacheed and unpacked the JSON into the different types of links. Various checks
+filter out invalid links, e.g., those with http-hosted images or those that
+don't fit the allowed suggestions.
+
+When a new tab page is built, DirectoryLinksProvider module provides additional
+link data that is combined with history link data to determine which links can
+be displayed or not.
+
+When a new tab page is shown, a ``view`` ping is sent with relevant tiles data.
+Similarly, when the user clicks on various parts of tiles (to load the page,
+pin, block, etc.), a ``click`` ping is sent with similar data. Both of these can
+trigger downloading of fresh directory source links if 24 hours have elapsed
+since last download.
+
+Users can turn off the ping with in-new-tab-page controls.
+
+As the new tab page is rendered, any images for tiles are downloaded if not
+already cached. The default servers hosting the images are Mozilla CDN that
+don't use cookies: https://tiles.cdn.mozilla.net/
+
+
+Source JSON Format
+==================
+
+Firefox expects links data in a JSON object with top level keys each providing
+an array of tile objects. The keys correspond to the different types of links:
+``directory``, ``suggested``, and ``enhanced``.
+
+Example
+-------
+
+Below is an example directory source file::
+
+  {
+      "directory": [
+          {
+              "bgColor": "",
+              "directoryId": 498,
+              "enhancedImageURI": "https://tiles.cdn.mozilla.net/images/d11ba0b3095bb19d8092cd29be9cbb9e197671ea.28088.png",
+              "imageURI": "https://tiles.cdn.mozilla.net/images/1332a68badf11e3f7f69bf7364e79c0a7e2753bc.5316.png",
+              "title": "Mozilla Community",
+              "type": "affiliate",
+              "url": "http://contribute.mozilla.org/"
+          }
+      ],
+      "enhanced": [
+          {
+              "bgColor": "",
+              "directoryId": 776,
+              "enhancedImageURI": "https://tiles.cdn.mozilla.net/images/44a14fc405cebc299ead86514dff0e3735c8cf65.10814.png",
+              "imageURI": "https://tiles.cdn.mozilla.net/images/20e24aa2219ec7542cc8cf0fd79f0c81e16ebeac.11859.png",
+              "title": "TurboTax",
+              "type": "sponsored",
+              "url": "https://turbotax.intuit.com/"
+          }
+      ],
+      "suggested": [
+          {
+              "bgColor": "#cae1f4",
+              "directoryId": 702,
+              "frecent_sites": [
+                  "addons.mozilla.org",
+                  "air.mozilla.org",
+                  "blog.mozilla.org",
+                  "bugzilla.mozilla.org",
+                  "developer.mozilla.org",
+                  "etherpad.mozilla.org",
+                  "hacks.mozilla.org",
+                  "hg.mozilla.org",
+                  "mozilla.org",
+                  "planet.mozilla.org",
+                  "quality.mozilla.org",
+                  "support.mozilla.org",
+                  "treeherder.mozilla.org",
+                  "wiki.mozilla.org"
+              ],
+              "imageURI": "https://tiles.cdn.mozilla.net/images/9ee2b265678f2775de2e4bf680df600b502e6038.3875.png",
+              "title": "Thanks for testing!",
+              "type": "affiliate",
+              "url": "https://www.mozilla.com/firefox/tiles"
+          }
+      ]
+  }
+
+Link Object
+-----------
+
+Each link object has various values that Firefox uses to display a tile:
+
+- ``url`` - string url for the page to be loaded when the tile is clicked. Only
+  https and http URLs are allowed.
+- ``title`` - string that appears below the tile.
+- ``type`` - string relationship of the link to Mozilla. Expected values:
+  affiliate, organic, sponsored.
+- ``imageURI`` - string url for the tile image to show. Only https and data URIs
+  are allowed.
+- ``enhancedImageURI`` - string url for the image to be shown before the user
+  hovers. Only https and data URIs are allowed.
+- ``bgColor`` - string css color for additional fill background color.
+- ``directoryId`` - id of the tile to be used during ping reporting
+
+Suggested Link Object Extras
+----------------------------
+
+A suggested link has additional values:
+
+- ``frecent_sites`` - array of strings of the sites that can trigger showing a
+  Suggested Tile if the user has the site in one of the top 100 most-frecent
+  pages. Only preapproved array of strings that are hardcoded into the
+  DirectoryLinksProvider module are allowed.
+
+The preapproved arrays follow a policy for determining what topic grouping is
+allowed as well as the composition of a grouping. The topics are broad
+uncontroversial categories, e.g., Mobile Phone, News, Technology, Video Game,
+Web Development. There are at least 5 sites within a grouping, and as many
+popular sites relevant to the topic are included to avoid having one site be
+clearly dominant. These requirements provide some deniability of which site
+actually triggered a suggestion during ping reporting, so it's more difficult to
+determine if a user has gone to a specific site.
+
+
+Ping JSON Format
+================
+
+Firefox reports back an action and the state of tiles on the new tab page based
+on the user opening a new tab or clicking a tile. The top level keys of the
+ping:
+
+- ``locale`` - string locale of the Firefox build
+- ``tiles`` - array of tiles ping objects
+
+An additional key at the top level indicates which action triggered the ping.
+The value associated to the action key is the 0-based index into the tiles array
+of which tile triggered the action. Valid actions: block, click, pin, sponsored,
+sponsored_link, unpin, view. E.g., if the second tile is being clicked, the ping
+will have ``"click": 1``
+
+Example
+-------
+
+Below is an example ``click`` ping with 3 tiles: a pinned suggested tile
+followed by a history tile and a directory tile. The first tile is being
+blocked::
+
+  {
+      "locale": "en-US",
+      "tiles": [
+          {
+              "id": 702,
+              "pin": 1,
+          },
+          {},
+          {
+              "id": 498,
+          }
+      ],
+      "block": 0
+  }
+
+Tiles Ping Object
+-----------------
+
+Each tile of the new tab page is reported back as part of the ping with some or
+none of the following optional values:
+
+- ``id`` - id that was provided as part of the downloaded link object (for all
+  types of links: directory, suggested, enhanced); not present if the tile was
+  created from user behavior, e.g., visiting pages
+- ``pinned`` - 1 if the tile is pinned; not present otherwise
+- ``pos`` - integer position if the tile is not in the natural order, e.g., a
+  pinned tile after an empty slot; not present otherwise
+- ``score`` - integer truncated score based on the tile's frecency; not present
+  if 0
+- ``url`` - empty string if it's an enhanced tile; not present otherwise
diff --git a/browser/docs/index.rst b/browser/docs/index.rst
index 67fc69c8dc3..ad745b8feab 100644
--- a/browser/docs/index.rst
+++ b/browser/docs/index.rst
@@ -7,4 +7,5 @@ This is the nascent documentation of the Firefox front-end code.
 .. toctree::
    :maxdepth: 1
 
+   DirectoryLinksProvider
    UITelemetry

From 3a5b6fe7225e8acb1ee50bc216d1852bf6b83765 Mon Sep 17 00:00:00 2001
From: Marco Bonardo <mbonardo@mozilla.com>
Date: Thu, 30 Apr 2015 10:40:10 +0200
Subject: [PATCH 10/88] Bug 1159462 - unreachable code in
 editBookmarkOverlay.js. r=mano

---
 browser/components/places/content/editBookmarkOverlay.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/browser/components/places/content/editBookmarkOverlay.js b/browser/components/places/content/editBookmarkOverlay.js
index fbc31241c22..0dc8a69083a 100644
--- a/browser/components/places/content/editBookmarkOverlay.js
+++ b/browser/components/places/content/editBookmarkOverlay.js
@@ -1004,12 +1004,14 @@ let gEditItemOverlay = {
                 aLastModified, aItemType) {
     if (aProperty == "tags" && this._paneInfo.visibleRows.has("tagsRow"))
       this._onTagsChange(aItemId);
-    else if (this._paneInfo.isItem && aProperty == "title")
-      this._onItemTitleChange(aItemId, aValue);
-    else (!this._paneInfo.isItem || this._paneInfo.itemId != aItemId)
+    else if (!this._paneInfo.isItem || this._paneInfo.itemId != aItemId)
       return;
 
     switch (aProperty) {
+    case "title":
+      if (this._paneInfo.isItem)
+        this._onItemTitleChange(aItemId, aValue);
+      break;
     case "uri":
       let newURI = NetUtil.newURI(aValue);
       if (!newURI.equals(this._paneInfo.uri)) {

From 625bf6b2a2259744a1f361a5d791880433e4e9c6 Mon Sep 17 00:00:00 2001
From: Alexandre Poirot <poirot.alex@gmail.com>
Date: Wed, 29 Apr 2015 09:08:24 +0200
Subject: [PATCH 11/88] Bug 1145049 - Clean inspector on detach/disconnect.
 r=pbrosset

---
 toolkit/devtools/server/actors/highlighter.js |  7 +++
 toolkit/devtools/server/actors/inspector.js   | 48 ++++++++++++++++++-
 toolkit/devtools/server/actors/styles.js      | 36 +++++++++++++-
 3 files changed, 88 insertions(+), 3 deletions(-)

diff --git a/toolkit/devtools/server/actors/highlighter.js b/toolkit/devtools/server/actors/highlighter.js
index 45a37c1c254..0262b747473 100644
--- a/toolkit/devtools/server/actors/highlighter.js
+++ b/toolkit/devtools/server/actors/highlighter.js
@@ -184,6 +184,9 @@ let HighlighterActor = exports.HighlighterActor = protocol.ActorClass({
   },
 
   destroy: function() {
+    if (!this._inspector) {
+      return;
+    }
     protocol.Actor.prototype.destroy.call(this);
 
     this._destroyHighlighter();
@@ -195,6 +198,10 @@ let HighlighterActor = exports.HighlighterActor = protocol.ActorClass({
     this._layoutHelpers = null;
   },
 
+  disconnect: function () {
+    this.destroy();
+  },
+
   /**
    * Display the box model highlighting on a given NodeActor.
    * There is only one instance of the box model highlighter, so calling this
diff --git a/toolkit/devtools/server/actors/inspector.js b/toolkit/devtools/server/actors/inspector.js
index 8e5bc10480b..cc6ea41167a 100644
--- a/toolkit/devtools/server/actors/inspector.js
+++ b/toolkit/devtools/server/actors/inspector.js
@@ -220,6 +220,12 @@ var NodeActor = exports.NodeActor = protocol.ActorClass({
            this.rawNode.ownerDocument.documentElement === this.rawNode;
   },
 
+  destroy: function () {
+    protocol.Actor.prototype.destroy.call(this);
+    this.rawNode = null;
+    this.walker = null;
+  },
+
   // Returns the JSON representation of this object over the wire.
   form: function(detail) {
     if (detail === "actorid") {
@@ -1219,6 +1225,9 @@ var WalkerActor = protocol.ActorClass({
 
   destroy: function() {
     try {
+      if (this._destroyed) {
+        return;
+      }
       this._destroyed = true;
 
       this.clearPseudoClassLocks();
@@ -1226,6 +1235,17 @@ var WalkerActor = protocol.ActorClass({
 
       this._hoveredNode = null;
       this.rootDoc = null;
+      this.rootWin = null;
+      this.rootNode = null;
+      this.tabActor = null;
+      this.layoutHelpers = null;
+      this._orphaned = null;
+      this._retainedOrphans = null;
+      this._refMap.forEach(actor => {
+        this.unmanage(actor);
+        actor.destroy();
+      });
+      this._refMap = null;
 
       this.reflowObserver.off("reflows", this._onReflows);
       this.reflowObserver = null;
@@ -3312,6 +3332,30 @@ var InspectorActor = exports.InspectorActor = protocol.ActorClass({
     this.tabActor = tabActor;
   },
 
+  destroy: function () {
+    protocol.Actor.prototype.destroy.call(this);
+    this._highlighterPromise = null;
+    this._pageStylePromise = null;
+    this._walkerPromise = null;
+    if (this.walker) {
+      this.walker.destroy();
+    }
+    this.walker = null;
+    if (this.pageStyle) {
+      this.pageStyle.destroy();
+    }
+    this.pageStyle = null;
+    if (this.highlighter) {
+      this.highlighter.destroy();
+    }
+    this.highlighter = null;
+    this.tabActor = null;
+  },
+
+  disconnect: function () {
+    this.destroy();
+  },
+
   get window() this.tabActor.window,
 
   getWalker: method(function(options={}) {
@@ -3356,7 +3400,7 @@ var InspectorActor = exports.InspectorActor = protocol.ActorClass({
     }
 
     this._pageStylePromise = this.getWalker().then(walker => {
-      return PageStyleActor(this);
+      return this.pageStyle = PageStyleActor(this);
     });
     return this._pageStylePromise;
   }, {
@@ -3385,7 +3429,7 @@ var InspectorActor = exports.InspectorActor = protocol.ActorClass({
     }
 
     this._highlighterPromise = this.getWalker().then(walker => {
-      return HighlighterActor(this, autohide);
+      return this.highlighter = HighlighterActor(this, autohide);
     });
     return this._highlighterPromise;
   }, {
diff --git a/toolkit/devtools/server/actors/styles.js b/toolkit/devtools/server/actors/styles.js
index 39a6da7aa2f..83bffc2b83f 100644
--- a/toolkit/devtools/server/actors/styles.js
+++ b/toolkit/devtools/server/actors/styles.js
@@ -124,10 +124,32 @@ var PageStyleActor = protocol.ActorClass({
     // Stores the association of DOM objects -> actors
     this.refMap = new Map;
 
+    // Keep the list of StyleRuleActor created for font
+    // in order to clean them up when the PageStyleActor is collected
+    this.fontStyleActors = new Set;
+
     this.onFrameUnload = this.onFrameUnload.bind(this);
     events.on(this.inspector.tabActor, "will-navigate", this.onFrameUnload);
   },
 
+  destroy: function () {
+    if (!this.walker)
+      return;
+    protocol.Actor.prototype.destroy.call(this);
+    events.off(this.inspector.tabActor, "will-navigate", this.onFrameUnload);
+    this.inspector = null;
+    this.walker = null;
+    this.refMap.forEach(actor => {
+      this.unmanage(actor);
+      actor.destroy();
+    });
+    this.fontStyleActors.forEach(actor => actor.destroy());
+    this.fontStyleActors = null;
+    this.refMap = null;
+    this.cssLogic = null;
+    this._styleElement = null;
+  },
+
   get conn() this.inspector.conn,
 
   form: function(detail) {
@@ -307,7 +329,9 @@ var PageStyleActor = protocol.ActorClass({
 
       // If this font comes from a @font-face rule
       if (font.rule) {
-        fontFace.rule = StyleRuleActor(this, font.rule);
+        let styleActor = StyleRuleActor(this, font.rule);
+        this.fontStyleActors.add(styleActor);
+        fontFace.rule = styleActor;
         fontFace.ruleText = font.rule.cssText;
       }
 
@@ -963,6 +987,16 @@ var StyleRuleActor = protocol.ActorClass({
 
   get conn() this.pageStyle.conn,
 
+  destroy: function () {
+    if (!this.rawStyle)
+      return;
+    protocol.Actor.prototype.destroy.call(this);
+    this.rawStyle = null;
+    this.pageStyle = null;
+    this.rawNode = null;
+    this.rawRule = null;
+  },
+
   // Objects returned by this actor are owned by the PageStyleActor
   // to which this rule belongs.
   get marshallPool() this.pageStyle,

From 7be58a87a414c40231df7cd32b2310756280ec18 Mon Sep 17 00:00:00 2001
From: Mark Finkle <mfinkle@mozilla.com>
Date: Wed, 29 Apr 2015 10:23:19 -0400
Subject: [PATCH 12/88] Bug 1159263 - Add support to nsCaret to stop blinking
 after a set of cycles r=roc r=snorp

---
 layout/base/nsCaret.cpp      | 15 +++++++++++++++
 layout/base/nsCaret.h        |  6 ++++++
 mobile/android/app/mobile.js |  3 +++
 3 files changed, 24 insertions(+)

diff --git a/layout/base/nsCaret.cpp b/layout/base/nsCaret.cpp
index 8df23588040..2cf018ddc47 100644
--- a/layout/base/nsCaret.cpp
+++ b/layout/base/nsCaret.cpp
@@ -120,6 +120,7 @@ IsBidiUI()
 nsCaret::nsCaret()
 : mOverrideOffset(0)
 , mIsBlinkOn(false)
+, mBlinkCount(-1)
 , mVisible(false)
 , mReadOnly(false)
 , mShowDuringSelection(false)
@@ -594,6 +595,7 @@ void nsCaret::ResetBlinking()
   uint32_t blinkRate = static_cast<uint32_t>(
     LookAndFeel::GetInt(LookAndFeel::eIntID_CaretBlinkTime, 500));
   if (blinkRate > 0) {
+    mBlinkCount = Preferences::GetInt("ui.caretBlinkCount", -1);
     mBlinkTimer->InitWithFuncCallback(CaretBlinkCallback, this, blinkRate,
                                       nsITimer::TYPE_REPEATING_SLACK);
   }
@@ -913,6 +915,19 @@ void nsCaret::CaretBlinkCallback(nsITimer* aTimer, void* aClosure)
   }
   theCaret->mIsBlinkOn = !theCaret->mIsBlinkOn;
   theCaret->SchedulePaint();
+
+  // mBlinkCount of -1 means blink count is not enabled.
+  if (theCaret->mBlinkCount == -1) {
+    return;
+  }
+
+  // Track the blink count, but only at end of a blink cycle.
+  if (!theCaret->mIsBlinkOn) {
+    // If we exceeded the blink count, stop the timer.
+    if (--theCaret->mBlinkCount <= 0) {
+      theCaret->StopBlinking();
+    }
+  }
 }
 
 void
diff --git a/layout/base/nsCaret.h b/layout/base/nsCaret.h
index 814dd05798a..c5b8e4e2073 100644
--- a/layout/base/nsCaret.h
+++ b/layout/base/nsCaret.h
@@ -205,6 +205,12 @@ protected:
      * mIsBlinkOn is true when we're in a blink cycle where the caret is on.
      */
     bool                  mIsBlinkOn;
+    /**
+     * mBlinkCount is used to control the number of times to blink the caret
+     * before stopping the blink. This is reset each time we reset the
+     * blinking.
+     */
+    int32_t               mBlinkCount;
     /**
      * mIsVisible is true when SetVisible was last called with 'true'.
      */
diff --git a/mobile/android/app/mobile.js b/mobile/android/app/mobile.js
index 7845a685354..e3cdb9af26b 100644
--- a/mobile/android/app/mobile.js
+++ b/mobile/android/app/mobile.js
@@ -47,6 +47,9 @@ pref("browser.viewport.defaultZoom", -1);
 /* allow scrollbars to float above chrome ui */
 pref("ui.scrollbarsCanOverlapContent", 1);
 
+/* turn off the caret blink after 10 cycles */
+pref("ui.caretBlinkCount", 10);
+
 /* cache prefs */
 pref("browser.cache.disk.enable", true);
 pref("browser.cache.disk.capacity", 20480); // kilobytes

From c4c72decb353a4af4a5e3a1f788c5ac0e41851e9 Mon Sep 17 00:00:00 2001
From: Georg Fritzsche <georg.fritzsche@googlemail.com>
Date: Thu, 30 Apr 2015 14:00:58 +0200
Subject: [PATCH 13/88] Bug 1149754 - Part 4: Fix duplicated ping saving.
 r=dexter

---
 toolkit/components/telemetry/TelemetryStorage.jsm | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/toolkit/components/telemetry/TelemetryStorage.jsm b/toolkit/components/telemetry/TelemetryStorage.jsm
index d3826396f51..639985ed24c 100644
--- a/toolkit/components/telemetry/TelemetryStorage.jsm
+++ b/toolkit/components/telemetry/TelemetryStorage.jsm
@@ -443,8 +443,7 @@ let TelemetryStorageImpl = {
     return this.loadPingFile(pingPath).then(ping => {
       // Since we read a ping successfully, update the related histogram.
       Telemetry.getHistogramById("READ_SAVED_PING_SUCCESS").add(1);
-      this.addPendingPing(ping);
-      return this.savePing(ping, false);
+      return this.addPendingPing(ping);
     });
   },
 

From 0b95cfd27335a1f1afc74519a90c4c476b18726e Mon Sep 17 00:00:00 2001
From: Georg Fritzsche <georg.fritzsche@googlemail.com>
Date: Thu, 30 Apr 2015 14:00:58 +0200
Subject: [PATCH 14/88] Bug 1148500 - Part 1 (Fx 40): Introduce a
 toolkit.telemetry.unified pref. r=dexter

---
 mobile/android/app/mobile.js                    |  4 ++++
 modules/libpref/init/all.js                     |  4 ++++
 toolkit/components/telemetry/docs/index.rst     |  1 +
 .../components/telemetry/docs/preferences.rst   | 17 +++++++++++++++++
 4 files changed, 26 insertions(+)
 create mode 100644 toolkit/components/telemetry/docs/preferences.rst

diff --git a/mobile/android/app/mobile.js b/mobile/android/app/mobile.js
index e3cdb9af26b..b950c88503f 100644
--- a/mobile/android/app/mobile.js
+++ b/mobile/android/app/mobile.js
@@ -866,6 +866,10 @@ pref("reader.toolbar.vertical", false);
 // Whether or not to display buttons related to reading list in reader view.
 pref("browser.readinglist.enabled", true);
 
+// Telemetry settings.
+// Whether to use the unified telemetry behavior, requires a restart.
+pref("toolkit.telemetry.unified", false);
+
 // Selection carets never fall-back to internal LongTap detector.
 pref("selectioncaret.detects.longtap", false);
 
diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
index acc29098f8f..472ef85fa5e 100644
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -765,6 +765,8 @@ pref("toolkit.scrollbox.verticalScrollDistance", 3);
 pref("toolkit.scrollbox.horizontalScrollDistance", 5);
 pref("toolkit.scrollbox.clickToScroll.scrollDelay", 150);
 
+// Telemetry settings.
+// Server to submit telemetry pings to.
 pref("toolkit.telemetry.server", "https://incoming.telemetry.mozilla.org");
 // Telemetry server owner. Please change if you set toolkit.telemetry.server to a different server
 pref("toolkit.telemetry.server_owner", "Mozilla");
@@ -773,6 +775,8 @@ pref("toolkit.telemetry.infoURL", "https://www.mozilla.org/legal/privacy/firefox
 // Determines whether full SQL strings are returned when they might contain sensitive info
 // i.e. dynamically constructed SQL strings or SQL executed by addons against addon DBs
 pref("toolkit.telemetry.debugSlowSql", false);
+// Whether to use the unified telemetry behavior, requires a restart.
+pref("toolkit.telemetry.unified", true);
 
 // Identity module
 pref("toolkit.identity.enabled", false);
diff --git a/toolkit/components/telemetry/docs/index.rst b/toolkit/components/telemetry/docs/index.rst
index 84a7a45bd66..2c49b3ff5ca 100644
--- a/toolkit/components/telemetry/docs/index.rst
+++ b/toolkit/components/telemetry/docs/index.rst
@@ -19,3 +19,4 @@ Client-side, this consists of:
    common-ping
    environment
    main-ping
+   preferences
diff --git a/toolkit/components/telemetry/docs/preferences.rst b/toolkit/components/telemetry/docs/preferences.rst
new file mode 100644
index 00000000000..422411e89e1
--- /dev/null
+++ b/toolkit/components/telemetry/docs/preferences.rst
@@ -0,0 +1,17 @@
+Preferences
+===========
+
+Telemetry behaviour is controlled through the following preferences:
+
+``toolkit.telemetry.unified``
+
+  This controls whether unified behavior is enabled. If true:
+
+  * Telemetry is always enabled and recording *base* data.
+  * Telemetry will send additional ``main`` pings.
+
+``toolkit.telemetry.enabled``
+
+  If unified is off, this controls whether the Telemetry module is enabled.
+  If unified is on, this controls whether to record *extended* data.
+  This preference is controlled through the `Preferences` dialog.

From f594e8e05a2e4b32dbfd73de1d87b0a04da3ca3e Mon Sep 17 00:00:00 2001
From: Georg Fritzsche <georg.fritzsche@googlemail.com>
Date: Thu, 30 Apr 2015 14:00:58 +0200
Subject: [PATCH 15/88] Bug 1148500 - Part 2 (Fx 40): Complete Telemetry pref
 documentation. r=dexter

---
 toolkit/components/telemetry/docs/pings.rst   | 10 -------
 .../components/telemetry/docs/preferences.rst | 30 +++++++++++++++++--
 2 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/toolkit/components/telemetry/docs/pings.rst b/toolkit/components/telemetry/docs/pings.rst
index 2eb3078450d..28b5af3b5e1 100644
--- a/toolkit/components/telemetry/docs/pings.rst
+++ b/toolkit/components/telemetry/docs/pings.rst
@@ -45,13 +45,3 @@ To allow for cheaper lookup of archived pings, storage follows a specific naming
 * ``<timestamp>`` - Timestamp of the ping creation date.
 * ``<UUID>`` - The ping identifier.
 * ``<type>`` - The ping type.
-
-Preferences
-===========
-
-Telemetry behaviour is controlled through the following preferences:
-
-* ``datareporting.healthreport.service.enabled`` - If true, records base Telemetry data. Otherwise, completely disables telemetry recording.
-* ``toolkit.telemetry.enabled`` - If true, record the extended Telemetry data. Please note that base Telemetry data needs to be enabled as well and we need to be in an official build or in test mode. This preference is controlled through the `Preferences` dialog.
-* ``datareporting.healthreport.uploadEnabled`` - Send the data we record if user has consented to FHR. This preference is controlled through the `Preferences` dialog.
-* ``toolkit.telemetry.archive.enabled`` - Allow pings to be archived locally.
diff --git a/toolkit/components/telemetry/docs/preferences.rst b/toolkit/components/telemetry/docs/preferences.rst
index 422411e89e1..50c0f74064b 100644
--- a/toolkit/components/telemetry/docs/preferences.rst
+++ b/toolkit/components/telemetry/docs/preferences.rst
@@ -1,7 +1,10 @@
 Preferences
 ===========
 
-Telemetry behaviour is controlled through the following preferences:
+Telemetry behaviour is controlled through the preferences listed here.
+
+*Note:* On official builds (which define ``MOZILLA_OFFICIAL``), Telemetry is only initialized when ``MOZ_TELEMETRY_REPORTING`` is defined.
+Sending only happens on official builds with ``MOZ_TELEMETRY_REPORTING`` defined.
 
 ``toolkit.telemetry.unified``
 
@@ -12,6 +15,27 @@ Telemetry behaviour is controlled through the following preferences:
 
 ``toolkit.telemetry.enabled``
 
-  If unified is off, this controls whether the Telemetry module is enabled.
-  If unified is on, this controls whether to record *extended* data.
+  If ``unified`` is off, this controls whether the Telemetry module is enabled.
+  If ``unified`` is on, this controls whether to record *extended* data.
   This preference is controlled through the `Preferences` dialog.
+
+``datareporting.healthreport.uploadEnabled``
+
+  Send the data we record if user has consented to FHR. This preference is controlled through the `Preferences` dialog.
+
+``toolkit.telemetry.archive.enabled``
+
+  Allow pings to be archived locally. This can only be enabled if ``unified`` is on.
+
+``toolkit.telemetry.server``
+
+  The server Telemetry pings are sent to.
+
+``toolkit.telemetry.log.level``
+
+  This sets the Telemetry logging verbosity per ``Log.jsm``, with ``Trace`` or ``0`` being the most verbose and the default being ``Warn``.
+  By default logging goes only the console service.
+
+``toolkit.telemetry.log.dump``
+
+  Sets whether to dump Telemetry log messages to ``stdout`` too.

From e3bc63a2a14cc593835b9a55452b17a100ea2660 Mon Sep 17 00:00:00 2001
From: Georg Fritzsche <georg.fritzsche@googlemail.com>
Date: Thu, 30 Apr 2015 14:00:58 +0200
Subject: [PATCH 16/88] Bug 1148500 - Part 3 (Fx 40): Honor
 toolkit.telemetry.unified pref in Telemetry modules. r=dexter

---
 .../telemetry/TelemetryController.jsm         | 28 +++---
 .../components/telemetry/TelemetrySession.jsm | 93 ++++++++++---------
 2 files changed, 64 insertions(+), 57 deletions(-)

diff --git a/toolkit/components/telemetry/TelemetryController.jsm b/toolkit/components/telemetry/TelemetryController.jsm
index 8f38f04587e..6f35746483f 100644
--- a/toolkit/components/telemetry/TelemetryController.jsm
+++ b/toolkit/components/telemetry/TelemetryController.jsm
@@ -35,6 +35,11 @@ const PREF_CACHED_CLIENTID = PREF_BRANCH + "cachedClientID";
 const PREF_FHR_ENABLED = "datareporting.healthreport.service.enabled";
 const PREF_FHR_UPLOAD_ENABLED = "datareporting.healthreport.uploadEnabled";
 const PREF_SESSIONS_BRANCH = "datareporting.sessions.";
+const PREF_UNIFIED = PREF_BRANCH + "unified";
+
+// Whether the FHR/Telemetry unification features are enabled.
+// Changing this pref requires a restart.
+const IS_UNIFIED_TELEMETRY = Preferences.get(PREF_UNIFIED, false);
 
 const PING_FORMAT_VERSION = 4;
 
@@ -816,13 +821,10 @@ let Impl = {
    *                   false otherwise.
    */
   enableTelemetryRecording: function enableTelemetryRecording() {
+    const enabled = Preferences.get(PREF_ENABLED, false);
+
     // Enable base Telemetry recording, if needed.
-#if !defined(MOZ_WIDGET_ANDROID)
-    Telemetry.canRecordBase = Preferences.get(PREF_FHR_ENABLED, false);
-#else
-    // FHR recording is always "enabled" on Android (data upload is not).
-    Telemetry.canRecordBase = true;
-#endif
+    Telemetry.canRecordBase = enabled || IS_UNIFIED_TELEMETRY;
 
 #ifdef MOZILLA_OFFICIAL
     if (!Telemetry.isOfficialTelemetry && !this._testMode) {
@@ -834,7 +836,6 @@ let Impl = {
     }
 #endif
 
-    let enabled = Preferences.get(PREF_ENABLED, false);
     this._server = Preferences.get(PREF_SERVER, undefined);
     if (!enabled || !Telemetry.canRecordBase) {
       // Turn off extended telemetry recording if disabled by preferences or if base/telemetry
@@ -874,16 +875,13 @@ let Impl = {
 
     // Only initialize the session recorder if FHR is enabled.
     // TODO: move this after the |enableTelemetryRecording| block and drop the
-    // PREF_FHR_ENABLED check after bug 1137252 lands.
-    if (!this._sessionRecorder && Preferences.get(PREF_FHR_ENABLED, true)) {
+    // PREF_FHR_ENABLED check once we permanently switch over to unified Telemetry.
+    if (!this._sessionRecorder &&
+        (Preferences.get(PREF_FHR_ENABLED, true) || IS_UNIFIED_TELEMETRY)) {
       this._sessionRecorder = new SessionRecorder(PREF_SESSIONS_BRANCH);
       this._sessionRecorder.onStartup();
     }
 
-    // Initialize some probes that are kept in their own modules
-    this._thirdPartyCookies = new ThirdPartyCookieProbe();
-    this._thirdPartyCookies.init();
-
     if (!this.enableTelemetryRecording()) {
       this._log.config("setupChromeProcess - Telemetry recording is disabled, skipping Chrome process setup.");
       return Promise.resolve();
@@ -1031,11 +1029,13 @@ let Impl = {
   /**
    * Check if pings can be sent to the server. If FHR is not allowed to upload,
    * pings are not sent to the server (Telemetry is a sub-feature of FHR).
+   * If unified telemetry is off, don't send pings if Telemetry is disabled.
    * @return {Boolean} True if pings can be send to the servers, false otherwise.
    */
   _canSend: function() {
     return (Telemetry.isOfficialTelemetry || this._testMode) &&
-           Preferences.get(PREF_FHR_UPLOAD_ENABLED, false);
+           Preferences.get(PREF_FHR_UPLOAD_ENABLED, false) &&
+           (IS_UNIFIED_TELEMETRY || Preferences.get(PREF_ENABLED));
   },
 
   /**
diff --git a/toolkit/components/telemetry/TelemetrySession.jsm b/toolkit/components/telemetry/TelemetrySession.jsm
index 294dbf74720..9fbef9be724 100644
--- a/toolkit/components/telemetry/TelemetrySession.jsm
+++ b/toolkit/components/telemetry/TelemetrySession.jsm
@@ -60,6 +60,8 @@ const PREF_BRANCH = "toolkit.telemetry.";
 const PREF_PREVIOUS_BUILDID = PREF_BRANCH + "previousBuildID";
 const PREF_FHR_UPLOAD_ENABLED = "datareporting.healthreport.uploadEnabled";
 const PREF_ASYNC_PLUGIN_INIT = "dom.ipc.plugins.asyncInit";
+const PREF_UNIFIED = PREF_BRANCH + "unified";
+
 
 const MESSAGE_TELEMETRY_PAYLOAD = "Telemetry:Payload";
 const MESSAGE_TELEMETRY_GET_CHILD_PAYLOAD = "Telemetry:GetChildPayload";
@@ -69,6 +71,10 @@ const ABORTED_SESSION_FILE_NAME = "aborted-session-ping";
 
 const SESSION_STATE_FILE_NAME = "session-state.json";
 
+// Whether the FHR/Telemetry unification features are enabled.
+// Changing this pref requires a restart.
+const IS_UNIFIED_TELEMETRY = Preferences.get(PREF_UNIFIED, false);
+
 // Maximum number of content payloads that we are willing to store.
 const MAX_NUM_CONTENT_PAYLOADS = 10;
 
@@ -1339,12 +1345,8 @@ let Impl = {
    * respectively.
    */
   assemblePayloadWithMeasurements: function(simpleMeasurements, info, reason, clearSubsession) {
-#if !defined(MOZ_WIDGET_GONK) && !defined(MOZ_WIDGET_ANDROID)
-    const isSubsession = !this._isClassicReason(reason);
-#else
-    const isSubsession = false;
-    clearSubsession = false;
-#endif
+    const isSubsession = IS_UNIFIED_TELEMETRY && !this._isClassicReason(reason);
+    clearSubsession = IS_UNIFIED_TELEMETRY && clearSubsession;
     this._log.trace("assemblePayloadWithMeasurements - reason: " + reason +
                     ", submitting subsession data: " + isSubsession);
 
@@ -1481,6 +1483,11 @@ let Impl = {
       return Promise.resolve();
     }
 
+    if (!Telemetry.canRecordBase && !testing) {
+      this._log.config("setupChromeProcess - Telemetry recording is disabled, skipping Chrome process setup.");
+      return Promise.resolve();
+    }
+
     // Generate a unique id once per session so the server can cope with duplicate
     // submissions, orphaning and other oddities. The id is shared across subsessions.
     this._sessionId = Policy.generateSessionUUID();
@@ -1503,11 +1510,6 @@ let Impl = {
       Preferences.set(PREF_PREVIOUS_BUILDID, thisBuildID);
     }
 
-    if (!Telemetry.canRecordBase && !testing) {
-      this._log.config("setupChromeProcess - Telemetry recording is disabled, skipping Chrome process setup.");
-      return Promise.resolve();
-    }
-
     TelemetryController.shutdown.addBlocker("TelemetrySession: shutting down",
                                       () => this.shutdownChromeProcess(),
                                       () => this._getState());
@@ -1541,23 +1543,26 @@ let Impl = {
 
         Telemetry.asyncFetchTelemetryData(function () {});
 
-#if !defined(MOZ_WIDGET_GONK) && !defined(MOZ_WIDGET_ANDROID)
-        // Check for a previously written aborted session ping.
-        yield this._checkAbortedSessionPing();
+        if (IS_UNIFIED_TELEMETRY) {
+          // Check for a previously written aborted session ping.
+          yield this._checkAbortedSessionPing();
 
-        TelemetryEnvironment.registerChangeListener(ENVIRONMENT_CHANGE_LISTENER,
-                                                    (reason, data) => this._onEnvironmentChange(reason, data));
-        // Write the first aborted-session ping as early as possible. Just do that
-        // if we are not testing, since calling Telemetry.reset() will make a previous
-        // aborted ping a pending ping.
-        if (!testing) {
-          yield this._saveAbortedSessionPing();
+          // Write the first aborted-session ping as early as possible. Just do that
+          // if we are not testing, since calling Telemetry.reset() will make a previous
+          // aborted ping a pending ping.
+          if (!testing) {
+            yield this._saveAbortedSessionPing();
+          }
+
+          TelemetryEnvironment.registerChangeListener(ENVIRONMENT_CHANGE_LISTENER,
+                                 (reason, data) => this._onEnvironmentChange(reason, data));
+
+          // Start the scheduler.
+          // We skip this if unified telemetry is off, so we don't
+          // trigger the new unified ping types.
+          TelemetryScheduler.init();
         }
 
-        // Start the scheduler.
-        TelemetryScheduler.init();
-#endif
-
         this._delayedInitTaskDeferred.resolve();
       } catch (e) {
         this._delayedInitTaskDeferred.reject(e);
@@ -1663,7 +1668,10 @@ let Impl = {
   savePendingPings: function savePendingPings() {
     this._log.trace("savePendingPings");
 
-#ifndef MOZ_WIDGET_ANDROID
+    if (!IS_UNIFIED_TELEMETRY) {
+      return this.savePendingPingsClassic();
+    }
+
     let options = {
       retentionDays: RETENTION_DAYS,
       addClientId: true,
@@ -1677,9 +1685,6 @@ let Impl = {
     return TelemetryController.addPendingPing(getPingType(shutdownPayload), shutdownPayload, options)
                         .then(() => this.savePendingPingsClassic(),
                               () => this.savePendingPingsClassic());
-#else
-    return this.savePendingPingsClassic();
-#endif
   },
 
   /**
@@ -1869,10 +1874,10 @@ let Impl = {
     this._log.trace("shutdownChromeProcess - testing: " + testing);
 
     let cleanup = () => {
-#if !defined(MOZ_WIDGET_GONK) && !defined(MOZ_WIDGET_ANDROID)
-      TelemetryEnvironment.unregisterChangeListener(ENVIRONMENT_CHANGE_LISTENER);
-      TelemetryScheduler.shutdown();
-#endif
+      if (IS_UNIFIED_TELEMETRY) {
+        TelemetryEnvironment.unregisterChangeListener(ENVIRONMENT_CHANGE_LISTENER);
+        TelemetryScheduler.shutdown();
+      }
       this.uninstall();
 
       let reset = () => {
@@ -1881,13 +1886,17 @@ let Impl = {
       };
 
       if (Telemetry.isOfficialTelemetry || testing) {
-        return this.savePendingPings()
-                .then(() => this._stateSaveSerializer.flushTasks())
-#if !defined(MOZ_WIDGET_GONK) && !defined(MOZ_WIDGET_ANDROID)
-                .then(() => this._abortedSessionSerializer
-                                .enqueueTask(() => this._removeAbortedSessionPing()))
-#endif
-                .then(reset);
+        return Task.spawn(function*() {
+          yield this.savePendingPings();
+          yield this._stateSaveSerializer.flushTasks();
+
+          if (IS_UNIFIED_TELEMETRY) {
+            yield this._abortedSessionSerializer
+                      .enqueueTask(() => this._removeAbortedSessionPing());
+          }
+
+          reset();
+        }.bind(this));
       }
 
       reset();
@@ -1933,13 +1942,11 @@ let Impl = {
     };
 
     let promise = TelemetryController.submitExternalPing(getPingType(payload), payload, options);
-#if !defined(MOZ_WIDGET_GONK) && !defined(MOZ_WIDGET_ANDROID)
     // If required, also save the payload as an aborted session.
-    if (saveAsAborted) {
+    if (saveAsAborted && IS_UNIFIED_TELEMETRY) {
       let abortedPromise = this._saveAbortedSessionPing(payload);
       promise = promise.then(() => abortedPromise);
     }
-#endif
     return promise;
   },
 

From 43e04883db740f0fab688d42560da912d689a809 Mon Sep 17 00:00:00 2001
From: Georg Fritzsche <georg.fritzsche@googlemail.com>
Date: Thu, 30 Apr 2015 14:00:58 +0200
Subject: [PATCH 17/88] Bug 1148500 - Part 4 (Fx 40): Disable Telemetry
 recording in reftests. r=dexter

---
 layout/tools/reftest/runreftest.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/layout/tools/reftest/runreftest.py b/layout/tools/reftest/runreftest.py
index 45bf9a8203f..fda6b857b25 100644
--- a/layout/tools/reftest/runreftest.py
+++ b/layout/tools/reftest/runreftest.py
@@ -206,9 +206,7 @@ class RefTest(object):
     # Ensure that telemetry is disabled, so we don't connect to the telemetry
     # server in the middle of the tests.
     prefs['toolkit.telemetry.enabled'] = False
-    # Don't send Telemetry reports to the production server. This is
-    # needed as Telemetry sends pings also if FHR upload is enabled.
-    prefs['toolkit.telemetry.server'] = 'http://%(server)s/telemetry-dummy/'
+    prefs['toolkit.telemetry.unified'] = False
     # Likewise for safebrowsing.
     prefs['browser.safebrowsing.enabled'] = False
     prefs['browser.safebrowsing.malware.enabled'] = False

From f7d71d417c4f89230aacf74332f5f69e76305ef6 Mon Sep 17 00:00:00 2001
From: Georg Fritzsche <georg.fritzsche@googlemail.com>
Date: Thu, 30 Apr 2015 14:00:58 +0200
Subject: [PATCH 18/88] Bug 1140037 - (Fx 40) Fuzz daily telemetry ping
 submission times to avoid submission volume spikes around midnight. r=dexter

---
 .../telemetry/TelemetryController.jsm         | 102 +++++++++++++++++-
 .../components/telemetry/tests/unit/head.js   |  29 +++--
 .../tests/unit/test_TelemetryController.js    |  71 ++++++++++--
 3 files changed, 185 insertions(+), 17 deletions(-)

diff --git a/toolkit/components/telemetry/TelemetryController.jsm b/toolkit/components/telemetry/TelemetryController.jsm
index 6f35746483f..403b8adf717 100644
--- a/toolkit/components/telemetry/TelemetryController.jsm
+++ b/toolkit/components/telemetry/TelemetryController.jsm
@@ -21,6 +21,7 @@ Cu.import("resource://gre/modules/PromiseUtils.jsm", this);
 Cu.import("resource://gre/modules/Task.jsm", this);
 Cu.import("resource://gre/modules/DeferredTask.jsm", this);
 Cu.import("resource://gre/modules/Preferences.jsm");
+Cu.import("resource://gre/modules/Timer.jsm");
 
 const LOGGER_NAME = "Toolkit.Telemetry";
 const LOGGER_PREFIX = "TelemetryController::";
@@ -52,6 +53,12 @@ const DEFAULT_RETENTION_DAYS = 14;
 // Timeout after which we consider a ping submission failed.
 const PING_SUBMIT_TIMEOUT_MS = 2 * 60 * 1000;
 
+// We treat pings before midnight as happening "at midnight" with this tolerance.
+const MIDNIGHT_TOLERANCE_MS = 15 * 60 * 1000;
+// We try to spread "midnight" pings out over this interval.
+const MIDNIGHT_FUZZING_INTERVAL_MS = 60 * 60 * 1000;
+const MIDNIGHT_FUZZING_DELAY_MS = Math.random() * MIDNIGHT_FUZZING_INTERVAL_MS;
+
 XPCOMUtils.defineLazyModuleGetter(this, "ClientID",
                                   "resource://gre/modules/ClientID.jsm");
 XPCOMUtils.defineLazyServiceGetter(this, "Telemetry",
@@ -119,11 +126,30 @@ function isNewPingFormat(aPing) {
          ("version" in aPing) && (aPing.version >= 2);
 }
 
+/**
+ * Takes a date and returns it trunctated to a date with daily precision.
+ */
+function truncateToDays(date) {
+  return new Date(date.getFullYear(),
+                  date.getMonth(),
+                  date.getDate(),
+                  0, 0, 0, 0);
+}
+
+function tomorrow(date) {
+  let d = new Date(date);
+  d.setDate(d.getDate() + 1);
+  return d;
+}
+
 /**
  * This is a policy object used to override behavior for testing.
  */
 let Policy = {
   now: () => new Date(),
+  midnightPingFuzzingDelay: () => MIDNIGHT_FUZZING_DELAY_MS,
+  setPingSendTimeout: (callback, delayMs) => setTimeout(callback, delayMs),
+  clearPingSendTimeout: (id) => clearTimeout(id),
 }
 
 this.EXPORTED_SYMBOLS = ["TelemetryController"];
@@ -345,6 +371,9 @@ let Impl = {
   _delayedInitTask: null,
   // The deferred promise resolved when the initialization task completes.
   _delayedInitTaskDeferred: null,
+  // Timer for scheduled ping sends.
+  _pingSendTimer: null,
+
   // The session recorder, shared with FHR and the Data Reporting Service.
   _sessionRecorder: null,
   // This is a public barrier Telemetry clients can use to add blockers to the shutdown
@@ -488,6 +517,31 @@ let Impl = {
       }, error => this._log.error("addPendingPingFromFile - Unable to add the pending ping", error));
   },
 
+  /**
+   * This helper calculates the next time that we can send pings at.
+   * Currently this mostly redistributes ping sends around midnight to avoid submission
+   * spikes around local midnight for daily pings.
+   *
+   * @param now Date The current time.
+   * @return Number The next time (ms from UNIX epoch) when we can send pings.
+   */
+  _getNextPingSendTime: function(now) {
+    const todayDate = truncateToDays(now);
+    const tomorrowDate = tomorrow(todayDate);
+    const nextMidnightRangeStart = tomorrowDate.getTime() - MIDNIGHT_TOLERANCE_MS;
+    const currentMidnightRangeEnd = todayDate.getTime() - MIDNIGHT_TOLERANCE_MS + Policy.midnightPingFuzzingDelay();
+
+    if (now.getTime() < currentMidnightRangeEnd) {
+      return currentMidnightRangeEnd;
+    }
+
+    if (now.getTime() >= nextMidnightRangeStart) {
+      return nextMidnightRangeStart + Policy.midnightPingFuzzingDelay();
+    }
+
+    return now.getTime();
+  },
+
   /**
    * Submit ping payloads to Telemetry. This will assemble a complete ping, adding
    * environment data, client id and some general info.
@@ -514,12 +568,23 @@ let Impl = {
     // Always persist the pings if we are allowed to.
     let archivePromise = TelemetryArchive.promiseArchivePing(pingData)
       .catch(e => this._log.error("submitExternalPing - Failed to archive ping " + pingData.id, e));
-
     let p = [ archivePromise ];
 
-    if (!this._initialized) {
-      // We are still initializing and should not send yet, add this to the pending pings.
-      this._log.trace("submitExternalPing - still initializing, ping is pending");
+    // Check if we can send pings now.
+    const now = Policy.now();
+    const nextPingSendTime = this._getNextPingSendTime(now);
+    const throttled = (nextPingSendTime > now.getTime());
+
+    // We can't send pings now, schedule a later send.
+    if (throttled) {
+      this._log.trace("submitExternalPing - throttled, delaying ping send to " + new Date(nextPingSendTime));
+      this._reschedulePingSendTimer(nextPingSendTime);
+    }
+
+    if (!this._initialized || throttled) {
+      // We can't send because we are still initializing or throttled, add this to the pending pings.
+      this._log.trace("submitExternalPing - ping is pending, initialized: " + this._initialized +
+                      ", throttled: " + throttled);
       p.push(TelemetryStorage.addPendingPing(pingData));
     } else {
       // Try to send the ping, persist it if sending it fails.
@@ -546,6 +611,16 @@ let Impl = {
       return Promise.resolve();
     }
 
+    // Check if we can send pings now - otherwise schedule a later send.
+    const now = Policy.now();
+    const nextPingSendTime = this._getNextPingSendTime(now);
+    if (nextPingSendTime > now.getTime()) {
+      this._log.trace("sendPersistedPings - delaying ping send to " + new Date(nextPingSendTime));
+      this._reschedulePingSendTimer(nextPingSendTime);
+      return Promise.resolve();
+    }
+
+    // We can send now.
     let pingsIterator = Iterator(this.popPayloads());
     let p = [for (data of pingsIterator) this.doPing(data, true).catch((e) => {
       this._log.error("sendPersistedPings - doPing rejected", e);
@@ -959,7 +1034,11 @@ let Impl = {
     try {
       // First wait for clients processing shutdown.
       yield this._shutdownBarrier.wait();
-      // Then wait for any outstanding async ping activity.
+
+      // Then clear scheduled ping sends...
+      this._clearPingSendTimer();
+
+      // ... and wait for any outstanding async ping activity.
       yield this._connectionsBarrier.wait();
     } finally {
       // Reset state.
@@ -1051,6 +1130,19 @@ let Impl = {
     };
   },
 
+  _reschedulePingSendTimer: function(timestamp) {
+    this._clearPingSendTimer();
+    const interval = timestamp - Policy.now();
+    this._pingSendTimer = Policy.setPingSendTimeout(() => this.sendPersistedPings(), interval);
+  },
+
+  _clearPingSendTimer: function() {
+    if (this._pingSendTimer) {
+      Policy.clearPingSendTimeout(this._pingSendTimer);
+      this._pingSendTimer = null;
+    }
+  },
+
   /**
    * Allows waiting for TelemetryControllers delayed initialization to complete.
    * This will complete before TelemetryController is shutting down.
diff --git a/toolkit/components/telemetry/tests/unit/head.js b/toolkit/components/telemetry/tests/unit/head.js
index 9daaf430036..c3748df7dbc 100644
--- a/toolkit/components/telemetry/tests/unit/head.js
+++ b/toolkit/components/telemetry/tests/unit/head.js
@@ -144,17 +144,31 @@ function fakeSchedulerTimer(set, clear) {
  */
 function fakeNow(...args) {
   const date = new Date(...args);
+  const modules = [
+    Cu.import("resource://gre/modules/TelemetrySession.jsm"),
+    Cu.import("resource://gre/modules/TelemetryEnvironment.jsm"),
+    Cu.import("resource://gre/modules/TelemetryController.jsm"),
+  ];
 
-  let ping = Cu.import("resource://gre/modules/TelemetryController.jsm");
-  ping.Policy.now = () => date;
-  let session = Cu.import("resource://gre/modules/TelemetrySession.jsm");
-  session.Policy.now = () => date;
-  let environment = Cu.import("resource://gre/modules/TelemetryEnvironment.jsm");
-  environment.Policy.now = () => date;
+  for (let m of modules) {
+    m.Policy.now = () => date;
+  }
 
   return new Date(date);
 }
 
+// Fake the timeout functions for TelemetryController sending.
+function fakePingSendTimer(set, clear) {
+  let ping = Cu.import("resource://gre/modules/TelemetryController.jsm");
+  ping.Policy.setPingSendTimeout = set;
+  ping.Policy.clearPingSendTimeout = clear;
+}
+
+function fakeMidnightPingFuzzingDelay(delayMs) {
+  let ping = Cu.import("resource://gre/modules/TelemetryController.jsm");
+  ping.Policy.midnightPingFuzzingDelay = () => delayMs;
+}
+
 // Return a date that is |offset| ms in the future from |date|.
 function futureDate(date, offset) {
   return new Date(date.getTime() + offset);
@@ -179,3 +193,6 @@ Services.prefs.setBoolPref("toolkit.telemetry.archive.enabled", true);
 
 // Avoid timers interrupting test behavior.
 fakeSchedulerTimer(() => {}, () => {});
+fakePingSendTimer(() => {}, () => {});
+// Make pind sending predictable.
+fakeMidnightPingFuzzingDelay(0);
diff --git a/toolkit/components/telemetry/tests/unit/test_TelemetryController.js b/toolkit/components/telemetry/tests/unit/test_TelemetryController.js
index 4d00a840219..f8ee8aee933 100644
--- a/toolkit/components/telemetry/tests/unit/test_TelemetryController.js
+++ b/toolkit/components/telemetry/tests/unit/test_TelemetryController.js
@@ -150,17 +150,12 @@ add_task(function* asyncSetup() {
 
 // Ensure that not overwriting an existing file fails silently
 add_task(function* test_overwritePing() {
-  let ping = {id: "foo"}
+  let ping = {id: "foo"};
   yield TelemetryStorage.savePing(ping, true);
   yield TelemetryStorage.savePing(ping, false);
   yield TelemetryStorage.cleanupPingFile(ping);
 });
 
-// Sends a ping to a non existing server.
-add_task(function* test_noServerPing() {
-  yield sendPing(false, false);
-});
-
 // Checks that a sent ping is correctly received by a dummy http server.
 add_task(function* test_simplePing() {
   startWebserver();
@@ -265,6 +260,70 @@ add_task(function* test_archivePings() {
   Assert.equal(ping.id, pingId, "TelemetryController must archive pings if FHR is enabled.");
 });
 
+// Test that we fuzz the submission time around midnight properly
+// to avoid overloading the telemetry servers.
+add_task(function* test_midnightPingSendFuzzing() {
+  const fuzzingDelay = 60 * 60 * 1000;
+  fakeMidnightPingFuzzingDelay(fuzzingDelay);
+  let now = new Date(2030, 5, 1, 11, 00, 0);
+  fakeNow(now);
+
+  let pingSendTimerCallback = null;
+  let pingSendTimeout = null;
+  fakePingSendTimer((callback, timeout) => {
+    pingSendTimerCallback = callback;
+    pingSendTimeout = timeout;
+  }, () => {});
+
+  gRequestIterator = Iterator(new Request());
+  yield TelemetryController.reset();
+
+  // A ping submitted shortly before midnight should not get sent yet.
+  now = new Date(2030, 5, 1, 23, 55, 0);
+  fakeNow(now);
+  registerPingHandler((req, res) => {
+    Assert.ok(false, "No ping should be received yet.");
+  });
+  yield sendPing(true, true);
+
+  Assert.ok(!!pingSendTimerCallback);
+  Assert.deepEqual(futureDate(now, pingSendTimeout), new Date(2030, 5, 2, 0, 45, 0));
+
+  // A ping after midnight within the fuzzing delay should also not get sent.
+  now = new Date(2030, 5, 2, 0, 40, 0);
+  fakeNow(now);
+  pingSendTimeout = null;
+  yield sendPing(true, true);
+  Assert.deepEqual(futureDate(now, pingSendTimeout), new Date(2030, 5, 2, 0, 45, 0));
+
+  // The Request constructor restores the previous ping handler.
+  gRequestIterator = Iterator(new Request());
+
+  // Setting the clock to after the fuzzing delay, we should trigger the two ping sends
+  // with the timer callback.
+  now = futureDate(now, pingSendTimeout);
+  fakeNow(now);
+  yield pingSendTimerCallback();
+  let requests = [];
+  requests.push(yield gRequestIterator.next());
+  requests.push(yield gRequestIterator.next());
+  for (let req of requests) {
+    let ping = decodeRequestPayload(req);
+    checkPingFormat(ping, TEST_PING_TYPE, true, true);
+  }
+
+  // Moving the clock further we should still send pings immediately.
+  now = futureDate(now, 5 * 60 * 1000);
+  yield sendPing(true, true);
+  let request = yield gRequestIterator.next();
+  let ping = decodeRequestPayload(request);
+  checkPingFormat(ping, TEST_PING_TYPE, true, true);
+
+  // Clean-up.
+  fakeMidnightPingFuzzingDelay(0);
+  fakePingSendTimer(() => {}, () => {});
+});
+
 add_task(function* stopServer(){
   gHttpServer.stop(do_test_finished);
 });

From a604dbbbe8cbc72481e617383e05c04c4de08f35 Mon Sep 17 00:00:00 2001
From: Georg Fritzsche <georg.fritzsche@googlemail.com>
Date: Thu, 30 Apr 2015 14:00:58 +0200
Subject: [PATCH 19/88] Bug 1156857 - Fix StatisticsRecorder not being
 initialized in content processes. r=jimm

---
 toolkit/xre/nsEmbedFunctions.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/toolkit/xre/nsEmbedFunctions.cpp b/toolkit/xre/nsEmbedFunctions.cpp
index 506553312f5..d7034424ba6 100644
--- a/toolkit/xre/nsEmbedFunctions.cpp
+++ b/toolkit/xre/nsEmbedFunctions.cpp
@@ -76,6 +76,8 @@
 
 #include "GeckoProfiler.h"
 
+ #include "base/histogram.h"
+
 #if defined(MOZ_SANDBOX) && defined(XP_WIN)
 #define TARGET_SANDBOX_EXPORTS
 #include "mozilla/sandboxing/loggingCallbacks.h"
@@ -137,6 +139,7 @@ XRE_LockProfileDirectory(nsIFile* aDirectory,
 }
 
 static int32_t sInitCounter;
+static UniquePtr<base::StatisticsRecorder> gStatisticsRecorder;
 
 nsresult
 XRE_InitEmbedding2(nsIFile *aLibXULDirectory,
@@ -153,6 +156,9 @@ XRE_InitEmbedding2(nsIFile *aLibXULDirectory,
   if (++sInitCounter > 1) // XXXbsmedberg is this really the right solution?
     return NS_OK;
 
+  // This is needed by Telemetry to initialize histogram collection.
+  gStatisticsRecorder = MakeUnique<base::StatisticsRecorder>();
+
   if (!aAppDirectory)
     aAppDirectory = aLibXULDirectory;
 
@@ -206,6 +212,7 @@ XRE_TermEmbedding()
   gDirServiceProvider->DoShutdown();
   NS_ShutdownXPCOM(nullptr);
   delete gDirServiceProvider;
+  gStatisticsRecorder = nullptr;
 }
 
 const char*

From 6cb917c2a075541e08afc57ac7e91b3735fcc2c8 Mon Sep 17 00:00:00 2001
From: Alexandre Poirot <poirot.alex@gmail.com>
Date: Wed, 29 Apr 2015 11:43:38 +0200
Subject: [PATCH 20/88] Backed out changeset ef6fd70cccf5 (bug 1145049)

---
 toolkit/devtools/server/actors/highlighter.js |  7 ---
 toolkit/devtools/server/actors/inspector.js   | 48 +------------------
 toolkit/devtools/server/actors/styles.js      | 36 +-------------
 3 files changed, 3 insertions(+), 88 deletions(-)

diff --git a/toolkit/devtools/server/actors/highlighter.js b/toolkit/devtools/server/actors/highlighter.js
index 0262b747473..45a37c1c254 100644
--- a/toolkit/devtools/server/actors/highlighter.js
+++ b/toolkit/devtools/server/actors/highlighter.js
@@ -184,9 +184,6 @@ let HighlighterActor = exports.HighlighterActor = protocol.ActorClass({
   },
 
   destroy: function() {
-    if (!this._inspector) {
-      return;
-    }
     protocol.Actor.prototype.destroy.call(this);
 
     this._destroyHighlighter();
@@ -198,10 +195,6 @@ let HighlighterActor = exports.HighlighterActor = protocol.ActorClass({
     this._layoutHelpers = null;
   },
 
-  disconnect: function () {
-    this.destroy();
-  },
-
   /**
    * Display the box model highlighting on a given NodeActor.
    * There is only one instance of the box model highlighter, so calling this
diff --git a/toolkit/devtools/server/actors/inspector.js b/toolkit/devtools/server/actors/inspector.js
index cc6ea41167a..8e5bc10480b 100644
--- a/toolkit/devtools/server/actors/inspector.js
+++ b/toolkit/devtools/server/actors/inspector.js
@@ -220,12 +220,6 @@ var NodeActor = exports.NodeActor = protocol.ActorClass({
            this.rawNode.ownerDocument.documentElement === this.rawNode;
   },
 
-  destroy: function () {
-    protocol.Actor.prototype.destroy.call(this);
-    this.rawNode = null;
-    this.walker = null;
-  },
-
   // Returns the JSON representation of this object over the wire.
   form: function(detail) {
     if (detail === "actorid") {
@@ -1225,9 +1219,6 @@ var WalkerActor = protocol.ActorClass({
 
   destroy: function() {
     try {
-      if (this._destroyed) {
-        return;
-      }
       this._destroyed = true;
 
       this.clearPseudoClassLocks();
@@ -1235,17 +1226,6 @@ var WalkerActor = protocol.ActorClass({
 
       this._hoveredNode = null;
       this.rootDoc = null;
-      this.rootWin = null;
-      this.rootNode = null;
-      this.tabActor = null;
-      this.layoutHelpers = null;
-      this._orphaned = null;
-      this._retainedOrphans = null;
-      this._refMap.forEach(actor => {
-        this.unmanage(actor);
-        actor.destroy();
-      });
-      this._refMap = null;
 
       this.reflowObserver.off("reflows", this._onReflows);
       this.reflowObserver = null;
@@ -3332,30 +3312,6 @@ var InspectorActor = exports.InspectorActor = protocol.ActorClass({
     this.tabActor = tabActor;
   },
 
-  destroy: function () {
-    protocol.Actor.prototype.destroy.call(this);
-    this._highlighterPromise = null;
-    this._pageStylePromise = null;
-    this._walkerPromise = null;
-    if (this.walker) {
-      this.walker.destroy();
-    }
-    this.walker = null;
-    if (this.pageStyle) {
-      this.pageStyle.destroy();
-    }
-    this.pageStyle = null;
-    if (this.highlighter) {
-      this.highlighter.destroy();
-    }
-    this.highlighter = null;
-    this.tabActor = null;
-  },
-
-  disconnect: function () {
-    this.destroy();
-  },
-
   get window() this.tabActor.window,
 
   getWalker: method(function(options={}) {
@@ -3400,7 +3356,7 @@ var InspectorActor = exports.InspectorActor = protocol.ActorClass({
     }
 
     this._pageStylePromise = this.getWalker().then(walker => {
-      return this.pageStyle = PageStyleActor(this);
+      return PageStyleActor(this);
     });
     return this._pageStylePromise;
   }, {
@@ -3429,7 +3385,7 @@ var InspectorActor = exports.InspectorActor = protocol.ActorClass({
     }
 
     this._highlighterPromise = this.getWalker().then(walker => {
-      return this.highlighter = HighlighterActor(this, autohide);
+      return HighlighterActor(this, autohide);
     });
     return this._highlighterPromise;
   }, {
diff --git a/toolkit/devtools/server/actors/styles.js b/toolkit/devtools/server/actors/styles.js
index 83bffc2b83f..39a6da7aa2f 100644
--- a/toolkit/devtools/server/actors/styles.js
+++ b/toolkit/devtools/server/actors/styles.js
@@ -124,32 +124,10 @@ var PageStyleActor = protocol.ActorClass({
     // Stores the association of DOM objects -> actors
     this.refMap = new Map;
 
-    // Keep the list of StyleRuleActor created for font
-    // in order to clean them up when the PageStyleActor is collected
-    this.fontStyleActors = new Set;
-
     this.onFrameUnload = this.onFrameUnload.bind(this);
     events.on(this.inspector.tabActor, "will-navigate", this.onFrameUnload);
   },
 
-  destroy: function () {
-    if (!this.walker)
-      return;
-    protocol.Actor.prototype.destroy.call(this);
-    events.off(this.inspector.tabActor, "will-navigate", this.onFrameUnload);
-    this.inspector = null;
-    this.walker = null;
-    this.refMap.forEach(actor => {
-      this.unmanage(actor);
-      actor.destroy();
-    });
-    this.fontStyleActors.forEach(actor => actor.destroy());
-    this.fontStyleActors = null;
-    this.refMap = null;
-    this.cssLogic = null;
-    this._styleElement = null;
-  },
-
   get conn() this.inspector.conn,
 
   form: function(detail) {
@@ -329,9 +307,7 @@ var PageStyleActor = protocol.ActorClass({
 
       // If this font comes from a @font-face rule
       if (font.rule) {
-        let styleActor = StyleRuleActor(this, font.rule);
-        this.fontStyleActors.add(styleActor);
-        fontFace.rule = styleActor;
+        fontFace.rule = StyleRuleActor(this, font.rule);
         fontFace.ruleText = font.rule.cssText;
       }
 
@@ -987,16 +963,6 @@ var StyleRuleActor = protocol.ActorClass({
 
   get conn() this.pageStyle.conn,
 
-  destroy: function () {
-    if (!this.rawStyle)
-      return;
-    protocol.Actor.prototype.destroy.call(this);
-    this.rawStyle = null;
-    this.pageStyle = null;
-    this.rawNode = null;
-    this.rawRule = null;
-  },
-
   // Objects returned by this actor are owned by the PageStyleActor
   // to which this rule belongs.
   get marshallPool() this.pageStyle,

From 8b3997f1fa3a339fcfa881a2aca64f34e4732f6b Mon Sep 17 00:00:00 2001
From: "Dustin J. Mitchell" <dustin@mozilla.com>
Date: Wed, 29 Apr 2015 10:36:50 -0400
Subject: [PATCH 21/88] Bug 1155238: use RelengAPI-based Tooltool server.
 r=coop

---
 js/src/devtools/automation/winbuildenv.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/src/devtools/automation/winbuildenv.sh b/js/src/devtools/automation/winbuildenv.sh
index 78030a9b898..ef09727c96f 100644
--- a/js/src/devtools/automation/winbuildenv.sh
+++ b/js/src/devtools/automation/winbuildenv.sh
@@ -34,7 +34,7 @@ export PATH="$(perl -le 'print join ":", grep { -d $_ } split ":", $ENV{PATH}')"
 if ! which mozmake 2>/dev/null; then
     export PATH="$PATH:$SOURCE/.."
     if ! which mozmake 2>/dev/null; then
-	TT_SERVER=${TT_SERVER:-http://tooltool.pvt.build.mozilla.org/build}
+	TT_SERVER=${TT_SERVER:-https://api.pub.build.mozilla.org/tooltool/}
 	( cd $SOURCE/..; ./scripts/scripts/tooltool/tooltool_wrapper.sh $SOURCE/browser/config/tooltool-manifests/${platform:-win32}/releng.manifest $TT_SERVER setup.sh c:/mozilla-build/python27/python.exe C:/mozilla-build/tooltool.py )
     fi
 fi

From c7e0b742a2e082e528dd50eb9733e8de5630f7a4 Mon Sep 17 00:00:00 2001
From: Tim Taubert <ttaubert@mozilla.com>
Date: Thu, 30 Apr 2015 12:06:18 +0200
Subject: [PATCH 22/88] Bug 1160104 - Fix
 "chrome://browser/content/tab-content.js, line 558: TypeError: docShell is
 null" failures r=mconley

---
 browser/base/content/tab-content.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/browser/base/content/tab-content.js b/browser/base/content/tab-content.js
index ed94a7dd7e7..db943faca90 100644
--- a/browser/base/content/tab-content.js
+++ b/browser/base/content/tab-content.js
@@ -555,7 +555,9 @@ addEventListener("unload", () => {
 }, false);
 
 addMessageListener("Browser:AppTab", function(message) {
-  docShell.isAppTab = message.data.isAppTab;
+  if (docShell) {
+    docShell.isAppTab = message.data.isAppTab;
+  }
 });
 
 let WebBrowserChrome = {

From 89e2259a7fb51f8562047f339636a5fc8efde0c6 Mon Sep 17 00:00:00 2001
From: Brian Grinstead <bgrinstead@mozilla.com>
Date: Thu, 30 Apr 2015 07:30:22 -0700
Subject: [PATCH 23/88] Bug 1159929 - Cache the pref value for
 devtools.dump.emit in event emitter;r=fitzgen

---
 toolkit/devtools/event-emitter.js | 116 ++++++++++++++++--------------
 1 file changed, 63 insertions(+), 53 deletions(-)

diff --git a/toolkit/devtools/event-emitter.js b/toolkit/devtools/event-emitter.js
index 3c40f674d23..a2bbb192a19 100644
--- a/toolkit/devtools/event-emitter.js
+++ b/toolkit/devtools/event-emitter.js
@@ -25,6 +25,16 @@ module.exports = EventEmitter;
 const { Cu, components } = require("chrome");
 const Services = require("Services");
 const promise = require("promise");
+let loggingEnabled = true;
+
+if (!isWorker) {
+  loggingEnabled = Services.prefs.getBoolPref("devtools.dump.emit");
+  Services.prefs.addObserver("devtools.dump.emit", {
+    observe: () => {
+      loggingEnabled = Services.prefs.getBoolPref("devtools.dump.emit");
+    }
+  }, false);
+}
 
 /**
  * Decorate an object with event emitter functionality.
@@ -147,60 +157,60 @@ EventEmitter.prototype = {
   },
 
   logEvent: function(aEvent, args) {
-    let logging = isWorker ? true : Services.prefs.getBoolPref("devtools.dump.emit");
-
-    if (logging) {
-      let caller, func, path;
-      if (!isWorker) {
-        caller = components.stack.caller.caller;
-        func = caller.name;
-        let file = caller.filename;
-        if (file.includes(" -> ")) {
-          file = caller.filename.split(/ -> /)[1];
-        }
-        path = file + ":" + caller.lineNumber;
-      }
-
-      let argOut = "(";
-      if (args.length === 1) {
-        argOut += aEvent;
-      }
-
-      let out = "EMITTING: ";
-
-      // We need this try / catch to prevent any dead object errors.
-      try {
-        for (let i = 1; i < args.length; i++) {
-          if (i === 1) {
-            argOut = "(" + aEvent + ", ";
-          } else {
-            argOut += ", ";
-          }
-
-          let arg = args[i];
-          argOut += arg;
-
-          if (arg && arg.nodeName) {
-            argOut += " (" + arg.nodeName;
-            if (arg.id) {
-              argOut += "#" + arg.id;
-            }
-            if (arg.className) {
-              argOut += "." + arg.className;
-            }
-            argOut += ")";
-          }
-        }
-      } catch(e) {
-        // Object is dead so the toolbox is most likely shutting down,
-        // do nothing.
-      }
-
-      argOut += ")";
-      out += "emit" + argOut + " from " + func + "() -> " + path + "\n";
-
-      dump(out);
+    if (!loggingEnabled) {
+      return;
     }
+
+    let caller, func, path;
+    if (!isWorker) {
+      caller = components.stack.caller.caller;
+      func = caller.name;
+      let file = caller.filename;
+      if (file.includes(" -> ")) {
+        file = caller.filename.split(/ -> /)[1];
+      }
+      path = file + ":" + caller.lineNumber;
+    }
+
+    let argOut = "(";
+    if (args.length === 1) {
+      argOut += aEvent;
+    }
+
+    let out = "EMITTING: ";
+
+    // We need this try / catch to prevent any dead object errors.
+    try {
+      for (let i = 1; i < args.length; i++) {
+        if (i === 1) {
+          argOut = "(" + aEvent + ", ";
+        } else {
+          argOut += ", ";
+        }
+
+        let arg = args[i];
+        argOut += arg;
+
+        if (arg && arg.nodeName) {
+          argOut += " (" + arg.nodeName;
+          if (arg.id) {
+            argOut += "#" + arg.id;
+          }
+          if (arg.className) {
+            argOut += "." + arg.className;
+          }
+          argOut += ")";
+        }
+      }
+    } catch(e) {
+      // Object is dead so the toolbox is most likely shutting down,
+      // do nothing.
+    }
+
+    argOut += ")";
+    out += "emit" + argOut + " from " + func + "() -> " + path + "\n";
+
+    dump(out);
   },
 };
 

From c9a6b9ed5369ef0da7b8caed83ff56fb55b348c5 Mon Sep 17 00:00:00 2001
From: Mike de Boer <mdeboer@mozilla.com>
Date: Wed, 29 Apr 2015 11:55:08 +0200
Subject: [PATCH 24/88] Bug 1152733: change the name of Loop/ Hello histograms
 that recently changed to be enumerated types. r=vladan

---
 .../loop/content/shared/js/otSdkDriver.js        |  4 ++--
 .../test/mochitest/browser_mozLoop_telemetry.js  |  4 ++--
 .../loop/test/shared/otSdkDriver_test.js         | 16 ++++++++--------
 toolkit/components/telemetry/Histograms.json     |  4 ++--
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/browser/components/loop/content/shared/js/otSdkDriver.js b/browser/components/loop/content/shared/js/otSdkDriver.js
index f6c52a36551..67d10316db6 100644
--- a/browser/components/loop/content/shared/js/otSdkDriver.js
+++ b/browser/components/loop/content/shared/js/otSdkDriver.js
@@ -789,7 +789,7 @@ loop.OTSdkDriver = (function() {
         bucket = buckets.MORE_THAN_5M;
       }
 
-      this.mozLoop.telemetryAddValue("LOOP_TWO_WAY_MEDIA_CONN_LENGTH", bucket);
+      this.mozLoop.telemetryAddValue("LOOP_TWO_WAY_MEDIA_CONN_LENGTH_1", bucket);
       this._setTwoWayMediaStartTime(this.CONNECTION_START_TIME_ALREADY_NOTED);
 
       this._connectionLengthNotedCalls++;
@@ -857,7 +857,7 @@ loop.OTSdkDriver = (function() {
         return;
       }
 
-      this.mozLoop.telemetryAddValue("LOOP_SHARING_STATE_CHANGE", bucket);
+      this.mozLoop.telemetryAddValue("LOOP_SHARING_STATE_CHANGE_1", bucket);
     }
   };
 
diff --git a/browser/components/loop/test/mochitest/browser_mozLoop_telemetry.js b/browser/components/loop/test/mochitest/browser_mozLoop_telemetry.js
index 071cc11a32c..46cda6b4369 100644
--- a/browser/components/loop/test/mochitest/browser_mozLoop_telemetry.js
+++ b/browser/components/loop/test/mochitest/browser_mozLoop_telemetry.js
@@ -23,7 +23,7 @@ add_task(function* test_initialize() {
  * Tests that enumerated bucket histograms exist and can be updated.
  */
 add_task(function* test_mozLoop_telemetryAdd_buckets() {
-  let histogramId = "LOOP_TWO_WAY_MEDIA_CONN_LENGTH";
+  let histogramId = "LOOP_TWO_WAY_MEDIA_CONN_LENGTH_1";
   let histogram = Services.telemetry.getHistogramById(histogramId);
   let CONN_LENGTH = gMozLoopAPI.TWO_WAY_MEDIA_CONN_LENGTH;
 
@@ -49,7 +49,7 @@ add_task(function* test_mozLoop_telemetryAdd_buckets() {
 });
 
 add_task(function* test_mozLoop_telemetryAdd_sharing_buckets() {
-  let histogramId = "LOOP_SHARING_STATE_CHANGE";
+  let histogramId = "LOOP_SHARING_STATE_CHANGE_1";
   let histogram = Services.telemetry.getHistogramById(histogramId);
   const SHARING_STATES = gMozLoopAPI.SHARING_STATE_CHANGE;
 
diff --git a/browser/components/loop/test/shared/otSdkDriver_test.js b/browser/components/loop/test/shared/otSdkDriver_test.js
index 5e2392606e9..4cfd4a8e9f3 100644
--- a/browser/components/loop/test/shared/otSdkDriver_test.js
+++ b/browser/components/loop/test/shared/otSdkDriver_test.js
@@ -473,7 +473,7 @@ describe("loop.OTSdkDriver", function () {
 
       sinon.assert.calledOnce(mozLoop.telemetryAddValue);
       sinon.assert.calledWith(mozLoop.telemetryAddValue,
-        "LOOP_TWO_WAY_MEDIA_CONN_LENGTH",
+        "LOOP_TWO_WAY_MEDIA_CONN_LENGTH_1",
         mozLoop.TWO_WAY_MEDIA_CONN_LENGTH.SHORTER_THAN_10S);
     });
 
@@ -485,7 +485,7 @@ describe("loop.OTSdkDriver", function () {
 
         sinon.assert.calledOnce(mozLoop.telemetryAddValue);
         sinon.assert.calledWith(mozLoop.telemetryAddValue,
-          "LOOP_TWO_WAY_MEDIA_CONN_LENGTH",
+          "LOOP_TWO_WAY_MEDIA_CONN_LENGTH_1",
           mozLoop.TWO_WAY_MEDIA_CONN_LENGTH.BETWEEN_10S_AND_30S);
       });
 
@@ -497,7 +497,7 @@ describe("loop.OTSdkDriver", function () {
 
         sinon.assert.calledOnce(mozLoop.telemetryAddValue);
         sinon.assert.calledWith(mozLoop.telemetryAddValue,
-          "LOOP_TWO_WAY_MEDIA_CONN_LENGTH",
+          "LOOP_TWO_WAY_MEDIA_CONN_LENGTH_1",
           mozLoop.TWO_WAY_MEDIA_CONN_LENGTH.BETWEEN_30S_AND_5M);
       });
 
@@ -508,7 +508,7 @@ describe("loop.OTSdkDriver", function () {
 
       sinon.assert.calledOnce(mozLoop.telemetryAddValue);
       sinon.assert.calledWith(mozLoop.telemetryAddValue,
-        "LOOP_TWO_WAY_MEDIA_CONN_LENGTH",
+        "LOOP_TWO_WAY_MEDIA_CONN_LENGTH_1",
         mozLoop.TWO_WAY_MEDIA_CONN_LENGTH.MORE_THAN_5M);
     });
 
@@ -530,7 +530,7 @@ describe("loop.OTSdkDriver", function () {
 
       sinon.assert.calledOnce(mozLoop.telemetryAddValue);
       sinon.assert.calledWithExactly(mozLoop.telemetryAddValue,
-        "LOOP_SHARING_STATE_CHANGE",
+        "LOOP_SHARING_STATE_CHANGE_1",
         mozLoop.SHARING_STATE_CHANGE.WINDOW_ENABLED);
     });
 
@@ -539,7 +539,7 @@ describe("loop.OTSdkDriver", function () {
 
       sinon.assert.calledOnce(mozLoop.telemetryAddValue);
       sinon.assert.calledWithExactly(mozLoop.telemetryAddValue,
-        "LOOP_SHARING_STATE_CHANGE",
+        "LOOP_SHARING_STATE_CHANGE_1",
         mozLoop.SHARING_STATE_CHANGE.BROWSER_ENABLED);
     });
 
@@ -548,7 +548,7 @@ describe("loop.OTSdkDriver", function () {
 
       sinon.assert.calledOnce(mozLoop.telemetryAddValue);
       sinon.assert.calledWithExactly(mozLoop.telemetryAddValue,
-        "LOOP_SHARING_STATE_CHANGE",
+        "LOOP_SHARING_STATE_CHANGE_1",
         mozLoop.SHARING_STATE_CHANGE.WINDOW_DISABLED);
     });
 
@@ -557,7 +557,7 @@ describe("loop.OTSdkDriver", function () {
 
       sinon.assert.calledOnce(mozLoop.telemetryAddValue);
       sinon.assert.calledWithExactly(mozLoop.telemetryAddValue,
-        "LOOP_SHARING_STATE_CHANGE",
+        "LOOP_SHARING_STATE_CHANGE_1",
         mozLoop.SHARING_STATE_CHANGE.BROWSER_DISABLED);
     });
   });
diff --git a/toolkit/components/telemetry/Histograms.json b/toolkit/components/telemetry/Histograms.json
index 35337eabbe1..c76951b18bb 100644
--- a/toolkit/components/telemetry/Histograms.json
+++ b/toolkit/components/telemetry/Histograms.json
@@ -7490,7 +7490,7 @@
     "kind": "boolean",
     "description": "Stores 1 every time the URL is copied or shared."
   },
-  "LOOP_TWO_WAY_MEDIA_CONN_LENGTH": {
+  "LOOP_TWO_WAY_MEDIA_CONN_LENGTH_1": {
     "alert_emails": ["firefox-dev@mozilla.org", "dmose@mozilla.com"],
     "expires_in_version": "43",
     "kind": "enumerated",
@@ -7498,7 +7498,7 @@
     "releaseChannelCollection": "opt-out",
     "description": "Connection length for bi-directionally connected media (0=SHORTER_THAN_10S, 1=BETWEEN_10S_AND_30S, 2=BETWEEN_30S_AND_5M, 3=MORE_THAN_5M)"
   },
-  "LOOP_SHARING_STATE_CHANGE": {
+  "LOOP_SHARING_STATE_CHANGE_1": {
     "alert_emails": ["firefox-dev@mozilla.org", "mdeboer@mozilla.com"],
     "expires_in_version": "43",
     "kind": "enumerated",

From 94dd87004660ab76e84afc7be5f90aa643606fcf Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <ryanvm@gmail.com>
Date: Thu, 30 Apr 2015 11:08:27 -0400
Subject: [PATCH 25/88] Backed out changeset 41b2612eba71 (bug 1156857) for
 regressing bug 1100501.

---
 toolkit/xre/nsEmbedFunctions.cpp | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/toolkit/xre/nsEmbedFunctions.cpp b/toolkit/xre/nsEmbedFunctions.cpp
index d7034424ba6..506553312f5 100644
--- a/toolkit/xre/nsEmbedFunctions.cpp
+++ b/toolkit/xre/nsEmbedFunctions.cpp
@@ -76,8 +76,6 @@
 
 #include "GeckoProfiler.h"
 
- #include "base/histogram.h"
-
 #if defined(MOZ_SANDBOX) && defined(XP_WIN)
 #define TARGET_SANDBOX_EXPORTS
 #include "mozilla/sandboxing/loggingCallbacks.h"
@@ -139,7 +137,6 @@ XRE_LockProfileDirectory(nsIFile* aDirectory,
 }
 
 static int32_t sInitCounter;
-static UniquePtr<base::StatisticsRecorder> gStatisticsRecorder;
 
 nsresult
 XRE_InitEmbedding2(nsIFile *aLibXULDirectory,
@@ -156,9 +153,6 @@ XRE_InitEmbedding2(nsIFile *aLibXULDirectory,
   if (++sInitCounter > 1) // XXXbsmedberg is this really the right solution?
     return NS_OK;
 
-  // This is needed by Telemetry to initialize histogram collection.
-  gStatisticsRecorder = MakeUnique<base::StatisticsRecorder>();
-
   if (!aAppDirectory)
     aAppDirectory = aLibXULDirectory;
 
@@ -212,7 +206,6 @@ XRE_TermEmbedding()
   gDirServiceProvider->DoShutdown();
   NS_ShutdownXPCOM(nullptr);
   delete gDirServiceProvider;
-  gStatisticsRecorder = nullptr;
 }
 
 const char*

From 9a78f562f777cbee9cfbbf04493a32848503f1ba Mon Sep 17 00:00:00 2001
From: Mark Banner <standard8@mozilla.com>
Date: Thu, 30 Apr 2015 16:41:13 +0100
Subject: [PATCH 26/88] Bug 1152761 - Add local storage for Loop's room keys in
 case recovery is required, and handle the recovery. r=mikedeboer

---
 browser/components/loop/modules/LoopRooms.jsm |  63 ++++-
 .../loop/modules/LoopRoomsCache.jsm           | 159 +++++++++++
 browser/components/loop/moz.build             |   1 +
 browser/components/loop/test/xpcshell/head.js |  12 +
 .../loop/test/xpcshell/test_looprooms.js      |   7 -
 .../test_looprooms_encryption_in_fxa.js       | 267 ++++++++++++++++++
 .../loop/test/xpcshell/xpcshell.ini           |   1 +
 7 files changed, 496 insertions(+), 14 deletions(-)
 create mode 100644 browser/components/loop/modules/LoopRoomsCache.jsm
 create mode 100644 browser/components/loop/test/xpcshell/test_looprooms_encryption_in_fxa.js

diff --git a/browser/components/loop/modules/LoopRooms.jsm b/browser/components/loop/modules/LoopRooms.jsm
index d3374c2d615..a258eeebe94 100644
--- a/browser/components/loop/modules/LoopRooms.jsm
+++ b/browser/components/loop/modules/LoopRooms.jsm
@@ -7,11 +7,13 @@ const {classes: Cc, interfaces: Ci, utils: Cu} = Components;
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
+Cu.import("resource://gre/modules/Task.jsm");
+
 const {MozLoopService, LOOP_SESSION_TYPE} = Cu.import("resource:///modules/loop/MozLoopService.jsm", {});
 XPCOMUtils.defineLazyModuleGetter(this, "Promise",
                                   "resource://gre/modules/Promise.jsm");
-XPCOMUtils.defineLazyModuleGetter(this, "Task",
-                                  "resource://gre/modules/Task.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "CommonUtils",
+                                  "resource://services-common/utils.js");
 XPCOMUtils.defineLazyGetter(this, "eventEmitter", function() {
   const {EventEmitter} = Cu.import("resource://gre/modules/devtools/event-emitter.js", {});
   return new EventEmitter();
@@ -19,8 +21,11 @@ XPCOMUtils.defineLazyGetter(this, "eventEmitter", function() {
 XPCOMUtils.defineLazyGetter(this, "gLoopBundle", function() {
   return Services.strings.createBundle('chrome://browser/locale/loop/loop.properties');
 });
+
+XPCOMUtils.defineLazyModuleGetter(this, "LoopRoomsCache",
+  "resource:///modules/loop/LoopRoomsCache.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "loopUtils",
-  "resource:///modules/loop/utils.js", "utils")
+  "resource:///modules/loop/utils.js", "utils");
 XPCOMUtils.defineLazyModuleGetter(this, "loopCrypto",
   "resource:///modules/loop/crypto.js", "LoopCrypto");
 
@@ -41,6 +46,8 @@ const roomsPushNotification = function(version, channelID) {
 let gDirty = true;
 // Global variable that keeps track of the currently used account.
 let gCurrentUser = null;
+// Global variable that keeps track of the room cache.
+let gRoomsCache = null;
 
 /**
  * Extend a `target` object with the properties defined in `source`.
@@ -123,6 +130,13 @@ let LoopRoomsInternal = {
    */
   rooms: new Map(),
 
+  get roomsCache() {
+    if (!gRoomsCache) {
+      gRoomsCache = new LoopRoomsCache();
+    }
+    return gRoomsCache;
+  },
+
   /**
    * @var {String} sessionType The type of user session. May be 'FXA' or 'GUEST'.
    */
@@ -280,12 +294,40 @@ let LoopRoomsInternal = {
       throw new Error("Missing wrappedKey");
     }
 
-    // Bug 1152761 will cause us to additionally store keys locally. We'll
-    // need to add some code for recovery in case decryption fails.
-    let key = yield this.promiseDecryptRoomKey(roomData.context.wrappedKey);
+    let savedRoomKey = yield this.roomsCache.getKey(this.sessionType, roomData.roomToken);
+    let fallback = false;
+    let key;
+
+    try {
+      key = yield this.promiseDecryptRoomKey(roomData.context.wrappedKey);
+    } catch (error) {
+      // If we don't have a key saved, then we can't do anything.
+      if (!savedRoomKey) {
+        throw error;
+      }
+
+      // We failed to decrypt the room key, so has our FxA key changed?
+      // If so, we fall-back to the saved room key.
+      key = savedRoomKey;
+      fallback = true;
+    }
 
     let decryptedData = yield loopCrypto.decryptBytes(key, roomData.context.value);
 
+    if (fallback) {
+      // Fallback decryption succeeded, so we need to re-encrypt the room key and
+      // save the data back again.
+      // XXX Bug 1152764 will implement this or make it a separate bug.
+    } else if (!savedRoomKey || key != savedRoomKey) {
+      // Decryption succeeded, but we don't have the right key saved.
+      try {
+        yield this.roomsCache.setKey(this.sessionType, roomData.roomToken, key);
+      }
+      catch (error) {
+        MozLoopService.log.error("Failed to save room key:", error);
+      }
+    }
+
     roomData.roomKey = key;
     roomData.decryptedContext = JSON.parse(decryptedData);
 
@@ -342,7 +384,7 @@ let LoopRoomsInternal = {
 
         this.saveAndNotifyUpdate(roomData, isUpdate);
       } catch (error) {
-        MozLoopService.log.error("Failed to decrypt room data: " + error);
+        MozLoopService.log.error("Failed to decrypt room data: ", error);
         // Do what we can to save the room data.
         room.decryptedContext = {};
         this.saveAndNotifyUpdate(room, isUpdate);
@@ -495,6 +537,9 @@ let LoopRoomsInternal = {
         this.setGuestCreatedRoom(true);
       }
 
+      // Now we've got the room token, we can save the key to disk.
+      yield this.roomsCache.setKey(this.sessionType, room.roomToken, room.roomKey);
+
       eventEmitter.emit("add", room);
       callback(null, room);
     }.bind(this)).catch(callback);
@@ -704,6 +749,10 @@ let LoopRoomsInternal = {
         sendData = {
           roomName: newRoomName
         };
+      } else {
+        // This might be an upgrade to encrypted rename, so store the key
+        // just in case.
+        yield this.roomsCache.setKey(this.sessionType, all.roomToken, all.roomKey);
       }
 
       let response = yield MozLoopService.hawkRequest(this.sessionType,
diff --git a/browser/components/loop/modules/LoopRoomsCache.jsm b/browser/components/loop/modules/LoopRoomsCache.jsm
new file mode 100644
index 00000000000..e83ff11eb8a
--- /dev/null
+++ b/browser/components/loop/modules/LoopRoomsCache.jsm
@@ -0,0 +1,159 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+"use strict";
+
+const {classes: Cc, interfaces: Ci, utils: Cu} = Components;
+
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+Cu.import("resource://gre/modules/Services.jsm");
+Cu.import("resource://gre/modules/Task.jsm");
+const {MozLoopService, LOOP_SESSION_TYPE} =
+  Cu.import("resource:///modules/loop/MozLoopService.jsm", {});
+XPCOMUtils.defineLazyModuleGetter(this, "CommonUtils",
+                                  "resource://services-common/utils.js");
+XPCOMUtils.defineLazyModuleGetter(this, "OS", "resource://gre/modules/osfile.jsm");
+
+this.EXPORTED_SYMBOLS = ["LoopRoomsCache"];
+
+const LOOP_ROOMS_CACHE_FILENAME = "loopRoomsCache.json";
+
+/**
+ * RoomsCache is a cache for saving simple rooms data to the disk in case we
+ * need it for back-up purposes, e.g. recording room keys for FxA if the user
+ * changes their password.
+ *
+ * The format of the data is:
+ *
+ * {
+ *   <sessionType>: {
+ *     <roomToken>: {
+ *       "key": <roomKey>
+ *     }
+ *   }
+ * }
+ *
+ * It is intended to try and keep the data forward and backwards compatible in
+ * a reasonable manner, hence why the structure is more complex than it needs
+ * to be to store tokens and keys.
+ *
+ * @param {Object} options The options for the RoomsCache, containing:
+ *   - {String} baseDir   The base directory in which to save the file.
+ *   - {String} filename  The filename for the cache file.
+ */
+function LoopRoomsCache(options) {
+  options = options || {};
+
+  this.baseDir = options.baseDir || OS.Constants.Path.profileDir;
+  this.path = OS.Path.join(
+    this.baseDir,
+    options.filename || LOOP_ROOMS_CACHE_FILENAME
+  );
+  this._cache = null;
+}
+
+LoopRoomsCache.prototype = {
+  /**
+   * Updates the local copy of the cache and saves it to disk.
+   *
+   * @param  {Object} contents An object to be saved in json format.
+   * @return {Promise} A promise that is resolved once the save is complete.
+   */
+  _setCache: function(contents) {
+    this._cache = contents;
+
+    return OS.File.makeDir(this.baseDir, {ignoreExisting: true}).then(() => {
+        return CommonUtils.writeJSON(contents, this.path);
+      });
+  },
+
+  /**
+   * Returns the local copy of the cache if there is one, otherwise it reads
+   * it from the disk.
+   *
+   * @return {Promise} A promise that is resolved once the read is complete.
+   */
+  _getCache: Task.async(function* () {
+    if (this._cache) {
+      return this._cache;
+    }
+
+    try {
+      return (this._cache = yield CommonUtils.readJSON(this.path));
+    } catch(error) {
+      // This is really complex due to OSFile's error handling, see bug 1160109.
+      if ((OS.Constants.libc && error.unixErrno != OS.Constants.libc.ENOENT) ||
+          (OS.Constants.Win && error.winLastError != OS.Constants.Win.ERROR_FILE_NOT_FOUND)) {
+        MozLoopService.log.debug("Error reading the cache:", error);
+      }
+      return (this._cache = {});
+    }
+  }),
+
+  /**
+   * Function for testability purposes. Clears the cache.
+   *
+   * @return {Promise} A promise that is resolved once the clear is complete.
+   */
+  clear: function() {
+    this._cache = null;
+    return OS.File.remove(this.path)
+  },
+
+  /**
+   * Gets a room key from the cache.
+   *
+   * @param {LOOP_SESSION_TYPE} sessionType  The session type for the room.
+   * @param {String}            roomToken    The token for the room.
+   * @return {Promise} A promise that is resolved when the data has been read
+   *                   with the value of the key, or null if it isn't present.
+   */
+  getKey: Task.async(function* (sessionType, roomToken) {
+    if (sessionType != LOOP_SESSION_TYPE.FXA) {
+      return null;
+    }
+
+    let sessionData = (yield this._getCache())[sessionType];
+
+    if (!sessionData || !sessionData[roomToken]) {
+      return null;
+    }
+    return sessionData[roomToken].key;
+  }),
+
+  /**
+   * Stores a room key into the cache. Note, if the key has not changed,
+   * the store will not be re-written.
+   *
+   * @param {LOOP_SESSION_TYPE} sessionType  The session type for the room.
+   * @param {String}            roomToken    The token for the room.
+   * @param {String}            roomKey      The encryption key for the room.
+   * @return {Promise} A promise that is resolved when the data has been stored.
+   */
+  setKey: Task.async(function* (sessionType, roomToken, roomKey) {
+    if (sessionType != LOOP_SESSION_TYPE.FXA) {
+      return;
+    }
+
+    let cache = yield this._getCache();
+
+    // Create these objects if they don't exist.
+    // We aim to do this creation and setting of the room key in a
+    // forwards-compatible way so that if new fields are added to rooms later
+    // then we don't mess them up (if there's no keys).
+    if (!cache[sessionType]) {
+      cache[sessionType] = {};
+    }
+
+    if (!cache[sessionType][roomToken]) {
+      cache[sessionType][roomToken] = {};
+    }
+
+    // Only save it if there's no key, or it is different.
+    if (!cache[sessionType][roomToken].key ||
+        cache[sessionType][roomToken].key != roomKey) {
+      cache[sessionType][roomToken].key = roomKey;
+      return yield this._setCache(cache);
+    }
+  })
+};
diff --git a/browser/components/loop/moz.build b/browser/components/loop/moz.build
index a2cbc2469d8..11cd3bcca98 100644
--- a/browser/components/loop/moz.build
+++ b/browser/components/loop/moz.build
@@ -20,6 +20,7 @@ EXTRA_JS_MODULES.loop += [
     'modules/LoopCalls.jsm',
     'modules/LoopContacts.jsm',
     'modules/LoopRooms.jsm',
+    'modules/LoopRoomsCache.jsm',
     'modules/LoopStorage.jsm',
     'modules/MozLoopAPI.jsm',
     'modules/MozLoopPushHandler.jsm',
diff --git a/browser/components/loop/test/xpcshell/head.js b/browser/components/loop/test/xpcshell/head.js
index 59e90bb29b3..412254bcf7c 100644
--- a/browser/components/loop/test/xpcshell/head.js
+++ b/browser/components/loop/test/xpcshell/head.js
@@ -3,6 +3,9 @@
 
 const {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components;
 
+// Initialize this before the imports, as some of them need it.
+do_get_profile();
+
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/Http.jsm");
@@ -11,7 +14,9 @@ Cu.import("resource:///modules/loop/MozLoopService.jsm");
 Cu.import("resource://gre/modules/Promise.jsm");
 Cu.import("resource:///modules/loop/LoopCalls.jsm");
 Cu.import("resource:///modules/loop/LoopRooms.jsm");
+Cu.import("resource://gre/modules/osfile.jsm");
 const { MozLoopServiceInternal } = Cu.import("resource:///modules/loop/MozLoopService.jsm", {});
+const { LoopRoomsInternal } = Cu.import("resource:///modules/loop/LoopRooms.jsm", {});
 
 XPCOMUtils.defineLazyModuleGetter(this, "MozLoopPushHandler",
                                   "resource:///modules/loop/MozLoopPushHandler.jsm");
@@ -209,3 +214,10 @@ MockWebSocketChannel.prototype = {
     this.listener.onServerClose(this.context, err || -1);
   },
 };
+
+const extend = function(target, source) {
+  for (let key of Object.getOwnPropertyNames(source)) {
+    target[key] = source[key];
+  }
+  return target;
+};
diff --git a/browser/components/loop/test/xpcshell/test_looprooms.js b/browser/components/loop/test/xpcshell/test_looprooms.js
index 5ab2d6c69a9..018f1727023 100644
--- a/browser/components/loop/test/xpcshell/test_looprooms.js
+++ b/browser/components/loop/test/xpcshell/test_looprooms.js
@@ -182,13 +182,6 @@ const kCreateRoomData = {
 const kChannelGuest = MozLoopService.channelIDs.roomsGuest;
 const kChannelFxA = MozLoopService.channelIDs.roomsFxA;
 
-const extend = function(target, source) {
-  for (let key of Object.getOwnPropertyNames(source)) {
-    target[key] = source[key];
-  }
-  return target;
-};
-
 const normalizeRoom = function(room) {
   let newRoom = extend({}, room);
   let name = newRoom.decryptedContext.roomName;
diff --git a/browser/components/loop/test/xpcshell/test_looprooms_encryption_in_fxa.js b/browser/components/loop/test/xpcshell/test_looprooms_encryption_in_fxa.js
new file mode 100644
index 00000000000..bdb882988ff
--- /dev/null
+++ b/browser/components/loop/test/xpcshell/test_looprooms_encryption_in_fxa.js
@@ -0,0 +1,267 @@
+/* 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/. */
+
+Cu.import("resource://services-common/utils.js");
+const { LOOP_ROOMS_CACHE_FILENAME } = Cu.import("resource:///modules/loop/LoopRoomsCache.jsm", {});
+
+const kContextEnabledPref = "loop.contextInConverations.enabled";
+
+const kFxAKey = "uGIs-kGbYt1hBBwjyW7MLQ";
+
+// Rooms details as responded by the server.
+const kRoomsResponses = new Map([
+  ["_nxD4V4FflQ", {
+    // Encrypted with roomKey "FliIGLUolW-xkKZVWstqKw".
+    // roomKey is wrapped with kFxAKey.
+    context: {
+      wrappedKey: "F3V27oPB+FgjFbVPML2PupONYqoIZ53XRU4BqG46Lr3eyIGumgCEqgjSe/MXAXiQ//8=",
+      value: "df7B4SNxhOI44eJjQavCevADyCCxz6/DEZbkOkRUMVUxzS42FbzN6C2PqmCKDYUGyCJTwJ0jln8TLw==",
+      alg: "AES-GCM"
+    },
+    roomToken: "_nxD4V4FflQ",
+    roomUrl: "http://localhost:3000/rooms/_nxD4V4FflQ"
+  }],
+  ["QzBbvGmIZWU", {
+    context: {
+      wrappedKey: "AFu7WwFNjhWR5J6L8ks7S6H/1ktYVEw3yt1eIIWVaMabZaB3vh5612/FNzua4oS2oCM=",
+      value: "sqj+xRNEty8K3Q1gSMd5bIUYKu34JfiO2+LIMlJrOetFIbJdBoQ+U8JZNaTFl6Qp3RULZ41x0zeSBSk=",
+      alg: "AES-GCM"
+    },
+    roomToken: "QzBbvGmIZWU",
+    roomUrl: "http://localhost:3000/rooms/QzBbvGmIZWU"
+  }]
+]);
+
+const kExpectedRooms = new Map([
+  ["_nxD4V4FflQ", {
+    context: {
+      wrappedKey: "F3V27oPB+FgjFbVPML2PupONYqoIZ53XRU4BqG46Lr3eyIGumgCEqgjSe/MXAXiQ//8=",
+      value: "df7B4SNxhOI44eJjQavCevADyCCxz6/DEZbkOkRUMVUxzS42FbzN6C2PqmCKDYUGyCJTwJ0jln8TLw==",
+      alg: "AES-GCM"
+    },
+    decryptedContext: {
+      roomName: "First Room Name"
+    },
+    roomKey: "FliIGLUolW-xkKZVWstqKw",
+    roomToken: "_nxD4V4FflQ",
+    roomUrl: "http://localhost:3000/rooms/_nxD4V4FflQ#FliIGLUolW-xkKZVWstqKw"
+  }],
+  ["QzBbvGmIZWU", {
+    context: {
+      wrappedKey: "AFu7WwFNjhWR5J6L8ks7S6H/1ktYVEw3yt1eIIWVaMabZaB3vh5612/FNzua4oS2oCM=",
+      value: "sqj+xRNEty8K3Q1gSMd5bIUYKu34JfiO2+LIMlJrOetFIbJdBoQ+U8JZNaTFl6Qp3RULZ41x0zeSBSk=",
+      alg: "AES-GCM"
+    },
+    decryptedContext: {
+      roomName: "Loopy Discussion",
+    },
+    roomKey: "h2H8Sa9QxLCTTiXNmJVtRA",
+    roomToken: "QzBbvGmIZWU",
+    roomUrl: "http://localhost:3000/rooms/QzBbvGmIZWU"
+  }]
+]);
+
+const kCreateRoomProps = {
+  decryptedContext: {
+    roomName: "Say Hello",
+  },
+  roomOwner: "Gavin",
+  maxSize: 2
+};
+
+const kCreateRoomData = {
+  roomToken: "Vo2BFQqIaAM",
+  roomUrl: "http://localhost:3000/rooms/_nxD4V4FflQ",
+  expiresAt: 1405534180
+};
+
+function getCachePath() {
+  return OS.Path.join(OS.Constants.Path.profileDir, LOOP_ROOMS_CACHE_FILENAME);
+}
+
+function readRoomsCache() {
+  return CommonUtils.readJSON(getCachePath());
+}
+
+function saveRoomsCache(contents) {
+  delete LoopRoomsInternal.roomsCache._cache;
+  return CommonUtils.writeJSON(contents, getCachePath());
+}
+
+function clearRoomsCache() {
+  return LoopRoomsInternal.roomsCache.clear();
+}
+
+// This is a cut-down version of the one in test_looprooms.js.
+add_task(function* setup_server() {
+  loopServer.registerPathHandler("/registration", (req, res) => {
+    res.setStatusLine(null, 200, "OK");
+    res.processAsync();
+    res.finish();
+  });
+
+  loopServer.registerPathHandler("/rooms", (req, res) => {
+    res.setStatusLine(null, 200, "OK");
+
+    if (req.method == "POST") {
+      Assert.ok(req.bodyInputStream, "POST request should have a payload");
+      let body = CommonUtils.readBytesFromInputStream(req.bodyInputStream);
+      let data = JSON.parse(body);
+
+      Assert.ok(!("decryptedContext" in data), "should not have any decrypted data");
+      Assert.ok("context" in data, "should have context");
+
+      res.write(JSON.stringify(kCreateRoomData));
+    } else {
+      res.write(JSON.stringify([...kRoomsResponses.values()]));
+    }
+
+    res.processAsync();
+    res.finish();
+  });
+
+  function returnRoomDetails(res, roomName) {
+    roomDetail.roomName = roomName;
+    res.setStatusLine(null, 200, "OK");
+    res.write(JSON.stringify(roomDetail));
+    res.processAsync();
+    res.finish();
+  }
+
+  function getJSONData(body) {
+    return JSON.parse(CommonUtils.readBytesFromInputStream(body));
+  }
+
+  // Add a request handler for each room in the list.
+  [...kRoomsResponses.values()].forEach(function(room) {
+    loopServer.registerPathHandler("/rooms/" + encodeURIComponent(room.roomToken), (req, res) => {
+      if (req.method == "POST") {
+        let data = getJSONData(req.bodyInputStream);
+        res.setStatusLine(null, 200, "OK");
+        res.write(JSON.stringify(data));
+        res.processAsync();
+        res.finish();
+      } else if (req.method == "PATCH") {
+        let data = getJSONData(req.bodyInputStream);
+        Assert.ok("context" in data, "should have encrypted context");
+        // We return a fake encrypted name here as the context is
+        // encrypted.
+        returnRoomDetails(res, "fakeEncrypted");
+      } else {
+        res.setStatusLine(null, 200, "OK");
+        res.write(JSON.stringify(room));
+        res.processAsync();
+        res.finish();
+      }
+    });
+  });
+
+  loopServer.registerPathHandler("/rooms/error401", (req, res) => {
+    res.setStatusLine(null, 401, "Not Found");
+    res.processAsync();
+    res.finish();
+  });
+
+  loopServer.registerPathHandler("/rooms/errorMalformed", (req, res) => {
+    res.setStatusLine(null, 200, "OK");
+    res.write("{\"some\": \"Syntax Error!\"}}}}}}");
+    res.processAsync();
+    res.finish();
+  });
+
+  mockPushHandler.registrationPushURL = kEndPointUrl;
+
+  yield MozLoopService.promiseRegisteredWithServers();
+});
+
+
+// Test if getting rooms saves unknown keys correctly.
+add_task(function* test_get_rooms_saves_unknown_keys() {
+  let rooms = yield LoopRooms.promise("getAll");
+
+  // Check that we've saved the encryption keys correctly.
+  let roomsCache = yield readRoomsCache();
+  for (let room of [...kExpectedRooms.values()]) {
+    if (room.context.wrappedKey) {
+      Assert.equal(roomsCache[LOOP_SESSION_TYPE.FXA][room.roomToken].key, room.roomKey);
+    }
+  }
+
+  yield clearRoomsCache();
+});
+
+// Test that when we get a room it updates the saved key if it is different.
+add_task(function* test_get_rooms_saves_different_keys() {
+  let roomsCache = {};
+  roomsCache[LOOP_SESSION_TYPE.FXA] = {
+    QzBbvGmIZWU: {key: "fakeKey"}
+  };
+  yield saveRoomsCache(roomsCache);
+
+  const kRoomToken = "QzBbvGmIZWU";
+
+  let room = yield LoopRooms.promise("get", kRoomToken);
+
+  // Check that we've saved the encryption keys correctly.
+  roomsCache = yield readRoomsCache();
+
+  Assert.notEqual(roomsCache[LOOP_SESSION_TYPE.FXA][kRoomToken].key, "fakeKey");
+  Assert.equal(roomsCache[LOOP_SESSION_TYPE.FXA][kRoomToken].key, room.roomKey);
+
+  yield clearRoomsCache();
+});
+
+// Test that if roomKey decryption fails, the saved key is used for decryption.
+add_task(function* test_get_rooms_uses_saved_key() {
+  const kRoomToken = "_nxD4V4FflQ";
+  const kExpected = kExpectedRooms.get(kRoomToken)
+
+  let roomsCache = {};
+  roomsCache[LOOP_SESSION_TYPE.FXA] = {
+    "_nxD4V4FflQ": {key: kExpected.roomKey}
+  };
+  yield saveRoomsCache(roomsCache);
+
+  // Change the encryption key for FxA, so that decoding the room key will break.
+  Services.prefs.setCharPref("loop.key.fxa", "invalidKey");
+
+  let room = yield LoopRooms.promise("get", kRoomToken);
+
+  Assert.deepEqual(room, kExpected);
+
+  Services.prefs.setCharPref("loop.key.fxa", kFxAKey);
+  yield clearRoomsCache();
+});
+
+// Test that when a room is created the new key is saved.
+add_task(function* test_create_room_saves_key() {
+  let room = yield LoopRooms.promise("create", kCreateRoomProps);
+
+  let roomsCache = yield readRoomsCache();
+
+  Assert.equal(roomsCache[LOOP_SESSION_TYPE.FXA][room.roomToken].key, room.roomKey);
+
+  yield clearRoomsCache();
+});
+
+function run_test() {
+  setupFakeLoopServer();
+
+  Services.prefs.setCharPref("loop.key.fxa", kFxAKey);
+  Services.prefs.setBoolPref(kContextEnabledPref, true);
+
+  // Pretend we're signed into FxA.
+  MozLoopServiceInternal.fxAOAuthTokenData = { token_type: "bearer" };
+  MozLoopServiceInternal.fxAOAuthProfile = { email: "fake@invalid.com" };
+
+  do_register_cleanup(function () {
+    Services.prefs.clearUserPref(kContextEnabledPref);
+    Services.prefs.clearUserPref("loop.key.fxa");
+
+    MozLoopServiceInternal.fxAOAuthTokenData = null;
+    MozLoopServiceInternal.fxAOAuthProfile = null;
+  });
+
+  run_next_test();
+}
diff --git a/browser/components/loop/test/xpcshell/xpcshell.ini b/browser/components/loop/test/xpcshell/xpcshell.ini
index 40ba2ce8d76..201c6709a6d 100644
--- a/browser/components/loop/test/xpcshell/xpcshell.ini
+++ b/browser/components/loop/test/xpcshell/xpcshell.ini
@@ -7,6 +7,7 @@ skip-if = toolkit == 'gonk'
 [test_loopapi_hawk_request.js]
 [test_looppush_initialize.js]
 [test_looprooms.js]
+[test_looprooms_encryption_in_fxa.js]
 [test_loopservice_directcall.js]
 [test_loopservice_dnd.js]
 [test_loopservice_encryptionkey.js]

From 134e60e42131b398524705ff7f82c5e62ed6beae Mon Sep 17 00:00:00 2001
From: Cedric Raudin <cedric.raudin@gmail.com>
Date: Thu, 30 Apr 2015 16:41:13 +0100
Subject: [PATCH 27/88] Bug 1115365 - Update the import string in the Loop
 contact panel to explain it will be from Google. r=Standard8

---
 browser/components/loop/content/js/contacts.js            | 2 +-
 browser/components/loop/content/js/contacts.jsx           | 2 +-
 browser/locales/en-US/chrome/browser/loop/loop.properties | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/browser/components/loop/content/js/contacts.js b/browser/components/loop/content/js/contacts.js
index bb29539ce5f..bc6fcbb652f 100644
--- a/browser/components/loop/content/js/contacts.js
+++ b/browser/components/loop/content/js/contacts.js
@@ -587,7 +587,7 @@ loop.contacts = (function(_, mozL10n) {
             React.createElement(ButtonGroup, null, 
               React.createElement(Button, {caption: this.state.importBusy
                                ? mozL10n.get("importing_contacts_progress_button")
-                               : mozL10n.get("import_contacts_button"), 
+                               : mozL10n.get("import_contacts_button2"), 
                       disabled: this.state.importBusy, 
                       onClick: this.handleImportButtonClick}, 
                 React.createElement("div", {className: cx({"contact-import-spinner": true,
diff --git a/browser/components/loop/content/js/contacts.jsx b/browser/components/loop/content/js/contacts.jsx
index b77f34eaa03..ab53c1145ba 100644
--- a/browser/components/loop/content/js/contacts.jsx
+++ b/browser/components/loop/content/js/contacts.jsx
@@ -587,7 +587,7 @@ loop.contacts = (function(_, mozL10n) {
             <ButtonGroup>
               <Button caption={this.state.importBusy
                                ? mozL10n.get("importing_contacts_progress_button")
-                               : mozL10n.get("import_contacts_button")}
+                               : mozL10n.get("import_contacts_button2")}
                       disabled={this.state.importBusy}
                       onClick={this.handleImportButtonClick}>
                 <div className={cx({"contact-import-spinner": true,
diff --git a/browser/locales/en-US/chrome/browser/loop/loop.properties b/browser/locales/en-US/chrome/browser/loop/loop.properties
index 4815148dc5b..0402a8122d1 100644
--- a/browser/locales/en-US/chrome/browser/loop/loop.properties
+++ b/browser/locales/en-US/chrome/browser/loop/loop.properties
@@ -108,7 +108,7 @@ valid_email_text_description=Please enter a valid email address
 ## LOCALIZATION NOTE (add_or_import_contact_title): This is the subtitle of the
 ## panel.
 add_or_import_contact_title=Add or Import Contact
-import_contacts_button=Import
+import_contacts_button2=Import from Google
 importing_contacts_progress_button=Importing…
 import_contacts_failure_message=Some contacts could not be imported. Please try again.
 ## LOCALIZATION NOTE(import_contacts_success_message): Success notification message

From 0ce67ab51a4ac142919f3b92a6dbd1aa20b4b01e Mon Sep 17 00:00:00 2001
From: Jim Chen <nchen@mozilla.com>
Date: Thu, 30 Apr 2015 13:01:01 -0400
Subject: [PATCH 28/88] Bug 1158309 - Initialize LayerView sooner; r=snorp

---
 mobile/android/base/GeckoApp.java  | 14 +++++++-------
 mobile/android/base/GeckoView.java |  8 ++++----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/mobile/android/base/GeckoApp.java b/mobile/android/base/GeckoApp.java
index 647a90757db..b0f03622214 100644
--- a/mobile/android/base/GeckoApp.java
+++ b/mobile/android/base/GeckoApp.java
@@ -1275,6 +1275,7 @@ public abstract class GeckoApp
         mRootLayout = (OuterLayout) findViewById(R.id.root_layout);
         mGeckoLayout = (RelativeLayout) findViewById(R.id.gecko_layout);
         mMainLayout = (RelativeLayout) findViewById(R.id.main_layout);
+        mLayerView = (LayerView) findViewById(R.id.layer_view);
 
         // Determine whether we should restore tabs.
         mShouldRestore = getSessionRestoreState(savedInstanceState);
@@ -1414,13 +1415,12 @@ public abstract class GeckoApp
             }
         }
 
-        if (mLayerView == null) {
-            LayerView layerView = (LayerView) findViewById(R.id.layer_view);
-            layerView.initializeView(EventDispatcher.getInstance());
-            mLayerView = layerView;
-            GeckoAppShell.sendEventToGecko(GeckoEvent.createObjectEvent(
-                GeckoEvent.ACTION_OBJECT_LAYER_CLIENT, layerView.getLayerClientObject()));
-        }
+        // XXX our editor tests require the GeckoView to have focus to pass, so we have to
+        // manually shift focus to the GeckoView. requestFocus apparently doesn't work at
+        // this stage of starting up, so we have to unset and reset the focusability.
+        mLayerView.setFocusable(false);
+        mLayerView.setFocusable(true);
+        mLayerView.setFocusableInTouchMode(true);
     }
 
     /**
diff --git a/mobile/android/base/GeckoView.java b/mobile/android/base/GeckoView.java
index 41bdbb04c98..9ce45f0bf6e 100644
--- a/mobile/android/base/GeckoView.java
+++ b/mobile/android/base/GeckoView.java
@@ -122,6 +122,10 @@ public class GeckoView extends LayerView
         // Perform common initialization for Fennec/GeckoView.
         GeckoAppShell.setLayerView(this);
 
+        initializeView(EventDispatcher.getInstance());
+        GeckoAppShell.sendEventToGecko(GeckoEvent.createObjectEvent(
+                GeckoEvent.ACTION_OBJECT_LAYER_CLIENT, getLayerClientObject()));
+
         // 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
@@ -181,13 +185,9 @@ public class GeckoView extends LayerView
             "Accessibility:Ready",
             "GeckoView:Message");
 
-        initializeView(EventDispatcher.getInstance());
-
         if (GeckoThread.launch()) {
             // This is the first launch, so finish initialization and go.
             GeckoProfile profile = GeckoProfile.get(context).forceCreate();
-            GeckoAppShell.sendEventToGecko(GeckoEvent.createObjectEvent(
-                GeckoEvent.ACTION_OBJECT_LAYER_CLIENT, getLayerClientObject()));
 
         } else if (GeckoThread.checkLaunchState(GeckoThread.LaunchState.GeckoRunning)) {
             // If Gecko is already running, that means the Activity was

From a1d3c9060bc6c572ca3c5f8a88e8b7f8efa3baa9 Mon Sep 17 00:00:00 2001
From: Alessio Placitelli <alessio.placitelli@gmail.com>
Date: Mon, 27 Apr 2015 07:39:00 +0200
Subject: [PATCH 29/88] Bug 1158251 - Fix sub-session histograms
 double-counting measurements the first time. r=gfritzsche

---
 toolkit/components/telemetry/Telemetry.cpp    |  5 +++-
 .../telemetry/tests/unit/test_nsITelemetry.js | 24 +++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/toolkit/components/telemetry/Telemetry.cpp b/toolkit/components/telemetry/Telemetry.cpp
index 80f4645ffbb..865fe190a3c 100644
--- a/toolkit/components/telemetry/Telemetry.cpp
+++ b/toolkit/components/telemetry/Telemetry.cpp
@@ -1106,13 +1106,16 @@ HistogramAdd(Histogram& histogram, int32_t value, uint32_t dataset)
     return NS_OK;
   }
 
-  histogram.Add(value);
 #if !defined(MOZ_WIDGET_GONK) && !defined(MOZ_WIDGET_ANDROID)
   if (Histogram* subsession = GetSubsessionHistogram(histogram)) {
     subsession->Add(value);
   }
 #endif
 
+  // It is safe to add to the histogram now: the subsession histogram was already
+  // cloned from this so we won't add the sample twice.
+  histogram.Add(value);
+
   return NS_OK;
 }
 
diff --git a/toolkit/components/telemetry/tests/unit/test_nsITelemetry.js b/toolkit/components/telemetry/tests/unit/test_nsITelemetry.js
index 281133a3fca..69a0af4a14d 100644
--- a/toolkit/components/telemetry/tests/unit/test_nsITelemetry.js
+++ b/toolkit/components/telemetry/tests/unit/test_nsITelemetry.js
@@ -707,6 +707,27 @@ function test_datasets()
   Assert.ok(registered.has("TELEMETRY_TEST_KEYED_RELEASE_OPTOUT"));
 }
 
+function test_instantiate() {
+  if (gIsAndroid) {
+    // We don't support subsessions yet on Android.
+    return;
+  }
+
+  const ID = "TELEMETRY_TEST_COUNT";
+  let h = Telemetry.getHistogramById(ID);
+
+  // Instantiate the subsession histogram through |add| and make sure they match.
+  // This MUST be the first use of "TELEMETRY_TEST_COUNT" in this file, otherwise
+  // |add| will not instantiate the histogram.
+  h.add(1);
+  let snapshot = h.snapshot();
+  let subsession = Telemetry.snapshotSubsessionHistograms();
+  Assert.equal(snapshot.sum, subsession[ID].sum,
+               "Histogram and subsession histogram sum must match.");
+  // Clear the histogram, so we don't void the assumptions from the other tests.
+  h.clear();
+}
+
 function test_subsession() {
   if (gIsAndroid) {
     // We don't support subsessions yet on Android.
@@ -853,6 +874,9 @@ function generateUUID() {
 
 function run_test()
 {
+  // This MUST be the very first test of this file.
+  test_instantiate();
+
   let kinds = [Telemetry.HISTOGRAM_EXPONENTIAL, Telemetry.HISTOGRAM_LINEAR]
   for each (let histogram_type in kinds) {
     let [min, max, bucket_count] = [1, INT_MAX - 1, 10]

From 2aa6324fa054a4744c1ed11a1a6d0ef082d2b857 Mon Sep 17 00:00:00 2001
From: Georg Fritzsche <georg.fritzsche@googlemail.com>
Date: Thu, 30 Apr 2015 19:25:48 +0200
Subject: [PATCH 30/88] Bug 1160220 - Fix Search & Places histograms that
 should be opt-out on release channels. r=bsmedberg

---
 toolkit/components/telemetry/Histograms.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/toolkit/components/telemetry/Histograms.json b/toolkit/components/telemetry/Histograms.json
index 1e9135a69d7..982bc9fd702 100644
--- a/toolkit/components/telemetry/Histograms.json
+++ b/toolkit/components/telemetry/Histograms.json
@@ -3045,6 +3045,7 @@
     "high": "150000",
     "n_buckets": 20,
     "extended_statistics_ok": true,
+    "releaseChannelCollection": "opt-out",
     "description": "PLACES: Number of unique pages"
   },
   "PLACES_BOOKMARKS_COUNT": {
@@ -3054,6 +3055,7 @@
     "high": "8000",
     "n_buckets": 15,
     "extended_statistics_ok": true,
+    "releaseChannelCollection": "opt-out",
     "description": "PLACES: Number of bookmarks"
   },
   "PLACES_TAGS_COUNT": {
@@ -4863,12 +4865,14 @@
     "expires_in_version": "never",
     "kind": "count",
     "keyed": true,
+    "releaseChannelCollection": "opt-out",
     "description": "Record the search counts for search engines"
   },
   "SEARCH_DEFAULT_ENGINE": {
     "expires_in_version": "never",
     "kind": "flag",
     "keyed": true,
+    "releaseChannelCollection": "opt-out",
     "description": "Record the default search engine."
   },
   "SEARCH_SERVICE_INIT_MS": {

From ba2cfaa4cc4c05458f7aacc08c61104871f3f61f Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <ryanvm@gmail.com>
Date: Thu, 30 Apr 2015 14:17:41 -0400
Subject: [PATCH 31/88] Bug 1155238 - Bump mozharness.json to revision
 ca580fcfa627.

---
 testing/mozharness/mozharness.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testing/mozharness/mozharness.json b/testing/mozharness/mozharness.json
index ea595d806b2..6ae6934b132 100644
--- a/testing/mozharness/mozharness.json
+++ b/testing/mozharness/mozharness.json
@@ -1,4 +1,4 @@
 {
     "repo": "https://hg.mozilla.org/build/mozharness",
-    "revision": "fa7ea67fc5a2"
+    "revision": "ca580fcfa627"
 }

From a4bac36010c7d61ba1d3c7e1d4980895841128d0 Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <ryanvm@gmail.com>
Date: Thu, 30 Apr 2015 14:18:34 -0400
Subject: [PATCH 32/88] Backed out changeset d94ef5bca70e (bug 1152761) for
 xpcshell failures.

---
 browser/components/loop/modules/LoopRooms.jsm |  63 +----
 .../loop/modules/LoopRoomsCache.jsm           | 159 -----------
 browser/components/loop/moz.build             |   1 -
 browser/components/loop/test/xpcshell/head.js |  12 -
 .../loop/test/xpcshell/test_looprooms.js      |   7 +
 .../test_looprooms_encryption_in_fxa.js       | 267 ------------------
 .../loop/test/xpcshell/xpcshell.ini           |   1 -
 7 files changed, 14 insertions(+), 496 deletions(-)
 delete mode 100644 browser/components/loop/modules/LoopRoomsCache.jsm
 delete mode 100644 browser/components/loop/test/xpcshell/test_looprooms_encryption_in_fxa.js

diff --git a/browser/components/loop/modules/LoopRooms.jsm b/browser/components/loop/modules/LoopRooms.jsm
index a258eeebe94..d3374c2d615 100644
--- a/browser/components/loop/modules/LoopRooms.jsm
+++ b/browser/components/loop/modules/LoopRooms.jsm
@@ -7,13 +7,11 @@ const {classes: Cc, interfaces: Ci, utils: Cu} = Components;
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
-Cu.import("resource://gre/modules/Task.jsm");
-
 const {MozLoopService, LOOP_SESSION_TYPE} = Cu.import("resource:///modules/loop/MozLoopService.jsm", {});
 XPCOMUtils.defineLazyModuleGetter(this, "Promise",
                                   "resource://gre/modules/Promise.jsm");
-XPCOMUtils.defineLazyModuleGetter(this, "CommonUtils",
-                                  "resource://services-common/utils.js");
+XPCOMUtils.defineLazyModuleGetter(this, "Task",
+                                  "resource://gre/modules/Task.jsm");
 XPCOMUtils.defineLazyGetter(this, "eventEmitter", function() {
   const {EventEmitter} = Cu.import("resource://gre/modules/devtools/event-emitter.js", {});
   return new EventEmitter();
@@ -21,11 +19,8 @@ XPCOMUtils.defineLazyGetter(this, "eventEmitter", function() {
 XPCOMUtils.defineLazyGetter(this, "gLoopBundle", function() {
   return Services.strings.createBundle('chrome://browser/locale/loop/loop.properties');
 });
-
-XPCOMUtils.defineLazyModuleGetter(this, "LoopRoomsCache",
-  "resource:///modules/loop/LoopRoomsCache.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "loopUtils",
-  "resource:///modules/loop/utils.js", "utils");
+  "resource:///modules/loop/utils.js", "utils")
 XPCOMUtils.defineLazyModuleGetter(this, "loopCrypto",
   "resource:///modules/loop/crypto.js", "LoopCrypto");
 
@@ -46,8 +41,6 @@ const roomsPushNotification = function(version, channelID) {
 let gDirty = true;
 // Global variable that keeps track of the currently used account.
 let gCurrentUser = null;
-// Global variable that keeps track of the room cache.
-let gRoomsCache = null;
 
 /**
  * Extend a `target` object with the properties defined in `source`.
@@ -130,13 +123,6 @@ let LoopRoomsInternal = {
    */
   rooms: new Map(),
 
-  get roomsCache() {
-    if (!gRoomsCache) {
-      gRoomsCache = new LoopRoomsCache();
-    }
-    return gRoomsCache;
-  },
-
   /**
    * @var {String} sessionType The type of user session. May be 'FXA' or 'GUEST'.
    */
@@ -294,40 +280,12 @@ let LoopRoomsInternal = {
       throw new Error("Missing wrappedKey");
     }
 
-    let savedRoomKey = yield this.roomsCache.getKey(this.sessionType, roomData.roomToken);
-    let fallback = false;
-    let key;
-
-    try {
-      key = yield this.promiseDecryptRoomKey(roomData.context.wrappedKey);
-    } catch (error) {
-      // If we don't have a key saved, then we can't do anything.
-      if (!savedRoomKey) {
-        throw error;
-      }
-
-      // We failed to decrypt the room key, so has our FxA key changed?
-      // If so, we fall-back to the saved room key.
-      key = savedRoomKey;
-      fallback = true;
-    }
+    // Bug 1152761 will cause us to additionally store keys locally. We'll
+    // need to add some code for recovery in case decryption fails.
+    let key = yield this.promiseDecryptRoomKey(roomData.context.wrappedKey);
 
     let decryptedData = yield loopCrypto.decryptBytes(key, roomData.context.value);
 
-    if (fallback) {
-      // Fallback decryption succeeded, so we need to re-encrypt the room key and
-      // save the data back again.
-      // XXX Bug 1152764 will implement this or make it a separate bug.
-    } else if (!savedRoomKey || key != savedRoomKey) {
-      // Decryption succeeded, but we don't have the right key saved.
-      try {
-        yield this.roomsCache.setKey(this.sessionType, roomData.roomToken, key);
-      }
-      catch (error) {
-        MozLoopService.log.error("Failed to save room key:", error);
-      }
-    }
-
     roomData.roomKey = key;
     roomData.decryptedContext = JSON.parse(decryptedData);
 
@@ -384,7 +342,7 @@ let LoopRoomsInternal = {
 
         this.saveAndNotifyUpdate(roomData, isUpdate);
       } catch (error) {
-        MozLoopService.log.error("Failed to decrypt room data: ", error);
+        MozLoopService.log.error("Failed to decrypt room data: " + error);
         // Do what we can to save the room data.
         room.decryptedContext = {};
         this.saveAndNotifyUpdate(room, isUpdate);
@@ -537,9 +495,6 @@ let LoopRoomsInternal = {
         this.setGuestCreatedRoom(true);
       }
 
-      // Now we've got the room token, we can save the key to disk.
-      yield this.roomsCache.setKey(this.sessionType, room.roomToken, room.roomKey);
-
       eventEmitter.emit("add", room);
       callback(null, room);
     }.bind(this)).catch(callback);
@@ -749,10 +704,6 @@ let LoopRoomsInternal = {
         sendData = {
           roomName: newRoomName
         };
-      } else {
-        // This might be an upgrade to encrypted rename, so store the key
-        // just in case.
-        yield this.roomsCache.setKey(this.sessionType, all.roomToken, all.roomKey);
       }
 
       let response = yield MozLoopService.hawkRequest(this.sessionType,
diff --git a/browser/components/loop/modules/LoopRoomsCache.jsm b/browser/components/loop/modules/LoopRoomsCache.jsm
deleted file mode 100644
index e83ff11eb8a..00000000000
--- a/browser/components/loop/modules/LoopRoomsCache.jsm
+++ /dev/null
@@ -1,159 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-"use strict";
-
-const {classes: Cc, interfaces: Ci, utils: Cu} = Components;
-
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-Cu.import("resource://gre/modules/Services.jsm");
-Cu.import("resource://gre/modules/Task.jsm");
-const {MozLoopService, LOOP_SESSION_TYPE} =
-  Cu.import("resource:///modules/loop/MozLoopService.jsm", {});
-XPCOMUtils.defineLazyModuleGetter(this, "CommonUtils",
-                                  "resource://services-common/utils.js");
-XPCOMUtils.defineLazyModuleGetter(this, "OS", "resource://gre/modules/osfile.jsm");
-
-this.EXPORTED_SYMBOLS = ["LoopRoomsCache"];
-
-const LOOP_ROOMS_CACHE_FILENAME = "loopRoomsCache.json";
-
-/**
- * RoomsCache is a cache for saving simple rooms data to the disk in case we
- * need it for back-up purposes, e.g. recording room keys for FxA if the user
- * changes their password.
- *
- * The format of the data is:
- *
- * {
- *   <sessionType>: {
- *     <roomToken>: {
- *       "key": <roomKey>
- *     }
- *   }
- * }
- *
- * It is intended to try and keep the data forward and backwards compatible in
- * a reasonable manner, hence why the structure is more complex than it needs
- * to be to store tokens and keys.
- *
- * @param {Object} options The options for the RoomsCache, containing:
- *   - {String} baseDir   The base directory in which to save the file.
- *   - {String} filename  The filename for the cache file.
- */
-function LoopRoomsCache(options) {
-  options = options || {};
-
-  this.baseDir = options.baseDir || OS.Constants.Path.profileDir;
-  this.path = OS.Path.join(
-    this.baseDir,
-    options.filename || LOOP_ROOMS_CACHE_FILENAME
-  );
-  this._cache = null;
-}
-
-LoopRoomsCache.prototype = {
-  /**
-   * Updates the local copy of the cache and saves it to disk.
-   *
-   * @param  {Object} contents An object to be saved in json format.
-   * @return {Promise} A promise that is resolved once the save is complete.
-   */
-  _setCache: function(contents) {
-    this._cache = contents;
-
-    return OS.File.makeDir(this.baseDir, {ignoreExisting: true}).then(() => {
-        return CommonUtils.writeJSON(contents, this.path);
-      });
-  },
-
-  /**
-   * Returns the local copy of the cache if there is one, otherwise it reads
-   * it from the disk.
-   *
-   * @return {Promise} A promise that is resolved once the read is complete.
-   */
-  _getCache: Task.async(function* () {
-    if (this._cache) {
-      return this._cache;
-    }
-
-    try {
-      return (this._cache = yield CommonUtils.readJSON(this.path));
-    } catch(error) {
-      // This is really complex due to OSFile's error handling, see bug 1160109.
-      if ((OS.Constants.libc && error.unixErrno != OS.Constants.libc.ENOENT) ||
-          (OS.Constants.Win && error.winLastError != OS.Constants.Win.ERROR_FILE_NOT_FOUND)) {
-        MozLoopService.log.debug("Error reading the cache:", error);
-      }
-      return (this._cache = {});
-    }
-  }),
-
-  /**
-   * Function for testability purposes. Clears the cache.
-   *
-   * @return {Promise} A promise that is resolved once the clear is complete.
-   */
-  clear: function() {
-    this._cache = null;
-    return OS.File.remove(this.path)
-  },
-
-  /**
-   * Gets a room key from the cache.
-   *
-   * @param {LOOP_SESSION_TYPE} sessionType  The session type for the room.
-   * @param {String}            roomToken    The token for the room.
-   * @return {Promise} A promise that is resolved when the data has been read
-   *                   with the value of the key, or null if it isn't present.
-   */
-  getKey: Task.async(function* (sessionType, roomToken) {
-    if (sessionType != LOOP_SESSION_TYPE.FXA) {
-      return null;
-    }
-
-    let sessionData = (yield this._getCache())[sessionType];
-
-    if (!sessionData || !sessionData[roomToken]) {
-      return null;
-    }
-    return sessionData[roomToken].key;
-  }),
-
-  /**
-   * Stores a room key into the cache. Note, if the key has not changed,
-   * the store will not be re-written.
-   *
-   * @param {LOOP_SESSION_TYPE} sessionType  The session type for the room.
-   * @param {String}            roomToken    The token for the room.
-   * @param {String}            roomKey      The encryption key for the room.
-   * @return {Promise} A promise that is resolved when the data has been stored.
-   */
-  setKey: Task.async(function* (sessionType, roomToken, roomKey) {
-    if (sessionType != LOOP_SESSION_TYPE.FXA) {
-      return;
-    }
-
-    let cache = yield this._getCache();
-
-    // Create these objects if they don't exist.
-    // We aim to do this creation and setting of the room key in a
-    // forwards-compatible way so that if new fields are added to rooms later
-    // then we don't mess them up (if there's no keys).
-    if (!cache[sessionType]) {
-      cache[sessionType] = {};
-    }
-
-    if (!cache[sessionType][roomToken]) {
-      cache[sessionType][roomToken] = {};
-    }
-
-    // Only save it if there's no key, or it is different.
-    if (!cache[sessionType][roomToken].key ||
-        cache[sessionType][roomToken].key != roomKey) {
-      cache[sessionType][roomToken].key = roomKey;
-      return yield this._setCache(cache);
-    }
-  })
-};
diff --git a/browser/components/loop/moz.build b/browser/components/loop/moz.build
index 11cd3bcca98..a2cbc2469d8 100644
--- a/browser/components/loop/moz.build
+++ b/browser/components/loop/moz.build
@@ -20,7 +20,6 @@ EXTRA_JS_MODULES.loop += [
     'modules/LoopCalls.jsm',
     'modules/LoopContacts.jsm',
     'modules/LoopRooms.jsm',
-    'modules/LoopRoomsCache.jsm',
     'modules/LoopStorage.jsm',
     'modules/MozLoopAPI.jsm',
     'modules/MozLoopPushHandler.jsm',
diff --git a/browser/components/loop/test/xpcshell/head.js b/browser/components/loop/test/xpcshell/head.js
index 412254bcf7c..59e90bb29b3 100644
--- a/browser/components/loop/test/xpcshell/head.js
+++ b/browser/components/loop/test/xpcshell/head.js
@@ -3,9 +3,6 @@
 
 const {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components;
 
-// Initialize this before the imports, as some of them need it.
-do_get_profile();
-
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/Http.jsm");
@@ -14,9 +11,7 @@ Cu.import("resource:///modules/loop/MozLoopService.jsm");
 Cu.import("resource://gre/modules/Promise.jsm");
 Cu.import("resource:///modules/loop/LoopCalls.jsm");
 Cu.import("resource:///modules/loop/LoopRooms.jsm");
-Cu.import("resource://gre/modules/osfile.jsm");
 const { MozLoopServiceInternal } = Cu.import("resource:///modules/loop/MozLoopService.jsm", {});
-const { LoopRoomsInternal } = Cu.import("resource:///modules/loop/LoopRooms.jsm", {});
 
 XPCOMUtils.defineLazyModuleGetter(this, "MozLoopPushHandler",
                                   "resource:///modules/loop/MozLoopPushHandler.jsm");
@@ -214,10 +209,3 @@ MockWebSocketChannel.prototype = {
     this.listener.onServerClose(this.context, err || -1);
   },
 };
-
-const extend = function(target, source) {
-  for (let key of Object.getOwnPropertyNames(source)) {
-    target[key] = source[key];
-  }
-  return target;
-};
diff --git a/browser/components/loop/test/xpcshell/test_looprooms.js b/browser/components/loop/test/xpcshell/test_looprooms.js
index 018f1727023..5ab2d6c69a9 100644
--- a/browser/components/loop/test/xpcshell/test_looprooms.js
+++ b/browser/components/loop/test/xpcshell/test_looprooms.js
@@ -182,6 +182,13 @@ const kCreateRoomData = {
 const kChannelGuest = MozLoopService.channelIDs.roomsGuest;
 const kChannelFxA = MozLoopService.channelIDs.roomsFxA;
 
+const extend = function(target, source) {
+  for (let key of Object.getOwnPropertyNames(source)) {
+    target[key] = source[key];
+  }
+  return target;
+};
+
 const normalizeRoom = function(room) {
   let newRoom = extend({}, room);
   let name = newRoom.decryptedContext.roomName;
diff --git a/browser/components/loop/test/xpcshell/test_looprooms_encryption_in_fxa.js b/browser/components/loop/test/xpcshell/test_looprooms_encryption_in_fxa.js
deleted file mode 100644
index bdb882988ff..00000000000
--- a/browser/components/loop/test/xpcshell/test_looprooms_encryption_in_fxa.js
+++ /dev/null
@@ -1,267 +0,0 @@
-/* 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/. */
-
-Cu.import("resource://services-common/utils.js");
-const { LOOP_ROOMS_CACHE_FILENAME } = Cu.import("resource:///modules/loop/LoopRoomsCache.jsm", {});
-
-const kContextEnabledPref = "loop.contextInConverations.enabled";
-
-const kFxAKey = "uGIs-kGbYt1hBBwjyW7MLQ";
-
-// Rooms details as responded by the server.
-const kRoomsResponses = new Map([
-  ["_nxD4V4FflQ", {
-    // Encrypted with roomKey "FliIGLUolW-xkKZVWstqKw".
-    // roomKey is wrapped with kFxAKey.
-    context: {
-      wrappedKey: "F3V27oPB+FgjFbVPML2PupONYqoIZ53XRU4BqG46Lr3eyIGumgCEqgjSe/MXAXiQ//8=",
-      value: "df7B4SNxhOI44eJjQavCevADyCCxz6/DEZbkOkRUMVUxzS42FbzN6C2PqmCKDYUGyCJTwJ0jln8TLw==",
-      alg: "AES-GCM"
-    },
-    roomToken: "_nxD4V4FflQ",
-    roomUrl: "http://localhost:3000/rooms/_nxD4V4FflQ"
-  }],
-  ["QzBbvGmIZWU", {
-    context: {
-      wrappedKey: "AFu7WwFNjhWR5J6L8ks7S6H/1ktYVEw3yt1eIIWVaMabZaB3vh5612/FNzua4oS2oCM=",
-      value: "sqj+xRNEty8K3Q1gSMd5bIUYKu34JfiO2+LIMlJrOetFIbJdBoQ+U8JZNaTFl6Qp3RULZ41x0zeSBSk=",
-      alg: "AES-GCM"
-    },
-    roomToken: "QzBbvGmIZWU",
-    roomUrl: "http://localhost:3000/rooms/QzBbvGmIZWU"
-  }]
-]);
-
-const kExpectedRooms = new Map([
-  ["_nxD4V4FflQ", {
-    context: {
-      wrappedKey: "F3V27oPB+FgjFbVPML2PupONYqoIZ53XRU4BqG46Lr3eyIGumgCEqgjSe/MXAXiQ//8=",
-      value: "df7B4SNxhOI44eJjQavCevADyCCxz6/DEZbkOkRUMVUxzS42FbzN6C2PqmCKDYUGyCJTwJ0jln8TLw==",
-      alg: "AES-GCM"
-    },
-    decryptedContext: {
-      roomName: "First Room Name"
-    },
-    roomKey: "FliIGLUolW-xkKZVWstqKw",
-    roomToken: "_nxD4V4FflQ",
-    roomUrl: "http://localhost:3000/rooms/_nxD4V4FflQ#FliIGLUolW-xkKZVWstqKw"
-  }],
-  ["QzBbvGmIZWU", {
-    context: {
-      wrappedKey: "AFu7WwFNjhWR5J6L8ks7S6H/1ktYVEw3yt1eIIWVaMabZaB3vh5612/FNzua4oS2oCM=",
-      value: "sqj+xRNEty8K3Q1gSMd5bIUYKu34JfiO2+LIMlJrOetFIbJdBoQ+U8JZNaTFl6Qp3RULZ41x0zeSBSk=",
-      alg: "AES-GCM"
-    },
-    decryptedContext: {
-      roomName: "Loopy Discussion",
-    },
-    roomKey: "h2H8Sa9QxLCTTiXNmJVtRA",
-    roomToken: "QzBbvGmIZWU",
-    roomUrl: "http://localhost:3000/rooms/QzBbvGmIZWU"
-  }]
-]);
-
-const kCreateRoomProps = {
-  decryptedContext: {
-    roomName: "Say Hello",
-  },
-  roomOwner: "Gavin",
-  maxSize: 2
-};
-
-const kCreateRoomData = {
-  roomToken: "Vo2BFQqIaAM",
-  roomUrl: "http://localhost:3000/rooms/_nxD4V4FflQ",
-  expiresAt: 1405534180
-};
-
-function getCachePath() {
-  return OS.Path.join(OS.Constants.Path.profileDir, LOOP_ROOMS_CACHE_FILENAME);
-}
-
-function readRoomsCache() {
-  return CommonUtils.readJSON(getCachePath());
-}
-
-function saveRoomsCache(contents) {
-  delete LoopRoomsInternal.roomsCache._cache;
-  return CommonUtils.writeJSON(contents, getCachePath());
-}
-
-function clearRoomsCache() {
-  return LoopRoomsInternal.roomsCache.clear();
-}
-
-// This is a cut-down version of the one in test_looprooms.js.
-add_task(function* setup_server() {
-  loopServer.registerPathHandler("/registration", (req, res) => {
-    res.setStatusLine(null, 200, "OK");
-    res.processAsync();
-    res.finish();
-  });
-
-  loopServer.registerPathHandler("/rooms", (req, res) => {
-    res.setStatusLine(null, 200, "OK");
-
-    if (req.method == "POST") {
-      Assert.ok(req.bodyInputStream, "POST request should have a payload");
-      let body = CommonUtils.readBytesFromInputStream(req.bodyInputStream);
-      let data = JSON.parse(body);
-
-      Assert.ok(!("decryptedContext" in data), "should not have any decrypted data");
-      Assert.ok("context" in data, "should have context");
-
-      res.write(JSON.stringify(kCreateRoomData));
-    } else {
-      res.write(JSON.stringify([...kRoomsResponses.values()]));
-    }
-
-    res.processAsync();
-    res.finish();
-  });
-
-  function returnRoomDetails(res, roomName) {
-    roomDetail.roomName = roomName;
-    res.setStatusLine(null, 200, "OK");
-    res.write(JSON.stringify(roomDetail));
-    res.processAsync();
-    res.finish();
-  }
-
-  function getJSONData(body) {
-    return JSON.parse(CommonUtils.readBytesFromInputStream(body));
-  }
-
-  // Add a request handler for each room in the list.
-  [...kRoomsResponses.values()].forEach(function(room) {
-    loopServer.registerPathHandler("/rooms/" + encodeURIComponent(room.roomToken), (req, res) => {
-      if (req.method == "POST") {
-        let data = getJSONData(req.bodyInputStream);
-        res.setStatusLine(null, 200, "OK");
-        res.write(JSON.stringify(data));
-        res.processAsync();
-        res.finish();
-      } else if (req.method == "PATCH") {
-        let data = getJSONData(req.bodyInputStream);
-        Assert.ok("context" in data, "should have encrypted context");
-        // We return a fake encrypted name here as the context is
-        // encrypted.
-        returnRoomDetails(res, "fakeEncrypted");
-      } else {
-        res.setStatusLine(null, 200, "OK");
-        res.write(JSON.stringify(room));
-        res.processAsync();
-        res.finish();
-      }
-    });
-  });
-
-  loopServer.registerPathHandler("/rooms/error401", (req, res) => {
-    res.setStatusLine(null, 401, "Not Found");
-    res.processAsync();
-    res.finish();
-  });
-
-  loopServer.registerPathHandler("/rooms/errorMalformed", (req, res) => {
-    res.setStatusLine(null, 200, "OK");
-    res.write("{\"some\": \"Syntax Error!\"}}}}}}");
-    res.processAsync();
-    res.finish();
-  });
-
-  mockPushHandler.registrationPushURL = kEndPointUrl;
-
-  yield MozLoopService.promiseRegisteredWithServers();
-});
-
-
-// Test if getting rooms saves unknown keys correctly.
-add_task(function* test_get_rooms_saves_unknown_keys() {
-  let rooms = yield LoopRooms.promise("getAll");
-
-  // Check that we've saved the encryption keys correctly.
-  let roomsCache = yield readRoomsCache();
-  for (let room of [...kExpectedRooms.values()]) {
-    if (room.context.wrappedKey) {
-      Assert.equal(roomsCache[LOOP_SESSION_TYPE.FXA][room.roomToken].key, room.roomKey);
-    }
-  }
-
-  yield clearRoomsCache();
-});
-
-// Test that when we get a room it updates the saved key if it is different.
-add_task(function* test_get_rooms_saves_different_keys() {
-  let roomsCache = {};
-  roomsCache[LOOP_SESSION_TYPE.FXA] = {
-    QzBbvGmIZWU: {key: "fakeKey"}
-  };
-  yield saveRoomsCache(roomsCache);
-
-  const kRoomToken = "QzBbvGmIZWU";
-
-  let room = yield LoopRooms.promise("get", kRoomToken);
-
-  // Check that we've saved the encryption keys correctly.
-  roomsCache = yield readRoomsCache();
-
-  Assert.notEqual(roomsCache[LOOP_SESSION_TYPE.FXA][kRoomToken].key, "fakeKey");
-  Assert.equal(roomsCache[LOOP_SESSION_TYPE.FXA][kRoomToken].key, room.roomKey);
-
-  yield clearRoomsCache();
-});
-
-// Test that if roomKey decryption fails, the saved key is used for decryption.
-add_task(function* test_get_rooms_uses_saved_key() {
-  const kRoomToken = "_nxD4V4FflQ";
-  const kExpected = kExpectedRooms.get(kRoomToken)
-
-  let roomsCache = {};
-  roomsCache[LOOP_SESSION_TYPE.FXA] = {
-    "_nxD4V4FflQ": {key: kExpected.roomKey}
-  };
-  yield saveRoomsCache(roomsCache);
-
-  // Change the encryption key for FxA, so that decoding the room key will break.
-  Services.prefs.setCharPref("loop.key.fxa", "invalidKey");
-
-  let room = yield LoopRooms.promise("get", kRoomToken);
-
-  Assert.deepEqual(room, kExpected);
-
-  Services.prefs.setCharPref("loop.key.fxa", kFxAKey);
-  yield clearRoomsCache();
-});
-
-// Test that when a room is created the new key is saved.
-add_task(function* test_create_room_saves_key() {
-  let room = yield LoopRooms.promise("create", kCreateRoomProps);
-
-  let roomsCache = yield readRoomsCache();
-
-  Assert.equal(roomsCache[LOOP_SESSION_TYPE.FXA][room.roomToken].key, room.roomKey);
-
-  yield clearRoomsCache();
-});
-
-function run_test() {
-  setupFakeLoopServer();
-
-  Services.prefs.setCharPref("loop.key.fxa", kFxAKey);
-  Services.prefs.setBoolPref(kContextEnabledPref, true);
-
-  // Pretend we're signed into FxA.
-  MozLoopServiceInternal.fxAOAuthTokenData = { token_type: "bearer" };
-  MozLoopServiceInternal.fxAOAuthProfile = { email: "fake@invalid.com" };
-
-  do_register_cleanup(function () {
-    Services.prefs.clearUserPref(kContextEnabledPref);
-    Services.prefs.clearUserPref("loop.key.fxa");
-
-    MozLoopServiceInternal.fxAOAuthTokenData = null;
-    MozLoopServiceInternal.fxAOAuthProfile = null;
-  });
-
-  run_next_test();
-}
diff --git a/browser/components/loop/test/xpcshell/xpcshell.ini b/browser/components/loop/test/xpcshell/xpcshell.ini
index 201c6709a6d..40ba2ce8d76 100644
--- a/browser/components/loop/test/xpcshell/xpcshell.ini
+++ b/browser/components/loop/test/xpcshell/xpcshell.ini
@@ -7,7 +7,6 @@ skip-if = toolkit == 'gonk'
 [test_loopapi_hawk_request.js]
 [test_looppush_initialize.js]
 [test_looprooms.js]
-[test_looprooms_encryption_in_fxa.js]
 [test_loopservice_directcall.js]
 [test_loopservice_dnd.js]
 [test_loopservice_encryptionkey.js]

From b268112effcea7573aab8f9c1a9799aa3e7981bf Mon Sep 17 00:00:00 2001
From: Nick Alexander <nalexander@mozilla.com>
Date: Tue, 28 Apr 2015 10:12:11 -0700
Subject: [PATCH 33/88] Bug 1159371 - Make --disable-compile-environment work
 with --enable-application=mobile/android. r=glandium

This doesn't really do what it says on the tin: it still requires a
compile environment in the situation when
--disable-compile-environment is set but we would be cross compiling.
It just doesn't do the compilation (or linking) of C/C++ binaries.
This is a step towards real support of --disable-compile-environment
when cross compiling.
---
 configure.in                  | 26 ++++++++++++++++++--------
 mobile/android/base/moz.build |  4 ++++
 mobile/android/confvars.sh    |  5 ++++-
 3 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/configure.in b/configure.in
index e26147e485e..ccacf5c39cd 100644
--- a/configure.in
+++ b/configure.in
@@ -367,6 +367,12 @@ dnl ========================================================
 dnl AR_FLAGS set here so HOST_AR_FLAGS can be set correctly (see bug 538269)
 AR_FLAGS='crs $@'
 
+if test -z "$COMPILE_ENVIRONMENT"; then
+if test "$target" != "$host"; then
+    MOZ_CROSS_COMPILER
+fi
+fi # !COMPILE_ENVIRONMENT
+
 if test "$COMPILE_ENVIRONMENT"; then
 
 if test "$target" != "$host"; then
@@ -1965,7 +1971,7 @@ case "$target" in
             TARGET_COMPILER_ABI="ibmc"
             CC_VERSION=`lslpp -Lcq vac.C 2>/dev/null | awk -F: '{ print $3 }'`
             CXX_VERSION=`lslpp -Lcq vacpp.cmp.core 2>/dev/null | awk -F: '{ print $3 }'`
-        fi
+        fi # COMPILE_ENVIRONMENT
     fi
     case "${target_os}" in
     aix4.1*)
@@ -1974,7 +1980,7 @@ case "$target" in
     esac
     if test "$COMPILE_ENVIRONMENT"; then
         MOZ_CHECK_HEADERS(sys/inttypes.h)
-    fi
+    fi # COMPILE_ENVIRONMENT
     AC_DEFINE(NSCAP_DISABLE_DEBUG_PTR_TYPES)
     ;;
 
@@ -2101,7 +2107,9 @@ ia64*-hpux*)
         MOZ_SYNTH_PICO=1
     else
         _PLATFORM_DEFAULT_TOOLKIT=cairo-android
-        MOZ_LINKER=1
+        if test "$COMPILE_ENVIRONMENT"; then
+            MOZ_LINKER=1
+        fi
     fi
     TARGET_NSPR_MDCPUCFG='\"md/_linux.cfg\"'
 
@@ -2587,7 +2595,7 @@ if test -z "$COMPILE_ENVIRONMENT"; then
     SKIP_LIBRARY_CHECKS=1
 else
     MOZ_COMPILER_OPTS
-fi
+fi # COMPILE_ENVIRONMENT
 
 if test -z "$SKIP_COMPILER_CHECKS"; then
 dnl Checks for typedefs, structures, and compiler characteristics.
@@ -3919,7 +3927,9 @@ case "${target}" in
         NSS_DISABLE_DBM=1
         MOZ_THEME_FASTSTRIPE=1
         MOZ_TREE_FREETYPE=1
-        MOZ_MEMORY=1
+        if test "$COMPILE_ENVIRONMENT"; then
+            MOZ_MEMORY=1
+        fi
         MOZ_RAW=1
         ;;
 
@@ -5451,7 +5461,7 @@ if test -n "$MOZ_VPX" -a -z "$MOZ_NATIVE_LIBVPX"; then
         VPX_ASFLAGS="-f win32 -rnasm -pnasm -DPIC"
         VPX_X86_ASM=1
         dnl The encoder needs obj_int_extract to get asm offsets.
-      fi
+      fi # COMPILE_ENVIRONMENT and others
     ;;
     *:arm*)
       if test -n "$GNU_AS" ; then
@@ -5481,7 +5491,7 @@ if test -n "$MOZ_VPX" -a -z "$MOZ_NATIVE_LIBVPX"; then
 
     if test -n "$COMPILE_ENVIRONMENT" -a -n "$VPX_X86_ASM" -a -z "$VPX_AS"; then
       AC_MSG_ERROR([yasm is a required build tool for this architecture when webm is enabled. You may either install yasm or --disable-webm (which disables the WebM video format). See https://developer.mozilla.org/en/YASM for more details.])
-    fi
+    fi # COMPILE_ENVIRONMENT and others
 
     if test -z "$GNU_CC" -a -z "$INTEL_CC" -a -z "$CLANG_CC" ; then
       dnl We prefer to get asm offsets using inline assembler, which the above
@@ -7339,7 +7349,7 @@ if test -n "$COMPILE_ENVIRONMENT" -a -n "$USE_ELF_HACK"; then
             USE_ELF_HACK=
         fi
     fi
-fi
+fi # COMPILE_ENVIRONMENT and others.
 
 dnl ========================================================
 dnl = libstdc++ compatibility hacks
diff --git a/mobile/android/base/moz.build b/mobile/android/base/moz.build
index 5431a777c19..feb92072deb 100644
--- a/mobile/android/base/moz.build
+++ b/mobile/android/base/moz.build
@@ -760,6 +760,10 @@ for var in ('ANDROID_PACKAGE_NAME', 'ANDROID_CPU_ARCH',
 # Mangle our package name to avoid Bug 750548.
 DEFINES['MANGLED_ANDROID_PACKAGE_NAME'] = CONFIG['ANDROID_PACKAGE_NAME'].replace('fennec', 'f3nn3c')
 DEFINES['MOZ_APP_ABI'] = CONFIG['TARGET_XPCOM_ABI']
+if not CONFIG['COMPILE_ENVIRONMENT']:
+    # These should really come from the included binaries, but that's not easy.
+    DEFINES['MOZ_APP_ABI'] = 'arm-eabi-gcc3' # Observe quote differences here ...
+    DEFINES['TARGET_XPCOM_ABI'] = '"arm-eabi-gcc3"' # ... and here.
 
 if '-march=armv7' in CONFIG['OS_CFLAGS']:
     DEFINES['MOZ_MIN_CPU_VERSION'] = 7
diff --git a/mobile/android/confvars.sh b/mobile/android/confvars.sh
index abed9362683..e3f68e90a4e 100644
--- a/mobile/android/confvars.sh
+++ b/mobile/android/confvars.sh
@@ -46,8 +46,11 @@ MOZ_APP_ID={aa3c5121-dab2-40e2-81ca-7ea25febc110}
 
 MOZ_APP_STATIC_INI=1
 
-# Enable on-demand decompression
+# Enable on-demand decompression.  This requires a host compile toolchain to
+# build szip to use during packaging.
+if test "$COMPILE_ENVIRONMENT"; then
 MOZ_ENABLE_SZIP=1
+fi
 
 # Enable navigator.mozPay
 MOZ_PAY=1

From cc84f997acaff16a37857796496ca425047c89ba Mon Sep 17 00:00:00 2001
From: Nick Alexander <nalexander@mozilla.com>
Date: Mon, 27 Apr 2015 14:55:34 -0700
Subject: [PATCH 34/88] Bug 1159371 - Allow compiling sub-directories with
 --disable-compile-environment. r=glandium

Without this, invoking Make in a sub-directory will fail with an error
that libs:: cannot find target `target'.

Without this patch, the Fennec Gradle and IDE build integration fails
compiling its custom targets in mobile/android/base and
mobile/android/base/locales.
---
 config/recurse.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/config/recurse.mk b/config/recurse.mk
index 8a0a5a7bdf9..bd22bbe7222 100644
--- a/config/recurse.mk
+++ b/config/recurse.mk
@@ -124,7 +124,9 @@ endef
 $(foreach subtier,$(filter-out compile,$(TIERS)),$(eval $(call CREATE_SUBTIER_TRAVERSAL_RULE,$(subtier))))
 
 ifndef TOPLEVEL_BUILD
+ifdef COMPILE_ENVIRONMENT
 libs:: target host
+endif # COMPILE_ENVIRONMENT
 endif
 
 endif # ifeq ($(NO_RECURSE_MAKELEVEL),$(MAKELEVEL))

From 81757a73f485faafde221475a0f0ec44ef0570eb Mon Sep 17 00:00:00 2001
From: Nick Alexander <nalexander@mozilla.com>
Date: Wed, 29 Apr 2015 21:40:21 -0700
Subject: [PATCH 35/88] Bug 1160030 - Use TEST_HARNESS_FILES to install Robocop
 test files. r=froydnj

---
 build/mobile/robocop/Makefile.in | 18 ------------------
 build/mobile/robocop/moz.build   | 15 +++++++++++++++
 2 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/build/mobile/robocop/Makefile.in b/build/mobile/robocop/Makefile.in
index 353bb241c2f..e10c40fa287 100644
--- a/build/mobile/robocop/Makefile.in
+++ b/build/mobile/robocop/Makefile.in
@@ -59,24 +59,6 @@ robocop_FILES   := \
   $(NULL)
 robocop-deps := $(notdir $(robocop_FILES))
 
-ROBOCOP_FILES := \
-  $(wildcard $(TESTPATH)/*.html) \
-  $(wildcard $(TESTPATH)/*.jpg) \
-  $(wildcard $(TESTPATH)/*.sjs) \
-  $(wildcard $(TESTPATH)/test*.js) \
-  $(wildcard $(TESTPATH)/robocop*.js) \
-  $(wildcard $(TESTPATH)/*.xml) \
-  $(wildcard $(TESTPATH)/*.ogg) \
-  $(wildcard $(TESTPATH)/*.mp4) \
-  $(wildcard $(TESTPATH)/*.webm) \
-  $(wildcard $(TESTPATH)/*.swf) \
-  $(wildcard $(TESTPATH)/reader_mode_pages) \
-  $(NULL)
-
-ROBOCOP_DEST := $(DEPTH)/_tests/testing/mochitest/tests/robocop/
-ROBOCOP_TARGET := export
-INSTALL_TARGETS += ROBOCOP
-
 GARBAGE += \
   AndroidManifest.xml \
   $(robocop-deps) \
diff --git a/build/mobile/robocop/moz.build b/build/mobile/robocop/moz.build
index 12d61eb171d..42d697ea49c 100644
--- a/build/mobile/robocop/moz.build
+++ b/build/mobile/robocop/moz.build
@@ -18,3 +18,18 @@ main.add_classpathentry('harness', SRCDIR,
     dstdir='harness/org/mozilla/gecko')
 main.add_classpathentry('src', TOPSRCDIR + '/mobile/android/base/tests',
     dstdir='src/org/mozilla/gecko/tests')
+
+TEST_HARNESS_FILES.testing.mochitest.tests.robocop += ['/mobile/android/base/tests/' + x for x in [
+    '*.html',
+    '*.jpg',
+    '*.mp4',
+    '*.ogg',
+    '*.sjs',
+    '*.swf',
+    '*.webm',
+    '*.xml',
+    'robocop*.js',
+    'test*.js',
+]]
+# The ** below preserves directory structure.
+TEST_HARNESS_FILES.testing.mochitest.tests.robocop.reader_mode_pages += ['/mobile/android/base/tests/reader_mode_pages/**']

From 7a05994247fc0591cce727c14253cd96328cfc4f Mon Sep 17 00:00:00 2001
From: Nick Alexander <nalexander@mozilla.com>
Date: Thu, 30 Apr 2015 10:13:13 -0700
Subject: [PATCH 36/88] Bug 1160030 - Use TEST_HARNESS_FILES to install Robocop
 ini files. r=froydnj

---
 build/mobile/robocop/Makefile.in | 14 --------------
 build/mobile/robocop/moz.build   |  9 +++++++--
 testing/mochitest/moz.build      |  6 ------
 3 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/build/mobile/robocop/Makefile.in b/build/mobile/robocop/Makefile.in
index e10c40fa287..b7f17f50a37 100644
--- a/build/mobile/robocop/Makefile.in
+++ b/build/mobile/robocop/Makefile.in
@@ -49,27 +49,13 @@ manifest_FLAGS += \
 
 ANDROID_MANIFEST_FILE := $(CURDIR)/AndroidManifest.xml
 
-# Install robocop configs and helper
-INSTALL_TARGETS += robocop
-robocop_TARGET  := export
-robocop_DEST    := $(CURDIR)
-robocop_FILES   := \
-  $(TESTPATH)/robocop.ini \
-  $(TESTPATH)/robocop_autophone.ini \
-  $(NULL)
-robocop-deps := $(notdir $(robocop_FILES))
-
 GARBAGE += \
   AndroidManifest.xml \
-  $(robocop-deps) \
-  $(testconstants-dep) \
   $(NULL)
 
 JAVAFILES += \
   $(java-harness) \
   $(java-tests) \
-  $(robocop-deps) \
-  $(testconstants-dep) \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk
diff --git a/build/mobile/robocop/moz.build b/build/mobile/robocop/moz.build
index 42d697ea49c..70c4e125b6c 100644
--- a/build/mobile/robocop/moz.build
+++ b/build/mobile/robocop/moz.build
@@ -19,7 +19,12 @@ main.add_classpathentry('harness', SRCDIR,
 main.add_classpathentry('src', TOPSRCDIR + '/mobile/android/base/tests',
     dstdir='src/org/mozilla/gecko/tests')
 
-TEST_HARNESS_FILES.testing.mochitest.tests.robocop += ['/mobile/android/base/tests/' + x for x in [
+base = '/mobile/android/base/tests/'
+TEST_HARNESS_FILES.testing.mochitest += [
+    base + 'robocop.ini',
+    base + 'robocop_autophone.ini',
+]
+TEST_HARNESS_FILES.testing.mochitest.tests.robocop += [base + x for x in [
     '*.html',
     '*.jpg',
     '*.mp4',
@@ -32,4 +37,4 @@ TEST_HARNESS_FILES.testing.mochitest.tests.robocop += ['/mobile/android/base/tes
     'test*.js',
 ]]
 # The ** below preserves directory structure.
-TEST_HARNESS_FILES.testing.mochitest.tests.robocop.reader_mode_pages += ['/mobile/android/base/tests/reader_mode_pages/**']
+TEST_HARNESS_FILES.testing.mochitest.tests.robocop.reader_mode_pages += [base + 'reader_mode_pages/**']
diff --git a/testing/mochitest/moz.build b/testing/mochitest/moz.build
index 36b0d981639..5c5bac2221a 100644
--- a/testing/mochitest/moz.build
+++ b/testing/mochitest/moz.build
@@ -70,12 +70,6 @@ TEST_HARNESS_FILES.testing.mochitest += [
     'server.js',
 ]
 
-if CONFIG['MOZ_BUILD_APP'] == 'mobile/android':
-    TEST_HARNESS_FILES.testing.mochitest += [
-        '/mobile/android/base/tests/robocop.ini',
-        '/mobile/android/base/tests/robocop_autophone.ini',
-    ]
-
 TEST_HARNESS_FILES.testing.mochitest.pywebsocket += [
     'pywebsocket/standalone.py',
 ]

From e3efe6eecef981c33383e20c711366f027b69b4a Mon Sep 17 00:00:00 2001
From: Nick Alexander <nalexander@mozilla.com>
Date: Thu, 30 Apr 2015 11:40:38 -0700
Subject: [PATCH 37/88] Backed out changeset 3232d253cf90 (bug 1159371)

---
 config/recurse.mk | 2 --
 1 file changed, 2 deletions(-)

diff --git a/config/recurse.mk b/config/recurse.mk
index bd22bbe7222..8a0a5a7bdf9 100644
--- a/config/recurse.mk
+++ b/config/recurse.mk
@@ -124,9 +124,7 @@ endef
 $(foreach subtier,$(filter-out compile,$(TIERS)),$(eval $(call CREATE_SUBTIER_TRAVERSAL_RULE,$(subtier))))
 
 ifndef TOPLEVEL_BUILD
-ifdef COMPILE_ENVIRONMENT
 libs:: target host
-endif # COMPILE_ENVIRONMENT
 endif
 
 endif # ifeq ($(NO_RECURSE_MAKELEVEL),$(MAKELEVEL))

From 19352a088117d6369d437f57e44a5f3a0bfdb265 Mon Sep 17 00:00:00 2001
From: Nick Alexander <nalexander@mozilla.com>
Date: Thu, 30 Apr 2015 11:40:41 -0700
Subject: [PATCH 38/88] Backed out changeset dcd206152465 (bug 1159371)

---
 configure.in                  | 26 ++++++++------------------
 mobile/android/base/moz.build |  4 ----
 mobile/android/confvars.sh    |  5 +----
 3 files changed, 9 insertions(+), 26 deletions(-)

diff --git a/configure.in b/configure.in
index ccacf5c39cd..e26147e485e 100644
--- a/configure.in
+++ b/configure.in
@@ -367,12 +367,6 @@ dnl ========================================================
 dnl AR_FLAGS set here so HOST_AR_FLAGS can be set correctly (see bug 538269)
 AR_FLAGS='crs $@'
 
-if test -z "$COMPILE_ENVIRONMENT"; then
-if test "$target" != "$host"; then
-    MOZ_CROSS_COMPILER
-fi
-fi # !COMPILE_ENVIRONMENT
-
 if test "$COMPILE_ENVIRONMENT"; then
 
 if test "$target" != "$host"; then
@@ -1971,7 +1965,7 @@ case "$target" in
             TARGET_COMPILER_ABI="ibmc"
             CC_VERSION=`lslpp -Lcq vac.C 2>/dev/null | awk -F: '{ print $3 }'`
             CXX_VERSION=`lslpp -Lcq vacpp.cmp.core 2>/dev/null | awk -F: '{ print $3 }'`
-        fi # COMPILE_ENVIRONMENT
+        fi
     fi
     case "${target_os}" in
     aix4.1*)
@@ -1980,7 +1974,7 @@ case "$target" in
     esac
     if test "$COMPILE_ENVIRONMENT"; then
         MOZ_CHECK_HEADERS(sys/inttypes.h)
-    fi # COMPILE_ENVIRONMENT
+    fi
     AC_DEFINE(NSCAP_DISABLE_DEBUG_PTR_TYPES)
     ;;
 
@@ -2107,9 +2101,7 @@ ia64*-hpux*)
         MOZ_SYNTH_PICO=1
     else
         _PLATFORM_DEFAULT_TOOLKIT=cairo-android
-        if test "$COMPILE_ENVIRONMENT"; then
-            MOZ_LINKER=1
-        fi
+        MOZ_LINKER=1
     fi
     TARGET_NSPR_MDCPUCFG='\"md/_linux.cfg\"'
 
@@ -2595,7 +2587,7 @@ if test -z "$COMPILE_ENVIRONMENT"; then
     SKIP_LIBRARY_CHECKS=1
 else
     MOZ_COMPILER_OPTS
-fi # COMPILE_ENVIRONMENT
+fi
 
 if test -z "$SKIP_COMPILER_CHECKS"; then
 dnl Checks for typedefs, structures, and compiler characteristics.
@@ -3927,9 +3919,7 @@ case "${target}" in
         NSS_DISABLE_DBM=1
         MOZ_THEME_FASTSTRIPE=1
         MOZ_TREE_FREETYPE=1
-        if test "$COMPILE_ENVIRONMENT"; then
-            MOZ_MEMORY=1
-        fi
+        MOZ_MEMORY=1
         MOZ_RAW=1
         ;;
 
@@ -5461,7 +5451,7 @@ if test -n "$MOZ_VPX" -a -z "$MOZ_NATIVE_LIBVPX"; then
         VPX_ASFLAGS="-f win32 -rnasm -pnasm -DPIC"
         VPX_X86_ASM=1
         dnl The encoder needs obj_int_extract to get asm offsets.
-      fi # COMPILE_ENVIRONMENT and others
+      fi
     ;;
     *:arm*)
       if test -n "$GNU_AS" ; then
@@ -5491,7 +5481,7 @@ if test -n "$MOZ_VPX" -a -z "$MOZ_NATIVE_LIBVPX"; then
 
     if test -n "$COMPILE_ENVIRONMENT" -a -n "$VPX_X86_ASM" -a -z "$VPX_AS"; then
       AC_MSG_ERROR([yasm is a required build tool for this architecture when webm is enabled. You may either install yasm or --disable-webm (which disables the WebM video format). See https://developer.mozilla.org/en/YASM for more details.])
-    fi # COMPILE_ENVIRONMENT and others
+    fi
 
     if test -z "$GNU_CC" -a -z "$INTEL_CC" -a -z "$CLANG_CC" ; then
       dnl We prefer to get asm offsets using inline assembler, which the above
@@ -7349,7 +7339,7 @@ if test -n "$COMPILE_ENVIRONMENT" -a -n "$USE_ELF_HACK"; then
             USE_ELF_HACK=
         fi
     fi
-fi # COMPILE_ENVIRONMENT and others.
+fi
 
 dnl ========================================================
 dnl = libstdc++ compatibility hacks
diff --git a/mobile/android/base/moz.build b/mobile/android/base/moz.build
index feb92072deb..5431a777c19 100644
--- a/mobile/android/base/moz.build
+++ b/mobile/android/base/moz.build
@@ -760,10 +760,6 @@ for var in ('ANDROID_PACKAGE_NAME', 'ANDROID_CPU_ARCH',
 # Mangle our package name to avoid Bug 750548.
 DEFINES['MANGLED_ANDROID_PACKAGE_NAME'] = CONFIG['ANDROID_PACKAGE_NAME'].replace('fennec', 'f3nn3c')
 DEFINES['MOZ_APP_ABI'] = CONFIG['TARGET_XPCOM_ABI']
-if not CONFIG['COMPILE_ENVIRONMENT']:
-    # These should really come from the included binaries, but that's not easy.
-    DEFINES['MOZ_APP_ABI'] = 'arm-eabi-gcc3' # Observe quote differences here ...
-    DEFINES['TARGET_XPCOM_ABI'] = '"arm-eabi-gcc3"' # ... and here.
 
 if '-march=armv7' in CONFIG['OS_CFLAGS']:
     DEFINES['MOZ_MIN_CPU_VERSION'] = 7
diff --git a/mobile/android/confvars.sh b/mobile/android/confvars.sh
index e3f68e90a4e..abed9362683 100644
--- a/mobile/android/confvars.sh
+++ b/mobile/android/confvars.sh
@@ -46,11 +46,8 @@ MOZ_APP_ID={aa3c5121-dab2-40e2-81ca-7ea25febc110}
 
 MOZ_APP_STATIC_INI=1
 
-# Enable on-demand decompression.  This requires a host compile toolchain to
-# build szip to use during packaging.
-if test "$COMPILE_ENVIRONMENT"; then
+# Enable on-demand decompression
 MOZ_ENABLE_SZIP=1
-fi
 
 # Enable navigator.mozPay
 MOZ_PAY=1

From 731c91b7a767fecb72571386b49717b22456f3d6 Mon Sep 17 00:00:00 2001
From: Kartikaya Gupta <kgupta@mozilla.com>
Date: Thu, 30 Apr 2015 14:45:50 -0400
Subject: [PATCH 39/88] Bug 1158617 - Don't dispatch a long-press after
 multiple fingers are down, even if their prevent-default status hasn't been
 resolved yet. r=bnicholson

---
 .../base/gfx/JavaPanZoomController.java       | 25 ++++++++++++++-----
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/mobile/android/base/gfx/JavaPanZoomController.java b/mobile/android/base/gfx/JavaPanZoomController.java
index d4399daaa34..d27eef80723 100644
--- a/mobile/android/base/gfx/JavaPanZoomController.java
+++ b/mobile/android/base/gfx/JavaPanZoomController.java
@@ -127,6 +127,8 @@ class JavaPanZoomController
     private boolean mDefaultPrevented;
     /* Whether longpress events are enabled, or suppressed by robocop tests. */
     private boolean isLongpressEnabled;
+    /* Whether longpress detection should be ignored */
+    private boolean mIgnoreLongPress;
 
     // Handler to be notified when overscroll occurs
     private Overscroll mOverscroll;
@@ -393,11 +395,22 @@ class JavaPanZoomController
     public void startingNewEventBlock(MotionEvent event, boolean waitingForTouchListeners) {
         checkMainThread();
         mSubscroller.cancel();
-        if (waitingForTouchListeners && (event.getAction() & MotionEvent.ACTION_MASK) == MotionEvent.ACTION_DOWN) {
-            // this is the first touch point going down, so we enter the pending state
-            // setting the state will kill any animations in progress, possibly leaving
-            // the page in overscroll
-            setState(PanZoomState.WAITING_LISTENERS);
+        mIgnoreLongPress = false;
+        if (waitingForTouchListeners) {
+            if ((event.getAction() & MotionEvent.ACTION_MASK) == MotionEvent.ACTION_DOWN) {
+                // this is the first touch point going down, so we enter the pending state
+                // setting the state will kill any animations in progress, possibly leaving
+                // the page in overscroll
+                setState(PanZoomState.WAITING_LISTENERS);
+            } else if ((event.getAction() & MotionEvent.ACTION_MASK) == MotionEvent.ACTION_POINTER_DOWN) {
+                // this is a second (or more) touch point going down, and we're waiting for
+                // the content listeners to respond. while we're waiting though we might end
+                // up triggering a long-press from the first touch point, which would be bad
+                // because from the user's point of view they are already in a multi-touch
+                // gesture. to prevent this from happening we set a flag that discards long-press
+                // gesture detections.
+                mIgnoreLongPress = true;
+            }
         }
     }
 
@@ -1357,7 +1370,7 @@ class JavaPanZoomController
 
     @Override
     public void onLongPress(MotionEvent motionEvent) {
-        if (!isLongpressEnabled) {
+        if (!isLongpressEnabled || mIgnoreLongPress) {
             return;
         }
 

From 4430403bc8614ef2663357cf060b35c62c837f3c Mon Sep 17 00:00:00 2001
From: Dave Townsend <dtownsend@oxymoronical.com>
Date: Tue, 7 Apr 2015 11:08:34 -0700
Subject: [PATCH 40/88] Bug 1151511: Implement the periodic check for unsigned
 add-ons. r=dveditz

---
 .../extensions/internal/XPIProvider.jsm       |  80 +++++-
 .../test/xpcshell/test_signed_verify.js       | 234 ++++++++++++++++++
 .../extensions/test/xpcshell/xpcshell.ini     |   1 +
 3 files changed, 310 insertions(+), 5 deletions(-)
 create mode 100644 toolkit/mozapps/extensions/test/xpcshell/test_signed_verify.js

diff --git a/toolkit/mozapps/extensions/internal/XPIProvider.jsm b/toolkit/mozapps/extensions/internal/XPIProvider.jsm
index 632c382372f..b99a372965e 100644
--- a/toolkit/mozapps/extensions/internal/XPIProvider.jsm
+++ b/toolkit/mozapps/extensions/internal/XPIProvider.jsm
@@ -129,6 +129,8 @@ const PREFIX_NS_EM                    = "http://www.mozilla.org/2004/em-rdf#";
 
 const TOOLKIT_ID                      = "toolkit@mozilla.org";
 
+const XPI_SIGNATURE_CHECK_PERIOD      = 24 * 60 * 60;
+
 // The value for this is in Makefile.in
 #expand const DB_SCHEMA                       = __MOZ_EXTENSIONS_DB_SCHEMA__;
 const NOTIFICATION_TOOLBOXPROCESS_LOADED      = "ToolboxProcessLoaded";
@@ -1359,6 +1361,22 @@ function verifyDirSignedState(aDir, aExpectedID) {
   return Promise.resolve(AddonManager.SIGNEDSTATE_MISSING);
 }
 
+/**
+ * Verifies that a bundle's contents are all correctly signed by an
+ * AMO-issued certificate
+ *
+ * @param  aBundle
+ *         the nsIFile for the bundle to check, either a directory or zip file
+ * @param  aExpectedID
+ *         the expected ID of the signature
+ * @return a Promise that resolves to an AddonManager.SIGNEDSTATE_* constant.
+ */
+function verifyBundleSignedState(aBundle, aExpectedID) {
+  if (aBundle.isFile())
+    return verifyZipSignedState(aBundle, aExpectedID);
+  return verifyDirSignedState(aBundle, aExpectedID);
+}
+
 /**
  * Replaces %...% strings in an addon url (update and updateInfo) with
  * appropriate values.
@@ -2344,6 +2362,12 @@ this.XPIProvider = {
 
       this.extensionsActive = true;
       this.runPhase = XPI_BEFORE_UI_STARTUP;
+
+      let timerManager = Cc["@mozilla.org/updates/timer-manager;1"].
+                         getService(Ci.nsIUpdateTimerManager);
+      timerManager.registerTimer("xpi-signature-verification", () => {
+        this.verifySignatures();
+      }, XPI_SIGNATURE_CHECK_PERIOD);
     }
     catch (e) {
       logger.error("startup failed", e);
@@ -2494,6 +2518,45 @@ this.XPIProvider = {
                                !XPIDatabase.writeAddonsList());
   },
 
+  /**
+   * Verifies that all installed add-ons are still correctly signed.
+   */
+  verifySignatures: function XPI_verifySignatures() {
+    XPIDatabase.getAddonList(addon => SIGNED_TYPES.has(addon.type), (addons) => {
+      Task.spawn(function*() {
+        let changes = {
+          enabled: [],
+          disabled: []
+        };
+
+        for (let addon of addons) {
+          // The add-on might have vanished, we'll catch that on the next startup
+          if (!addon._sourceBundle.exists())
+            continue;
+
+          let signedState = yield verifyBundleSignedState(addon._sourceBundle, addon.id);
+          if (signedState == addon.signedState)
+            continue;
+
+          addon.signedState = signedState;
+          AddonManagerPrivate.callAddonListeners("onPropertyChanged",
+                                                 createWrapper(addon),
+                                                 ["signedState"]);
+
+          let disabled = XPIProvider.updateAddonDisabledState(addon);
+          if (disabled !== undefined)
+            changes[disabled ? "disabled" : "enabled"].push(addon.id);
+        }
+
+        XPIDatabase.saveChanges();
+
+        Services.obs.notifyObservers(null, "xpi-signature-changed", JSON.stringify(changes));
+      }).then(null, err => {
+        logger.error("XPI_verifySignature: " + err);
+      })
+    });
+  },
+
   /**
    * Persists changes to XPIProvider.bootstrappedAddons to its store (a pref).
    */
@@ -4557,6 +4620,10 @@ this.XPIProvider = {
    * @param  aSoftDisabled
    *         Value for the softDisabled property. If undefined the value will
    *         not change. If true this will force userDisabled to be true
+   * @return a tri-state indicating the action taken for the add-on:
+   *           - undefined: The add-on did not change state
+   *           - true: The add-on because disabled
+   *           - false: The add-on became enabled
    * @throws if addon is not a DBAddonInternal
    */
   updateAddonDisabledState: function XPI_updateAddonDisabledState(aAddon,
@@ -4587,7 +4654,7 @@ this.XPIProvider = {
     if (aAddon.userDisabled == aUserDisabled &&
         aAddon.appDisabled == appDisabled &&
         aAddon.softDisabled == aSoftDisabled)
-      return;
+      return undefined;
 
     let wasDisabled = aAddon.disabled;
     let isDisabled = aUserDisabled || aSoftDisabled || appDisabled;
@@ -4607,21 +4674,22 @@ this.XPIProvider = {
       });
     }
 
+    let wrapper = createWrapper(aAddon);
+
     if (appDisabledChanged) {
       AddonManagerPrivate.callAddonListeners("onPropertyChanged",
-                                            aAddon,
-                                            ["appDisabled"]);
+                                             wrapper,
+                                             ["appDisabled"]);
     }
 
     // If the add-on is not visible or the add-on is not changing state then
     // there is no need to do anything else
     if (!aAddon.visible || (wasDisabled == isDisabled))
-      return;
+      return undefined;
 
     // Flag that active states in the database need to be updated on shutdown
     Services.prefs.setBoolPref(PREF_PENDING_OPERATIONS, true);
 
-    let wrapper = createWrapper(aAddon);
     // Have we just gone back to the current state?
     if (isDisabled != aAddon.active) {
       AddonManagerPrivate.callAddonListeners("onOperationCancelled", wrapper);
@@ -4673,6 +4741,8 @@ this.XPIProvider = {
     // Notify any other providers that a new theme has been enabled
     if (aAddon.type == "theme" && !isDisabled)
       AddonManagerPrivate.notifyAddonChanged(aAddon.id, aAddon.type, needsRestart);
+
+    return isDisabled;
   },
 
   /**
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_signed_verify.js b/toolkit/mozapps/extensions/test/xpcshell/test_signed_verify.js
new file mode 100644
index 00000000000..904a265596a
--- /dev/null
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_signed_verify.js
@@ -0,0 +1,234 @@
+// Enable signature checks for these tests
+Services.prefs.setBoolPref(PREF_XPI_SIGNATURES_REQUIRED, true);
+// Disable update security
+Services.prefs.setBoolPref(PREF_EM_CHECK_UPDATE_SECURITY, false);
+
+const DATA = "data/signing_checks/";
+const GOOD = [
+  ["signed_bootstrap_2.xpi", AddonManager.SIGNEDSTATE_SIGNED],
+  ["signed_nonbootstrap_2.xpi", AddonManager.SIGNEDSTATE_SIGNED]
+];
+const BAD = [
+  ["unsigned_bootstrap_2.xpi", AddonManager.SIGNEDSTATE_MISSING],
+  ["signed_bootstrap_badid_2.xpi", AddonManager.SIGNEDSTATE_BROKEN],
+  ["unsigned_nonbootstrap_2.xpi", AddonManager.SIGNEDSTATE_MISSING],
+  ["signed_nonbootstrap_badid_2.xpi", AddonManager.SIGNEDSTATE_BROKEN],
+];
+const ID = "test@tests.mozilla.org";
+
+const profileDir = gProfD.clone();
+profileDir.append("extensions");
+
+function verifySignatures() {
+  return new Promise(resolve => {
+    let observer = (subject, topic, data) => {
+      Services.obs.removeObserver(observer, "xpi-signature-changed");
+      resolve(JSON.parse(data));
+    }
+    Services.obs.addObserver(observer, "xpi-signature-changed", false);
+
+    do_print("Verifying signatures");
+    let XPIscope = Components.utils.import("resource://gre/modules/addons/XPIProvider.jsm");
+    XPIscope.XPIProvider.verifySignatures();
+  });
+}
+
+function run_test() {
+  createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "4", "4");
+
+  run_next_test();
+}
+
+function verify_no_change([startFile, startState], [endFile, endState]) {
+  add_task(function*() {
+    do_print("A switch from " + startFile + " to " + endFile + " should cause no change.");
+
+    // Install the first add-on
+    manuallyInstall(do_get_file(DATA + startFile), profileDir, ID);
+    startupManager();
+
+    let addon = yield promiseAddonByID(ID);
+    do_check_neq(addon, null);
+    let wasAppDisabled = addon.appDisabled;
+    do_check_neq(addon.appDisabled, addon.isActive);
+    do_check_eq(addon.pendingOperations, AddonManager.PENDING_NONE);
+    do_check_eq(addon.signedState, startState);
+
+    // Swap in the files from the next add-on
+    manuallyUninstall(profileDir, ID);
+    manuallyInstall(do_get_file(DATA + endFile), profileDir, ID);
+
+    let events = {
+      [ID]: []
+    };
+
+    if (startState != endState)
+      events[ID].unshift(["onPropertyChanged", ["signedState"]]);
+
+    prepare_test(events);
+
+    // Trigger the check
+    let changes = yield verifySignatures();
+    do_check_eq(changes.enabled.length, 0);
+    do_check_eq(changes.disabled.length, 0);
+
+    do_check_eq(addon.appDisabled, wasAppDisabled);
+    do_check_neq(addon.appDisabled, addon.isActive);
+    do_check_eq(addon.pendingOperations, AddonManager.PENDING_NONE);
+    do_check_eq(addon.signedState, endState);
+
+    // Remove the add-on and restart to let it go away
+    manuallyUninstall(profileDir, ID);
+    yield promiseRestartManager();
+    yield promiseShutdownManager();
+  });
+}
+
+function verify_enables([startFile, startState], [endFile, endState]) {
+  add_task(function*() {
+    do_print("A switch from " + startFile + " to " + endFile + " should enable the add-on.");
+
+    // Install the first add-on
+    manuallyInstall(do_get_file(DATA + startFile), profileDir, ID);
+    startupManager();
+
+    let addon = yield promiseAddonByID(ID);
+    do_check_neq(addon, null);
+    do_check_false(addon.isActive);
+    do_check_eq(addon.pendingOperations, AddonManager.PENDING_NONE);
+    do_check_eq(addon.signedState, startState);
+
+    // Swap in the files from the next add-on
+    manuallyUninstall(profileDir, ID);
+    manuallyInstall(do_get_file(DATA + endFile), profileDir, ID);
+
+    let needsRestart = hasFlag(addon.operationsRequiringRestart, AddonManager.OP_NEEDS_RESTART_ENABLE);
+    do_print(needsRestart);
+
+    let events = {};
+    if (!needsRestart) {
+      events[ID] = [
+        ["onPropertyChanged", ["appDisabled"]],
+        ["onEnabling", false],
+        "onEnabled"
+      ];
+    }
+    else {
+      events[ID] = [
+        ["onPropertyChanged", ["appDisabled"]],
+        "onEnabling"
+      ];
+    }
+
+    if (startState != endState)
+      events[ID].unshift(["onPropertyChanged", ["signedState"]]);
+
+    prepare_test(events);
+
+    // Trigger the check
+    let changes = yield verifySignatures();
+    do_check_eq(changes.enabled.length, 1);
+    do_check_eq(changes.enabled[0], ID);
+    do_check_eq(changes.disabled.length, 0);
+
+    do_check_false(addon.appDisabled);
+    if (needsRestart)
+      do_check_neq(addon.pendingOperations, AddonManager.PENDING_NONE);
+    else
+      do_check_true(addon.isActive);
+    do_check_eq(addon.signedState, endState);
+
+    ensure_test_completed();
+
+    // Remove the add-on and restart to let it go away
+    manuallyUninstall(profileDir, ID);
+    yield promiseRestartManager();
+    yield promiseShutdownManager();
+  });
+}
+
+function verify_disables([startFile, startState], [endFile, endState]) {
+  add_task(function*() {
+    do_print("A switch from " + startFile + " to " + endFile + " should disable the add-on.");
+
+    // Install the first add-on
+    manuallyInstall(do_get_file(DATA + startFile), profileDir, ID);
+    startupManager();
+
+    let addon = yield promiseAddonByID(ID);
+    do_check_neq(addon, null);
+    do_check_true(addon.isActive);
+    do_check_eq(addon.pendingOperations, AddonManager.PENDING_NONE);
+    do_check_eq(addon.signedState, startState);
+
+    let needsRestart = hasFlag(addon.operationsRequiringRestart, AddonManager.OP_NEEDS_RESTART_DISABLE);
+
+    // Swap in the files from the next add-on
+    manuallyUninstall(profileDir, ID);
+    manuallyInstall(do_get_file(DATA + endFile), profileDir, ID);
+
+    let events = {};
+    if (!needsRestart) {
+      events[ID] = [
+        ["onPropertyChanged", ["appDisabled"]],
+        ["onDisabling", false],
+        "onDisabled"
+      ];
+    }
+    else {
+      events[ID] = [
+        ["onPropertyChanged", ["appDisabled"]],
+        "onDisabling"
+      ];
+    }
+
+    if (startState != endState)
+      events[ID].unshift(["onPropertyChanged", ["signedState"]]);
+
+    prepare_test(events);
+
+    // Trigger the check
+    let changes = yield verifySignatures();
+    do_check_eq(changes.enabled.length, 0);
+    do_check_eq(changes.disabled.length, 1);
+    do_check_eq(changes.disabled[0], ID);
+
+    do_check_true(addon.appDisabled);
+    if (needsRestart)
+      do_check_neq(addon.pendingOperations, AddonManager.PENDING_NONE);
+    else
+      do_check_false(addon.isActive);
+    do_check_eq(addon.signedState, endState);
+
+    ensure_test_completed();
+
+    // Remove the add-on and restart to let it go away
+    manuallyUninstall(profileDir, ID);
+    yield promiseRestartManager();
+    yield promiseShutdownManager();
+  });
+}
+
+for (let start of GOOD) {
+  for (let end of BAD) {
+    verify_disables(start, end);
+  }
+}
+
+for (let start of BAD) {
+  for (let end of GOOD) {
+    verify_enables(start, end);
+  }
+}
+
+for (let start of GOOD) {
+  for (let end of GOOD.filter(f => f != start)) {
+    verify_no_change(start, end);
+  }
+}
+
+for (let start of BAD) {
+  for (let end of BAD.filter(f => f != start)) {
+    verify_no_change(start, end);
+  }
+}
diff --git a/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini b/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini
index 3113825e82f..a59e9e3b8d2 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini
+++ b/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini
@@ -22,6 +22,7 @@ skip-if = appname != "firefox"
 [test_provider_unsafe_access_shutdown.js]
 [test_provider_unsafe_access_startup.js]
 [test_shutdown.js]
+[test_signed_verify.js]
 [test_signed_inject.js]
 skip-if = true
 [test_signed_install.js]

From 6c229808d8f55d9aeb09f21b456db2bcd46867c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A3o=20Gottwald?= <dao@mozilla.com>
Date: Thu, 30 Apr 2015 21:17:39 +0200
Subject: [PATCH 41/88] Bug 1149702 - Display a note about add-ons that aren't
 properly signed in the add-ons manager. r=mossop

---
 modules/libpref/init/all.js                   |  1 +
 .../mozapps/extensions/extensions.properties  |  8 +++
 .../mozapps/extensions/content/extensions.js  | 12 ++++
 .../mozapps/extensions/content/extensions.xml | 13 +++++
 .../test/browser/browser_details.js           | 56 +++++++++++++++++++
 .../extensions/test/browser/browser_list.js   | 54 +++++++++++++++++-
 6 files changed, 141 insertions(+), 3 deletions(-)

diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
index 0f85943b79d..940b03f3861 100644
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -4118,6 +4118,7 @@ pref("browser.history.maxStateObjectSize", 655360);
 pref("xpinstall.whitelist.required", true);
 // Only Firefox requires add-on signatures
 pref("xpinstall.signatures.required", false);
+pref("xpinstall.signatures.infoURL", "https://wiki.mozilla.org/Addons/Extension_Signing");
 pref("extensions.alwaysUnpack", false);
 pref("extensions.minCompatiblePlatformVersion", "2.0");
 
diff --git a/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.properties b/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.properties
index 4b5b17da390..10c0f81c356 100644
--- a/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.properties
+++ b/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.properties
@@ -23,6 +23,10 @@ dateUpdated=Updated %S
 
 #LOCALIZATION NOTE (notification.incompatible) %1$S is the add-on name, %2$S is brand name, %3$S is application version
 notification.incompatible=%1$S is incompatible with %2$S %3$S.
+#LOCALIZATION NOTE (notification.unsigned, notification.unsignedAndDisabled) %1$S is the add-on name, %2$S is brand name
+notification.unsignedAndDisabled=%1$S could not be verified for use in %2$S and has been disabled.
+notification.unsigned=%1$S could not be verified for use in %2$S. Proceed with caution.
+notification.unsigned.link=More Information
 #LOCALIZATION NOTE (notification.blocked) %1$S is the add-on name
 notification.blocked=%1$S has been disabled due to security or stability issues.
 notification.blocked.link=More Information
@@ -74,6 +78,10 @@ installCancelled=Install cancelled
 
 #LOCALIZATION NOTE (details.notification.incompatible) %1$S is the add-on name, %2$S is brand name, %3$S is application version
 details.notification.incompatible=%1$S is incompatible with %2$S %3$S.
+#LOCALIZATION NOTE (details.notification.unsigned, details.notification.unsignedAndDisabled) %1$S is the add-on name, %2$S is brand name
+details.notification.unsignedAndDisabled=%1$S could not be verified for use in %2$S and has been disabled.
+details.notification.unsigned=%1$S could not be verified for use in %2$S. Proceed with caution.
+details.notification.unsigned.link=More Information
 #LOCALIZATION NOTE (details.notification.blocked) %1$S is the add-on name
 details.notification.blocked=%1$S has been disabled due to security or stability issues.
 details.notification.blocked.link=More Information
diff --git a/toolkit/mozapps/extensions/content/extensions.js b/toolkit/mozapps/extensions/content/extensions.js
index 288f3f972d3..0aeca0c35d3 100644
--- a/toolkit/mozapps/extensions/content/extensions.js
+++ b/toolkit/mozapps/extensions/content/extensions.js
@@ -3073,6 +3073,17 @@ var gDetailView = {
         errorLink.value = gStrings.ext.GetStringFromName("details.notification.blocked.link");
         errorLink.href = this._addon.blocklistURL;
         errorLink.hidden = false;
+      } else if (this._addon.signedState <= AddonManager.SIGNEDSTATE_MISSING) {
+        let msgType = this._addon.appDisabled ? "error" : "warning";
+        this.node.setAttribute("notification", msgType);
+        document.getElementById("detail-" + msgType).textContent = gStrings.ext.formatStringFromName(
+          "details.notification.unsigned" + (this._addon.appDisabled ? "AndDisabled" : ""),
+          [this._addon.name, gStrings.brandShortName], 2
+        );
+        var infoLink = document.getElementById("detail-" + msgType + "-link");
+        infoLink.value = gStrings.ext.GetStringFromName("details.notification.unsigned.link");
+        infoLink.href = Services.prefs.getCharPref("xpinstall.signatures.infoURL");
+        infoLink.hidden = false;
       } else if (!this._addon.isCompatible && (AddonManager.checkCompatibility ||
         (this._addon.blocklistState != Ci.nsIBlocklistService.STATE_SOFTBLOCKED))) {
         this.node.setAttribute("notification", "warning");
@@ -3337,6 +3348,7 @@ var gDetailView = {
     }
 
     if (aProperties.indexOf("appDisabled") != -1 ||
+        aProperties.indexOf("signedState") != -1 ||
         aProperties.indexOf("userDisabled") != -1)
       this.updateState();
   },
diff --git a/toolkit/mozapps/extensions/content/extensions.xml b/toolkit/mozapps/extensions/content/extensions.xml
index 62ad368905e..372459d3c7d 100644
--- a/toolkit/mozapps/extensions/content/extensions.xml
+++ b/toolkit/mozapps/extensions/content/extensions.xml
@@ -1247,6 +1247,18 @@
               this._errorLink.value = gStrings.ext.GetStringFromName("notification.blocked.link");
               this._errorLink.href = this.mAddon.blocklistURL;
               this._errorLink.hidden = false;
+            } else if (!isUpgrade &&
+                       this.mAddon.signedState <= AddonManager.SIGNEDSTATE_MISSING) {
+              this.setAttribute("notification", this.mAddon.appDisabled ? "error" : "warning");
+              let msg = this.mAddon.appDisabled ? this._error : this._warning;
+              msg.textContent = gStrings.ext.formatStringFromName(
+                "notification.unsigned" + (this.mAddon.appDisabled ? "AndDisabled" : ""),
+                [this.mAddon.name, gStrings.brandShortName], 2
+              );
+              let infoLink = this.mAddon.appDisabled ? this._errorLink : this._warningLink;
+              infoLink.value = gStrings.ext.GetStringFromName("notification.unsigned.link");
+              infoLink.href = Services.prefs.getCharPref("xpinstall.signatures.infoURL");
+              infoLink.hidden = false;
             } else if ((!isUpgrade && !this.mAddon.isCompatible) && (AddonManager.checkCompatibility
             || (this.mAddon.blocklistState != Ci.nsIBlocklistService.STATE_SOFTBLOCKED))) {
               this.setAttribute("notification", "warning");
@@ -1647,6 +1659,7 @@
         <parameter name="aProperties"/>
         <body><![CDATA[
           if (aProperties.indexOf("appDisabled") != -1 ||
+              aProperties.indexOf("signedState") != -1 ||
               aProperties.indexOf("userDisabled") != -1)
             this._updateState();
         ]]></body>
diff --git a/toolkit/mozapps/extensions/test/browser/browser_details.js b/toolkit/mozapps/extensions/test/browser/browser_details.js
index 3dd708dc0ff..4179b496ccf 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_details.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_details.js
@@ -143,6 +143,16 @@ function test() {
     blocklistURL: "http://example.com/addon8@tests.mozilla.org",
     name: "Test add-on 8",
     blocklistState: Ci.nsIBlocklistService.STATE_OUTDATED
+  }, {
+    id: "addon9@tests.mozilla.org",
+    name: "Test add-on 9",
+    signedState: AddonManager.SIGNEDSTATE_MISSING,
+  }, {
+    id: "addon10@tests.mozilla.org",
+    name: "Test add-on 10",
+    signedState: AddonManager.SIGNEDSTATE_MISSING,
+    isActive: false,
+    appDisabled: true,
   }, {
     id: "hotfix@tests.mozilla.org",
     name: "Test hotfix 1",
@@ -686,6 +696,52 @@ add_test(function() {
   });
 });
 
+// Opens and tests the details view for add-on 9
+add_test(function() {
+  open_details("addon9@tests.mozilla.org", "extension", function() {
+    is(get("detail-name").textContent, "Test add-on 9", "Name should be correct");
+
+    is_element_hidden(get("detail-prefs-btn"), "Preferences button should be hidden");
+    is_element_hidden(get("detail-enable-btn"), "Enable button should be hidden");
+    is_element_visible(get("detail-disable-btn"), "Disable button should be visible");
+    is_element_visible(get("detail-uninstall-btn"), "Remove button should be visible");
+
+    is_element_hidden(get("detail-error"), "Error message should be hidden");
+    is_element_hidden(get("detail-error-link"), "Error link should be hidden");
+    is_element_visible(get("detail-warning"), "Error message should be visible");
+    is(get("detail-warning").textContent, "Test add-on 9 could not be verified for use in " + gApp + ". Proceed with caution.", "Warning message should be correct");
+    is_element_visible(get("detail-warning-link"), "Warning link should be visible");
+    is(get("detail-warning-link").value, "More Information", "Warning link text should be correct");
+    is(get("detail-warning-link").href, Services.prefs.getCharPref("xpinstall.signatures.infoURL"), "Warning link should be correct");
+    is_element_hidden(get("detail-pending"), "Pending message should be hidden");
+
+    run_next_test();
+  });
+});
+
+// Opens and tests the details view for add-on 10
+add_test(function() {
+  open_details("addon10@tests.mozilla.org", "extension", function() {
+    is(get("detail-name").textContent, "Test add-on 10", "Name should be correct");
+
+    is_element_hidden(get("detail-prefs-btn"), "Preferences button should be hidden");
+    is_element_hidden(get("detail-enable-btn"), "Enable button should be hidden");
+    is_element_hidden(get("detail-disable-btn"), "Disable button should be hidden");
+    is_element_visible(get("detail-uninstall-btn"), "Remove button should be visible");
+
+    is_element_hidden(get("detail-warning"), "Warning message should be hidden");
+    is_element_hidden(get("detail-warning-link"), "Warning link should be hidden");
+    is_element_visible(get("detail-error"), "Error message should be visible");
+    is(get("detail-error").textContent, "Test add-on 10 could not be verified for use in " + gApp + " and has been disabled.", "Error message should be correct");
+    is_element_visible(get("detail-error-link"), "Error link should be visible");
+    is(get("detail-error-link").value, "More Information", "Error link text should be correct");
+    is(get("detail-error-link").href, Services.prefs.getCharPref("xpinstall.signatures.infoURL"), "Error link should be correct");
+    is_element_hidden(get("detail-pending"), "Pending message should be hidden");
+
+    run_next_test();
+  });
+});
+
 // Opens and tests the details view for hotfix 1
 add_test(function() {
   open_details("hotfix@tests.mozilla.org", "extension", function() {
diff --git a/toolkit/mozapps/extensions/test/browser/browser_list.js b/toolkit/mozapps/extensions/test/browser/browser_list.js
index fd6cfed7ee1..d9193f0bb69 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_list.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_list.js
@@ -96,6 +96,16 @@ function test() {
     blocklistURL: "http://example.com/addon9@tests.mozilla.org",
     name: "Test add-on 9",
     blocklistState: Ci.nsIBlocklistService.STATE_VULNERABLE_NO_UPDATE,
+  }, {
+    id: "addon10@tests.mozilla.org",
+    name: "Test add-on 10",
+    signedState: AddonManager.SIGNEDSTATE_MISSING,
+  }, {
+    id: "addon11@tests.mozilla.org",
+    name: "Test add-on 11",
+    signedState: AddonManager.SIGNEDSTATE_MISSING,
+    isActive: false,
+    appDisabled: true,
   }]);
 
   open_manager(null, function(aWindow) {
@@ -139,7 +149,7 @@ function get_class_node(parent, cls) {
 add_test(function() {
   gCategoryUtilities.openType("extension", function() {
     let items = get_test_items();
-    is(Object.keys(items).length, 9, "Should be nine add-ons installed");
+    is(Object.keys(items).length, 11, "Should be the right number of add-ons installed");
 
     info("Addon 1");
     let addon = items["Test add-on"];
@@ -387,6 +397,44 @@ add_test(function() {
     is(get_node(addon, "error-link").href, "http://example.com/addon9@tests.mozilla.org", "Error link should be correct");
     is_element_hidden(get_node(addon, "pending"), "Pending message should be hidden");
 
+    info("Addon 10");
+    addon = items["Test add-on 10"];
+    addon.parentNode.ensureElementIsVisible(addon);
+    is(get_node(addon, "name").value, "Test add-on 10", "Name should be correct");
+
+    is_element_hidden(get_node(addon, "preferences-btn"), "Preferences button should be hidden");
+    is_element_hidden(get_node(addon, "enable-btn"), "Enable button should be hidden");
+    is_element_visible(get_node(addon, "disable-btn"), "Disable button should be visible");
+    is_element_visible(get_node(addon, "remove-btn"), "Remove button should be visible");
+
+    is_element_visible(get_node(addon, "warning"), "Warning message should be visible");
+    is(get_node(addon, "warning").textContent, "Test add-on 10 could not be verified for use in " + gApp + ". Proceed with caution.", "Warning message should be correct");
+    is_element_visible(get_node(addon, "warning-link"), "Warning link should be visible");
+    is(get_node(addon, "warning-link").value, "More Information", "Warning link text should be correct");
+    is(get_node(addon, "warning-link").href, Services.prefs.getCharPref("xpinstall.signatures.infoURL"), "Warning link should be correct");
+    is_element_hidden(get_node(addon, "error"), "Error message should be hidden");
+    is_element_hidden(get_node(addon, "error-link"), "Error link should be hidden");
+    is_element_hidden(get_node(addon, "pending"), "Pending message should be hidden");
+
+    info("Addon 11");
+    addon = items["Test add-on 11"];
+    addon.parentNode.ensureElementIsVisible(addon);
+    is(get_node(addon, "name").value, "Test add-on 11", "Name should be correct");
+
+    is_element_hidden(get_node(addon, "preferences-btn"), "Preferences button should be hidden");
+    is_element_hidden(get_node(addon, "enable-btn"), "Enable button should be hidden");
+    is_element_hidden(get_node(addon, "disable-btn"), "Disable button should be hidden");
+    is_element_visible(get_node(addon, "remove-btn"), "Remove button should be visible");
+
+    is_element_hidden(get_node(addon, "warning"), "Warning message should be hidden");
+    is_element_hidden(get_node(addon, "warning-link"), "Warning link should be hidden");
+    is_element_visible(get_node(addon, "error"), "Error message should be visible");
+    is(get_node(addon, "error").textContent, "Test add-on 11 could not be verified for use in " + gApp + " and has been disabled.", "Error message should be correct");
+    is_element_visible(get_node(addon, "error-link"), "Error link should be visible");
+    is(get_node(addon, "error-link").value, "More Information", "Error link text should be correct");
+    is(get_node(addon, "error-link").href, Services.prefs.getCharPref("xpinstall.signatures.infoURL"), "Error link should be correct");
+    is_element_hidden(get_node(addon, "pending"), "Pending message should be hidden");
+
     run_next_test();
   });
 });
@@ -412,7 +460,7 @@ add_test(function() {
   gCategoryUtilities.openType("plugin", function() {
     gCategoryUtilities.openType("extension", function() {
       let items = get_test_items();
-      is(Object.keys(items).length, 9, "Should be nine add-ons installed");
+      is(Object.keys(items).length, 11, "Should be the right number of add-ons installed");
 
       info("Addon 1");
       let addon = items["Test add-on"];
@@ -616,7 +664,7 @@ add_test(function() {
   }]);
 
   let items = get_test_items();
-  is(Object.keys(items).length, 9, "Should be nine add-ons installed");
+  is(Object.keys(items).length, 11, "Should be the right number of add-ons installed");
 
   let addon = items["Test add-on replacement"];
   addon.parentNode.ensureElementIsVisible(addon);

From b477f3b85cddc88736c2bc8f886023a880ac4712 Mon Sep 17 00:00:00 2001
From: Mark Hammond <mhammond@skippinet.com.au>
Date: Wed, 29 Apr 2015 10:34:05 +1000
Subject: [PATCH 42/88] Bug 1090633 - fix some focus related oranges with
 chats. r=mixedpuppy From 27e7f9f198304d44a7a70b2f61518f1ff943651e Mon Sep 17
 00:00:00 2001 ---  .../base/content/test/chat/browser_chatwindow.js   | 82
 +++++++---------------  browser/base/content/test/chat/browser_focus.js    | 
 8 ++-  2 files changed, 31 insertions(+), 59 deletions(-)

---
 .../content/test/chat/browser_chatwindow.js   | 78 ++++++-------------
 .../base/content/test/chat/browser_focus.js   |  8 +-
 2 files changed, 29 insertions(+), 57 deletions(-)

diff --git a/browser/base/content/test/chat/browser_chatwindow.js b/browser/base/content/test/chat/browser_chatwindow.js
index b0665050dc5..2dcc897f982 100644
--- a/browser/base/content/test/chat/browser_chatwindow.js
+++ b/browser/base/content/test/chat/browser_chatwindow.js
@@ -6,30 +6,6 @@ Components.utils.import("resource://gre/modules/Promise.jsm", this);
 
 let chatbar = document.getElementById("pinnedchats");
 
-function waitForCondition(condition, errorMsg) {
-  let deferred = Promise.defer();
-  var tries = 0;
-  var interval = setInterval(function() {
-    if (tries >= 30) {
-      ok(false, errorMsg);
-      moveOn();
-    }
-    var conditionPassed;
-    try {
-      conditionPassed = condition();
-    } catch (e) {
-      ok(false, e + "\n" + e.stack);
-      conditionPassed = false;
-    }
-    if (conditionPassed) {
-      moveOn();
-    }
-    tries++;
-  }, 100);
-  var moveOn = function() { clearInterval(interval); deferred.resolve(); };
-  return deferred.promise;
-}
-
 add_chat_task(function* testOpenCloseChat() {
   let chatbox = yield promiseOpenChat("http://example.com");
   Assert.strictEqual(chatbox, chatbar.selectedChat);
@@ -115,7 +91,7 @@ add_chat_task(function* testSecondTopLevelWindow() {
   secondWindow.close();
 });
 
-// Test that chats are created in the correct window.
+// Test that findChromeWindowForChats() returns the expected window.
 add_chat_task(function* testChatWindowChooser() {
   let chat = yield promiseOpenChat("http://example.com");
   Assert.equal(numChatsInWindow(window), 1, "first window has the chat");
@@ -124,42 +100,34 @@ add_chat_task(function* testChatWindowChooser() {
   let secondWindow = OpenBrowserWindow();
   yield promiseOneEvent(secondWindow, "load");
   Assert.equal(secondWindow, Chat.findChromeWindowForChats(null), "Second window is the preferred chat window");
-  Assert.equal(numChatsInWindow(secondWindow), 0, "second window starts with no chats");
-  yield promiseOpenChat("http://example.com#2");
-  Assert.equal(numChatsInWindow(secondWindow), 1, "second window now has chats");
-  Assert.equal(numChatsInWindow(window), 1, "first window still has 1 chat");
-  chat.close();
 
-  // a bit heavy handed, but handy fixing bug 1090633
-  yield waitForCondition(function () !chat.parentNode, "chat has been detached");
-  Assert.equal(numChatsInWindow(window), 0, "first window now has no chats");
-  // now open another chat - it should still open in the second.
-  yield promiseOpenChat("http://example.com#3");
-  Assert.equal(numChatsInWindow(window), 0, "first window still has no chats");
-  Assert.equal(numChatsInWindow(secondWindow), 2, "second window has both chats");
+  // focus the first window, and check it will be selected for future chats.
+  // Bug 1090633 - there are lots of issues around focus, especially when the
+  // browser itself doesn't have focus. We can end up with
+  // Services.wm.getMostRecentWindow("navigator:browser") returning a different
+  // window than, say, Services.focus.activeWindow. But the focus manager isn't
+  // the point of this test.
+  // So we simply keep focusing the first window until it is reported as the
+  // most recent.
+  do {
+    dump("trying to force window to become the most recent.\n");
+    secondWindow.focus();
+    window.focus();
+    yield promiseWaitForFocus();
+  } while (Services.wm.getMostRecentWindow("navigator:browser") != window)
 
-  // focus the first window, and open yet another chat - it
-  // should open in the first window.
-  window.focus();
-  yield promiseWaitForFocus();
-  chat = yield promiseOpenChat("http://example.com#4");
-  Assert.equal(numChatsInWindow(window), 1, "first window got new chat");
-  chat.close();
-  Assert.equal(numChatsInWindow(window), 0, "first window has no chats");
+  Assert.equal(window, Chat.findChromeWindowForChats(null), "First window now the preferred chat window");
 
   let privateWindow = OpenBrowserWindow({private: true});
   yield promiseOneEvent(privateWindow, "load")
 
-  // open a last chat - the focused window can't accept
-  // chats (it's a private window), so the chat should open
-  // in the window that was selected before. This is known
-  // to be broken on Linux.
-  chat = yield promiseOpenChat("http://example.com#5");
-  let os = Services.appinfo.OS;
-  const BROKEN_WM_Z_ORDER = os != "WINNT" && os != "Darwin";
-  let fn = BROKEN_WM_Z_ORDER ? todo : ok;
-  fn(numChatsInWindow(window) == 1, "first window got the chat");
-  chat.close();
+  // The focused window can't accept chats (it's a private window), so the
+  // chat should open in the window that was selected before. This will be
+  // either window or secondWindow (linux may choose a different one) but the
+  // point is that the window is *not* the private one.
+  Assert.ok(Chat.findChromeWindowForChats(null) == window ||
+            Chat.findChromeWindowForChats(null) == secondWindow,
+            "Private window isn't selected for new chats.");
   privateWindow.close();
   secondWindow.close();
 });
diff --git a/browser/base/content/test/chat/browser_focus.js b/browser/base/content/test/chat/browser_focus.js
index 06118a7c8b6..58872d9a799 100644
--- a/browser/base/content/test/chat/browser_focus.js
+++ b/browser/base/content/test/chat/browser_focus.js
@@ -10,12 +10,16 @@ const CHAT_URL = "https://example.com/browser/browser/base/content/test/chat/cha
 // Is the currently opened tab focused?
 function isTabFocused() {
   let tabb = gBrowser.getBrowserForTab(gBrowser.selectedTab);
-  return Services.focus.focusedWindow == tabb.contentWindow;
+  // focus sucks in tests - our window may have lost focus.
+  let elt = Services.focus.getFocusedElementForWindow(window, false, {});
+  return elt == tabb;
 }
 
 // Is the specified chat focused?
 function isChatFocused(chat) {
-  return chat.chatbar._isChatFocused(chat);
+  // focus sucks in tests - our window may have lost focus.
+  let elt = Services.focus.getFocusedElementForWindow(window, false, {});
+  return elt == chat.content;
 }
 
 let chatbar = document.getElementById("pinnedchats");

From 6918e1150598997a406723fe4eb24e619a26afcf Mon Sep 17 00:00:00 2001
From: Dave Townsend <dtownsend@oxymoronical.com>
Date: Thu, 30 Apr 2015 13:17:32 -0700
Subject: [PATCH 43/88] Bug 1160263: Don't allow add-ons to override the
 periodic XPI signature check. r=rstrong

---
 toolkit/components/timermanager/nsUpdateTimerManager.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/toolkit/components/timermanager/nsUpdateTimerManager.js b/toolkit/components/timermanager/nsUpdateTimerManager.js
index 2f6041a795f..5a6ef5bf86b 100644
--- a/toolkit/components/timermanager/nsUpdateTimerManager.js
+++ b/toolkit/components/timermanager/nsUpdateTimerManager.js
@@ -292,6 +292,10 @@ TimerManager.prototype = {
    */
   registerTimer: function TM_registerTimer(id, callback, interval) {
     LOG("TimerManager:registerTimer - id: " + id);
+    if (id in this._timers && callback != this._timers[id].callback) {
+      LOG("TimerManager:registerTimer - Ignoring second registration for " + id);
+      return;
+    }
     let prefLastUpdate = PREF_APP_UPDATE_LASTUPDATETIME_FMT.replace(/%ID%/, id);
     // Initialize the last update time to 0 when the preference isn't set so
     // the timer will be notified soon after a new profile's first use.

From 127d61ddebdde2edb598f8fce0642ccd3c7f7ee2 Mon Sep 17 00:00:00 2001
From: Matthew Noorenberghe <mozilla@noorenberghe.ca>
Date: Thu, 30 Apr 2015 13:43:47 -0700
Subject: [PATCH 44/88] Bug 1134507 - Implement infopanel to promote Reader
 View when first available. r=jaws/Gijs

Based on a patch by Jared Wein (:jaws).
---
 browser/app/profile/firefox.js                |   1 +
 .../test/general/browser_readerMode.js        |  10 +++++++
 browser/components/uitour/UITour.jsm          |   6 ++++
 browser/modules/ReaderParent.jsm              |  27 ++++++++++++++++--
 browser/themes/linux/jar.mn                   |   1 +
 browser/themes/osx/jar.mn                     |   1 +
 browser/themes/shared/reader/reader-tour.png  | Bin 12172 -> 2672 bytes
 .../themes/shared/reader/reader-tour@2x.png   | Bin 0 -> 6426 bytes
 browser/themes/windows/jar.mn                 |   1 +
 testing/profiles/prefs_general.js             |   3 +-
 10 files changed, 46 insertions(+), 4 deletions(-)
 create mode 100644 browser/themes/shared/reader/reader-tour@2x.png

diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index 43d7c75f033..546d4233439 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -1900,6 +1900,7 @@ pref("browser.readinglist.sidebarEverOpened", false);
 pref("readinglist.scheduler.enabled", false);
 pref("readinglist.server", "https://readinglist.services.mozilla.com/v1");
 
+pref("browser.reader.detectedFirstArticle", false);
 // Don't limit how many nodes we care about on desktop:
 pref("reader.parse-node-limit", 0);
 
diff --git a/browser/base/content/test/general/browser_readerMode.js b/browser/base/content/test/general/browser_readerMode.js
index c8d1cc4b4ef..fb5d3bc89a7 100644
--- a/browser/base/content/test/general/browser_readerMode.js
+++ b/browser/base/content/test/general/browser_readerMode.js
@@ -32,19 +32,29 @@ add_task(function* test_reader_button() {
   TEST_PREFS.forEach(([name, value]) => {
     Services.prefs.setBoolPref(name, value);
   });
+  Services.prefs.setBoolPref("browser.reader.detectedFirstArticle", false);
 
   let tab = gBrowser.selectedTab = gBrowser.addTab();
   is_element_hidden(readerButton, "Reader mode button is not present on a new tab");
+  ok(!UITour.isInfoOnTarget(window, "readerMode-urlBar"),
+     "Info panel shouldn't appear without the reader mode button");
+  ok(!Services.prefs.getBoolPref("browser.reader.detectedFirstArticle"),
+     "Shouldn't have detected the first article");
 
   // Point tab to a test page that is reader-able.
   let url = TEST_PATH + "readerModeArticle.html";
   yield promiseTabLoadEvent(tab, url);
   yield promiseWaitForCondition(() => !readerButton.hidden);
   is_element_visible(readerButton, "Reader mode button is present on a reader-able page");
+  ok(UITour.isInfoOnTarget(window, "readerMode-urlBar"),
+     "Info panel should be anchored at the reader mode button");
+  ok(Services.prefs.getBoolPref("browser.reader.detectedFirstArticle"),
+     "Should have detected the first article");
 
   // Switch page into reader mode.
   readerButton.click();
   yield promiseTabLoadEvent(tab);
+  ok(!UITour.isInfoOnTarget(window, "readerMode-urlBar"), "Info panel should have closed");
 
   let readerUrl = gBrowser.selectedBrowser.currentURI.spec;
   ok(readerUrl.startsWith("about:reader"), "about:reader loaded after clicking reader mode button");
diff --git a/browser/components/uitour/UITour.jsm b/browser/components/uitour/UITour.jsm
index 3ffc81a74c2..e5807605064 100644
--- a/browser/components/uitour/UITour.jsm
+++ b/browser/components/uitour/UITour.jsm
@@ -1468,6 +1468,12 @@ this.UITour = {
                                        showInfoPanel.bind(this, this._correctAnchor(aAnchor.node)));
   },
 
+  isInfoOnTarget(aChromeWindow, aTargetName) {
+    let document = aChromeWindow.document;
+    let tooltip = document.getElementById("UITourTooltip");
+    return tooltip.getAttribute("targetName") == aTargetName && tooltip.state != "closed";
+  },
+
   hideInfo: function(aWindow) {
     let document = aWindow.document;
 
diff --git a/browser/modules/ReaderParent.jsm b/browser/modules/ReaderParent.jsm
index df4d4560f78..95a0f1b67d3 100644
--- a/browser/modules/ReaderParent.jsm
+++ b/browser/modules/ReaderParent.jsm
@@ -22,6 +22,7 @@ XPCOMUtils.defineLazyModuleGetter(this, "UITour", "resource:///modules/UITour.js
 const gStringBundle = Services.strings.createBundle("chrome://global/locale/aboutReader.properties");
 
 let ReaderParent = {
+  _readerModeInfoPanelOpen: false,
 
   MESSAGES: [
     "Reader:AddToList",
@@ -187,6 +188,20 @@ let ReaderParent = {
       command.setAttribute("hidden", !browser.isArticle);
       command.setAttribute("accesskey", gStringBundle.GetStringFromName("readerView.enter.accesskey"));
     }
+
+    let currentUriHost = browser.currentURI && browser.currentURI.asciiHost;
+    if (browser.isArticle &&
+        !Services.prefs.getBoolPref("browser.reader.detectedFirstArticle") &&
+        currentUriHost && !currentUriHost.endsWith("mozilla.org")) {
+      this.showReaderModeInfoPanel(browser);
+      Services.prefs.setBoolPref("browser.reader.detectedFirstArticle", true);
+      this._readerModeInfoPanelOpen = true;
+    } else if (this._readerModeInfoPanelOpen) {
+      if (UITour.isInfoOnTarget(win, "readerMode-urlBar")) {
+        UITour.hideInfo(win);
+      }
+      this._readerModeInfoPanelOpen = false;
+    }
   },
 
   forceShowReaderIcon: function(browser) {
@@ -228,10 +243,16 @@ let ReaderParent = {
     let targetPromise = UITour.getTarget(win, "readerMode-urlBar");
     targetPromise.then(target => {
       let browserBundle = Services.strings.createBundle("chrome://browser/locale/browser.properties");
+      let icon = "chrome://browser/skin/";
+      if (win.devicePixelRatio > 1) {
+        icon += "reader-tour@2x.png";
+      } else {
+        icon += "reader-tour.png";
+      }
       UITour.showInfo(win, browser.messageManager, target,
-                      browserBundle.GetStringFromName("readerView.promo.firstDetectedArticle.title"),
-                      browserBundle.GetStringFromName("readerView.promo.firstDetectedArticle.body"),
-                      "chrome://browser/skin/reader-tour.png");
+                      browserBundle.GetStringFromName("readingList.promo.firstUse.readerView.title"),
+                      browserBundle.GetStringFromName("readingList.promo.firstUse.readerView.body"),
+                      icon);
     });
   },
 
diff --git a/browser/themes/linux/jar.mn b/browser/themes/linux/jar.mn
index f2829392e15..051692eb97e 100644
--- a/browser/themes/linux/jar.mn
+++ b/browser/themes/linux/jar.mn
@@ -94,6 +94,7 @@ browser.jar:
   skin/classic/browser/tab-crashed.svg                      (../shared/incontent-icons/tab-crashed.svg)
   skin/classic/browser/welcome-back.svg                     (../shared/incontent-icons/welcome-back.svg)
   skin/classic/browser/reader-tour.png                      (../shared/reader/reader-tour.png)
+  skin/classic/browser/reader-tour@2x.png                   (../shared/reader/reader-tour@2x.png)
   skin/classic/browser/readerMode.svg                       (../shared/reader/readerMode.svg)
   skin/classic/browser/readinglist/icons.svg          (../shared/readinglist/icons.svg)
   skin/classic/browser/readinglist/readinglist-icon.svg (../shared/readinglist/readinglist-icon.svg)
diff --git a/browser/themes/osx/jar.mn b/browser/themes/osx/jar.mn
index f7645cf5c9c..9b7d1a67d4c 100644
--- a/browser/themes/osx/jar.mn
+++ b/browser/themes/osx/jar.mn
@@ -146,6 +146,7 @@ browser.jar:
   skin/classic/browser/tab-crashed.svg                (../shared/incontent-icons/tab-crashed.svg)
   skin/classic/browser/welcome-back.svg               (../shared/incontent-icons/welcome-back.svg)
   skin/classic/browser/reader-tour.png                (../shared/reader/reader-tour.png)
+  skin/classic/browser/reader-tour@2x.png             (../shared/reader/reader-tour@2x.png)
   skin/classic/browser/readerMode.svg                 (../shared/reader/readerMode.svg)
   skin/classic/browser/readinglist/icons.svg          (../shared/readinglist/icons.svg)
   skin/classic/browser/readinglist/readinglist-icon.svg (../shared/readinglist/readinglist-icon.svg)
diff --git a/browser/themes/shared/reader/reader-tour.png b/browser/themes/shared/reader/reader-tour.png
index 8e557e03821219211c19f65a90ca03d2f0b3b03f..be346b3847928f94d7a0bbca019f40d86edd0899 100644
GIT binary patch
literal 2672
zcmV-$3Xk=PP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px<DoI2^RA}DST6<6wM;aec9%2%ZND^|yXf9g0x~jXY%9Z|eRhPOyEYCYjUh=S1
zw2Ve`M)CA=CKrPdPCb=}$chR+5uz4IjG&-s;6MZx78Y2R_dbAifd%%(zGi0ox@UXV
zWnq_H0|~cPKc?yKnfZSGeck=__YFbJ+|L7I9>jbIF9>ftc;U8rxbK|!d19e_Azp)6
z4DmL^5{P9Gzr<LE>rh(|?(2*1_58U6_rZd^1@V5?<*Tvn;(@|}QFZI6j+AMQ)Hq24
znlc0PxQW&&w1z>MQq$JiCoj&uU9g?-@p&KK7YyN#pXK>e3GR(wy5wr!&27EUhbwg?
zZPb{|B!Ae@{k=$AdO@JdIrvm@Vr9N`*RS)$AMdRkO3G|iUHPt8ThcIW5Gswd(MXv|
z>9De{py>W*@L5YC0%n^CvfWo8esMe{B}}dw?;a=3)HAuR>5FHI{}7z+Xe%<iqKFI#
zwrpF^T)Sg-RSYLo$aHloBW)Vh8D-g*uf@S<zXS0qHZ6~toSbL^E{ceV_&pr8S_5UK
zD`mR+CD%l86NF=Nu6Kh4T^P8`63ci&YGIZrwp6OC(2-^unb@BA_>bVbUdNjDm<i#L
zTHiQ+DkTirvS8FG{zJjQr&ghD1?BWc66Y~ET^87v*}isUe)VnN_WD7CKu^-9%Q<-;
z<GJPgV@%2eKOp#C>7#!bX){$U);^vv+P0(13Ygg$L1gw=!08E}aJAO6#2_+kGzU#9
zr$cj#(J+^n4Bs6BvEXGi;el27R#koDDLrMTQk#?)EW-D`FcA(OU8~UWdL9bP>4XAz
zhgk%-zjj*s*=mI$j!D3GeExLkgvLaZ&E4WWH0Q7txJ3d@qQzNPb9QR<MtWbF<Rp>O
zxRFTZ#}X;L7z>)BtVnL$K&0{_tw`oY5U05l%jk;!KaJ{O|K$1&mTN<_73jICyjX<L
z!k#ab;|A(}S^3vcmN)S{ba}P$zjWzR1W8hqk)%up6RH0>0N-t-D9Zfs;lsb7MFh(>
zt?4WX2?<$Fk<>T@m<ymO+O%ueu9Z->h0~c5GM%8Ip`rY_B0LL?MpKPfCNF2Bzc4g3
z^h3y)nrj50Oy>0T^uOSZ&co5@zX6$+J9>ygZvcr$6G3!zG>D3da)@o)wt>^9PlFM~
z2&k&60tfzn0Bqd2(dj)~wrl|v<rPjz!1oKW|1_l*d{?Yk@d0E?J9<D<V-tWHavA&M
z_k-~8aF_eX$Hz~rg(F9f{0YkHXRigc+XV;(!sE^!P*+#Sya)+ZQc~g&1qB7*=+UE0
z-_4shgY4{VP+VN>uzzxLGSheW?%mUxl3XtT7P}gr_U01|Rn+Q~K&^#9WMm{7jcI|1
z$e+uZGF%QF_Cw@cB|ws-4DZkr%n0pt@4<(Wt`b215A+X!rlzJzK=oMVE=|y)q9T_G
zATwIKcJ1%5i(y@T{0a*TW2d{>p1}3%*Qc~)RPW9T;|>7?p-`A$yBeWCuL%T#BkmFq
zi^QP1x_S~MV#%x$kjZ4%@XqYXPT)lY0|QswC7@EOz@U6^5>WkY5>TmB5AoT09_#xo
zRw|Vx|1Tz_8`tr%gEyZg5Cki^?h<HiX$5!g+?fPaKbr(hMw1wCXjTG?)oS%)cL^|{
zrhuDng1ZFJa*zF@`Rp7BgcBpzT>>|5++fP~$j!}lNf6RRGH{mw9PA%#=Kvz$-y!Tc
z<}QJnXEos5xpR|%>YWK~G#HT?0IgPw>>1p>dl#%<zusj6csCAYS0Tm=Eh{VA{xT*s
z)y_JN{Q|8<%Rr$}pwVOqtXsDZK%d_w0$rV5CvZ^B!(~U#o`6QJaR|LmKj~g1Flrkc
z9Rq#RK4!Ph&dLS}2?=OK8E<vRjvWla>2~77hY$bJ{;-cG!`o<fJG+@%$92i83=0bb
zhrc=uh6abg<FdyfE-ud6hDLhLnl&IbH5FuJWB~YHaOlt>AQFkd{{8zIqE1Or)EJJl
zdfR)Wi~1ye7o8DM3@ezCa@9TFyLay-cN!5`y?QlsUSJ6z96Wds?Xcjv>^Y+;G*8fc
zv6o?Vbo2oZBG0owjrl>>cNJ2RGZMqY!;D*9TU$FNYHDggettgKv}u!7XsB{fUS7_$
zS5#CmUTSG+Dd2E8Rssk}18_rSc5_FXxOwwt3=VO6Om!j)hRoYt@Cco@A@uk6gRNV)
zGD6zkgGRSq*v^=vJplxyHFzon$}uH#0<?3bhj9GV+tHc$RjAg#PNxM|(bC*9NeGre
zJ-2=W0WU8vW;J^9<O!n%y<X2O2CNw&nczzKDUOUg3^$@fLa<h?t(mpx0wmDc(Fu4w
z9<yio`1pWZw{C%efB=w~n8?fnVVe+)j*K!SSOU<Ty758Ad%C#L!ks&Ju9~gL1hQ>W
zuL!iYwSm06JOD=(d6yt5DGB)d`!l1D&faJquo^(i`;{wKLh%{E)0N0vU_(R0zh=sm
z>^w<krIAXcjNb&$At38w7DFO1Fc2I&b__@)5@rcT=7(f}=Z<sOb(rr?U^lp_MUXu>
zJVHMdNXv`(q6Y}YeDVEazGwpOH;aq!^IzaWv$$v~ptgIwp5j}T{E~(aaeIeIDo?tQ
z^You5Gis~3JjLzXx9LY^WpoW+AkBSJS1y&w$*x{W$;$+I+0gnso&EAhgX1QB=snTr
zL~3g+ai%SXNNbBG(psX4l$IzWO|XGTYqlVjA8COgl1OfiAkrXEInAbw0=g%kMTg$t
z9q>Bz{Z?XM?sj5(`kv)`l8+WwH*#|y*FO2pS67o-#B#M{aHJKdpZs1XPvD7fd{@vT
zy)$m2sejjxrBBWeKrrEP9QQwq!{<}x2XGteb4C!w48TclEb&cg9PwGsC&Z4k`@+-j
zp6!tIn>wVjDmW+J!)w0hk4fqwpChF7hsp#4Wu}TG<Bulg!mOzzOoom9+ru_PlYz54
z8SPQT8Ga0LtY-7sr`?4^qe{Ap+jJhg3kzo=>BpMWn`bgJW0VF`IjpC28O_Q|6Np&z
zVpHVCCJ1elUP8%|%<h;Yb&9lpwNb6s8+AAH3wPtw)`FSLSh9(}0K(UIS$R$ENj+&c
z^l8YkEP*O#(dFJv6S9=H+F>)3tiZT^!TFxpv}WbS9u+A!kThA>+;%Z2C}=tM^JgT%
z=V*yVBeQtv(xo5p+PbopdUC`_naxm;!Ga!b(Y{JWBFYV;k!64dUY;l2w)?+>-{f|v
z3p&P(1A3CCRR&Tm=<U0`a^=e3qQEkqbMuH<{;}Ug_~97kyYL|L5x1o+b4aTfp-d*q
z&XY7StBo{?^1vqAY=+CZS!*N>3az2PQP_R$%P+tFGyVi22;2I6;wS!wf+gaO1$Z5=
z*GQ=4&}IJcRLYt4sT@vtL`1|YREOI_usi$;Ufbuy#~-#|s(53;7GN#;;j#~In{!{R
eOh;^11^pj`T?e|8rgpOc0000<MNUMnLSTYrNgGB0

literal 12172
zcmV;7FLTg|P)<h;3K|Lk000e1NJLTq003+N003$T1^@s6SwFPU00001b5ch_0Itp)
z=>PyPMoC0LRCodHeF=OOMYew5EjKs&0ttZtA|NP&g18|dqoM+W2#Cv{=Q1v%v%Hx%
zqdxa#6dfIB9Cg&Ejxq?$2yUndsHlJ&ZiomXipai0LbjXb-rV<nr~5ROo127$u>9Z8
z1C^?-I(4e*e08c$S9dxd>;GT!#C1LXI<DA?#bv}_#}yx%mrV`wQ0cYyGf}L0?5mkJ
z`)-1xX~t%n{CaKHJ*3hN4e(%hQv1a?KJ9h#5|y#v%Fi@OK`>*cn+j%KrVj~<AKbz0
zl=ek|&{zRttbt{kZ>HIQUYnE%s9G>EpK(KJ6Hv-iIZPikiXYs;=m`4|9~2lL%Hq>z
zo|dt`0?0AwxKzoi{CIGp;ALKXtUzk4^)+T22ZeNC2cvNlBvrh|1ckxx#PMk@SALCk
zJQ|yTnP8a!G0hNh;`p@k#)Aj;18;Ry$bqIrKq&wU4Eq&8U|c8NxpU{_U;gfQU5`8d
zq@D!@9gfV*&gzzy9BSwDdz1YhPm;%q`2#+$*Mn9fwXxc0trd;LYOABsSarC%W=C0R
z=?|MXZ(6zht1rKuI%V>AA1+w18*L~^HAoXU1~biaGjJjhKqZ|RdcEIbor(Lc0Yh*@
zKq)8+41r2QU>xYsp+jim0}md5(!jx|=eKElQbx$%7HG6qzhfoUk+PjTix+>h?CW>$
zzU`*>Kl$X7Vzf)JG*mlj1=6%cwb}!=RJPW@F{TDd+u*Xrv|5t_r2r8m3Awqs$&;U-
zaYp|WPM**vExCtJ?8TKIE3K}L7FX4l?W&6I*b=VYu)3sX?UwS$uI*Kk(zT`0;%|3^
zcb7$Ck=}VJS)Ee+8SO&8%(fv<=HZ!1oeER^9dnX>ZL^X*8JR&}lGo$zcUBBk6t3R3
z;@fXu_}wqAeChMgKPPwu%nXSv?|=cP%5=5S$_dJ6&^<<%Jh2|+D@Z}4gZJHk|4|oT
ze)ZM)Ihg~3J`VvU#dcTM)@&$?Y+Aar>dVKMmcH}B_V7+DNHIwDNKCFoY37j{;O&_1
z3*FQ&XUGX{gU5GF_aD|K*&9;pjn>9u+e<1|yua|he~v$Q<hzhkWdyZ41y7et6F9cq
z>a;%rGl3#t=8`7>A&+tLBTqba+yxg;`0u=o(BZh2K9vBZ<wZ5iA757d!qo4}R=Y|E
zg9{SVKFonA_2rN^7PD%dCDTm1<p#*C8;iO+IIeAS);;}m#`n!jIw3#gOF<PW+Z~P+
zFIx2RBO}i`{k58!8Uj~|z*sHM1kMDl)%P~HvuM1vh%z;p%b#gY$>0h7&oh%w9CyJ*
zx8$Y<3)whl^>@2#*1xj4;?-Lg?fgg<Pg)15js-cOc)c+Ji>(kOENK?^H|Env&^!WD
zTZ??Bp7M!c=LcmFcgHF(KO&>s)kmd|KekP<7rYrxIIFBCTK35&pFMuYpp$3dGK`?W
z5j@@VxW^GR6F6M94z)I53KR#ZVATU^<jB$Oo|rWG-VV7L{lMpeHy2yBt9sQPpA|j%
z+S>Ast~DuG94kRkrBgJmiY<_+XjM4lm=D11u^cHUpYpr)ks&f2+2m1jfIB?hpYrsO
zyem)251x?X_lkt#aAfP_kNoAjTW-8@8Q2v#f@dz3>{Y9S)|!CDgQfeFEPLpDC=dvQ
zKKN|ORegIOc~!vc@zutx*peMp-~Il>?T;<kRJ9E}dn}38pc;0;fxdM4^E#kF#vZg#
zpH2h;b5Rnh_<_0vk!7`rwSGL<x}0h?C(cXu2B!>dcg3mglLumdr3uH@Y~A_Jd1sw|
z*H>SCRRlH#PM1nroPwsn#Yt`cWorSZU~vXAsOQI}k0Isai!bi@=+n<Wlamr`hihwd
zd8G7DUlu*`$g+}UVo}T_)v+XIP#nhXf}o1mn^vcstRw<KKoXH#rgc=7Q%AF9S#_3A
z&2!`pEC{uE^3*mr9F>#Q5m}zfXsqg)XP*7_uYYmnXSl9Fprz?jse7BbM54Imlz3px
zlSdg`0vXh?;4&ycAx@d`^6Nv-9W~<KBzS(6xQm^=u42yExm%{x*_Xg5dkkZeYY8SW
z$oJx!fUsOF#wi!eVj3D2B?DyBAyN0;t>@I2#`wcQrWO{eATd^=<>@|(_}>0Gr(DxJ
z<EreSFNhUAwshs{DSeOZ_AuB98m)~%_cpzE+h<GLSHKd1#U(I=kb)&JW%=rLf9zh^
zZaA(zTPmVu*DTn6*Q-C4uXhKJ0wL3ZkYx_JR2~5$(K<*17V=CmG))<_4muSirgaIG
z4E#`D#w0FU=6+|QRVN>O=5h(p+Jyp1^G3G2t5;6aVJNk>m4ts7GiumXI6c{lO9f7s
z$W{T(oI`B0IYh7+C_^nvttvG?KR;{b`c0ENx6K(q{e8Z@dU@aJ>u-Q_!J{DC9x*jV
zfgVh}7?d50*>)lf{6Q-~9s%^ifNk&2=Ho8nL4A)Z9x}*NhkyplaX#g?!!83y7uXoQ
zM<s&DEA|631qoi;?K7r*u(=on;9psFZRGK9O5Qm#D=E+;E6^h&Igm5%q6uTxt^Q%&
z*I$243sd3*vL}(|v@mu?+w9sL76a>>V9~Nt`}OPBX3>&mGxE|yhezP)O<GwtZPeV&
z&oFHdn6;s74uOgnLQLh-N~kbeRE*Q#Aq7LdItUX5YCZ+gB5E14Z>U>K8L00w01zN3
zld@$Ja2$5KYLQZ3`z56|a55jzN10gczYW}rtIL;dsi^&WNQdNs8A-m-h|y!lMXMw4
zfAGQkoSZ6%v8ElN&5v3Fn1aRb6D;mmTn2fgnL29Jc^ziXe(UAzl%zcFSASYk^yu$D
z+WDS17UEFQVlY_NW)Nq>83(P*;{Jqx9uIyJI0rxvd`g1hB~Xa{sO&{K(*i86A=dIC
zrX@&yni7bhGLPjk@*z#jWd~^8f*sN%u`a}Hm-X~o3i*R|&^NJs$fqoX#XGBZeZDpP
z(Xh^`Lo$-Q$%B6Ov-8^I7c7}OdltQ4hpS#pfz6_p0LGCqux=f&Xjud+Gvv=ItEr7#
zw`j-2KQG?>rF4_sQUIU}d+%TgMR7bNjgh3T8EBQYP^z%u2bIV)l}rG5;U&0WW-Jzn
zm?U|^WT!<w_}TMX#N-m-xb!+!Nh@c&Bw8HiiBu3iW}=?%ZT7^lnNffB?r7PpHQ{&8
z>yk1gJJ}aH?zsLVe16{t^WS@qXOa|T_p5$P!Fxr`1&p0TkKJWZ9gI|*s%L$)c<BsU
z7Qvb@Z`(~%SC;)Cy-+KmWl?{emyS+wZSP}LjO-y$HuoHYDi%c-9SS8-Tt*3q%y3BN
z1c-s3J)-g?2D>fa-gB5oa0MiaGOlGwLw&|nB|#C3W!mYXOfpUYwnbpsABSwO(e5`Y
zqmP~)6*bk9R+h~9f88@q%MN-|PC8}qs7+foy|rZV;&RktE9@x)(+nhy?W;z9?rFRc
zCZ~wJ96pE4rO;gl;SHv(+fg*NT}JAWTn2yt@%DS3SYEn96h}bBB_>iJSpu1$7C}&#
zoxo2zA%0^HQH^GO-M`!lPJMO7RhBB7P3Ua^_e9M%>yyVr#{=!^(Un&wiOm%O1N+3b
z)w6W(^PIlQ-boABv09#PSxG4$jc)&F+hkt~kF>^~GyL4Q-g;{@gq9)DgEU=!1<-D@
zk)L}D82K33L*2K;!N7I;ck8!I>|U5ZoKD5W#k(H9^V6b5$hV2sC5pyiRG}=<G?hS5
zT*Vjw%4r996>z%f>fYPZZA(yDn%A6IK~&(hzcN$^Qt-^lVmc?R&$=Y$E5Z5(whiUZ
zI;Y)VGlSlwqHtt$VVlfR6%`dFV4<~{piu%R?w-kui$p|=*;^tngIbrk@Grdj`k4T0
z7<3+c_S=$acYa><i3sGtNmQ~2o`Nb>6;7b+rPAh;d}rhYO2J~5CuY~zx*`}q$m7aI
zT8Wm*Kq8NMtvnjL^&v_7Oy@`2r>Du*#oN(Jh-IRo%&m{K)|WP|7#{=uV!`%1xawqw
z`~{0we1AJ?(mA8<xI*zni29^n_kfLyhG=g9qaYJ3bu>Z~CS2NS<cJXyQSSM4TlLq!
zn7@6N49;08WYC&s52$bgD8qCVO3M<3pj={JoA*YnXppN&*2h>)Ff>gSkQ6kgnWyFK
zhgqgd*VyedXNyD3)BedA&_45IU-NNEv&SW1IhF?g>8s1uOkP<!m8Cs8wLfRZ%deh>
zG*>5rMqRRJlteu@37XqAFgHZ;V2Nd=q@<+1weW-K=|O+SmT<JR-;DJ)$$gg0GPdgg
zBT^xP%bs|6NYiPMb%YZa40N?gwwH$lx@Efok}W@|VD^^Fqbi%;qkzMS0H=Wa6`O`w
zclb<eE@SfZ9*#tL;z^=@y!+055eQj6MB<#FeTn&unvH-svFNDqRzjYuu`v)MS|D#3
zz%pxn#i|h<Q;+PB=FjWaz5D4aR(?Bc#q#A`7TFOEc2AMf7&)41kcB;C;Ltc!nlJ$i
z&0qBSFL02XkHgQ}U%b2ht}tGBLB2f*#+;nGKk$NSg2vfNtD;CQH(Y8sD;ZcOOQj5%
zQo!Ss`O!T2h1V%3Ks8LG9@DNvgL;}~%rdseSY+^;ve`cR9l@!QSO(fsBCjlah@}iD
zG3G?l6@inJ%RT!|qUCa&)E4vfC<}E?eRbo#Tf@<^px^6%^vP!)1P85*%Ob6edS$Jq
z@Mw~OU{MH#5imB8JbK)?c71#GyaH+K^)=<Q@C<7M(?T4CC>~e3#4zSR-MA@92d#r*
zWe%ACl&B!#MZRlQPC1^=2pfB*;1D>b`A_pDmK<BIfX6!cC$kC+Y*)zyjyy8a5KBJH
zMaSm$-&npW!*1PfpLIy+RyY!i-u7wHpZSosAS><YY13aEf)WMI1Wb*DHR}-z8zKcu
zfuis<gp7^5N}p|?op$V|vPemX=hj|rD@SK16u?1IF{%h!mXZ!smBlhus`9WNXFW+|
zK%No-A-^cjX^UmL;j0Iy*E&fU(_&ap1R$b2PI>OV70T%qI!)V?#odo=%VAqO$#@^8
z-mT=L4gOQo+YKqBg<76PV+wCNF)!Gsye3-SwPS}fwr<_J3&ruSK0CQbXDSbIV<xD8
zQ9T4roQ<a@O+Fc59m9u@_kLOYH+DjFFM|N9%v`4hy<efSNCb=07}OJ!w9z@SB-I!z
zIYi)0*#tx<f`UWVNCXoFWzs2JYnkw)jKnrM`}t2nlLGu;A30hfH$hF={8}UyM_vkZ
zNS9FenhBIEz>qz9&ep%+t*=OGz?VAj!%uz-26aA6D<dv@fTtLT8Ul>W3K)A$VX_>K
z9e?31Ec<dt)who=-@QTxsHV>$k#umfJV7y9F5qJF$SfDmIDj2XBwk{nj*?Wa>~B;w
zg34f8%NeUhvTgF%rOs@H@`Ru5a1w*K2WeX6=srg)=LFK_*jyf+>N0*^HFN?|u1qjz
zl4(B1zoopU>c!O+FOa22m(J(+>C-0@Nz=vW3`htT>oioL`xb%X3`j*tU$}7L=u=KP
zWg=FcSU6H!0&mIQM^M-#IVx+CFOGq2QR@ea01ukP8Cbm6*jNV|(qe)-DmU5Z$wW0z
zadFApxw+Zbft5GZTpIP=5Kh~A`c2dn^9YzOgWS8)5i)9PYv*7v`AGjnt*3$L2`8Lz
z+Gn4Awgn<f5zG@10#;|X8jEzD9+;rf%97rG`|VRPJMsWp9mbz7_E`hIIdkS**QQOI
zn<0t1CML8lF1iG(4q%Ba%(N~phx80Ht17Gh<@5QDLi#6aWes4}3ga=%Ac*AyPqi|>
zGN;R;3tGI>K>#(dOsuPC&z`A%zrQE0f1>@M0jyl1H{X17Fhr|`(aNa*dIl8_7`sCz
z=Ccw*V9pzJE`iWQyeR&OT0;Y;4m$M`$caDoP~&l%hzCKzqHD<@fE9Ks9O>5hDY0KP
z5J(F2#*0hbg4D{Wf8tZe$`S!)f)*GwXi%ot<1N@Pz5Ge2s{yQFbUsEPgGLe$mJ6B*
zm}W9ht;_$|qmK=TFfDT%_$kr)8t9Ibd`OMAFcTv&IkRN~!{CC}wOiLACc{tZ{ilIY
za;O)itA&|X<{FHNo&u#{iIoL|!6Wxy7k`p$Y5?wi#_6Y@&Z8=VMjRMiu#lDl#!4n=
z{$az0WkE<9mP9RY^_a5po`V$%g>X)5&Y#w6ifxpXl(=Wb4N1n!L{@4lPvPnkeu>X2
zFX!{d#))IV1aF+Fky36w4?pzq*+=&|`k!D+XkkQBiC}3Ebg#eu`u-H646PL}TfWTt
z_~VbQB}<lAJ9g~A8EsU+%FfQVdLP}}I`PC4t>cb6u2le}{M+xi-P*Q|?{hXy$;rvq
zkW+_Pmt1m*we;(y*0ib9to0k#H(e1NoN$+3dZ{&HIDLnfQTxL7eNa=uQVUaDTrily
zLf!|^wd6F*T)%$(jRoxrCLrA^v}WxZYtp1i*7D`co0NyoJ6M-rez|pYucMpfZH!_1
zjOo@3FTBtgOTx1L{rg*s7ca&$*XA9?;nfN2xyjEZl({#Vkx1m*<WTa3;MG$PzN61m
z4>_u8%))$GnOWWTrjfnj`S8OJt;ZgJ%&M+t+fCEjwQH@r?z+qRj|u-_jT$wo=?V>S
zgu{D&CjpN#tfVB)$;1R@S=+a7w>ECvXyFS2!jzVlW_9e?G2v2aN?EmPl~r6^EX%u@
z-`uo6;OF7GtZ+`O)+M460p>C%2a^k%+h8JoE`JaG?V&_PjplLhd2Y&cco8^ioj3Zt
zMtS$9@R!&A(rTO6wn<hh|Ni^$x6U}@3~TI|u@;Wy;<o<!BFO*gr=Qj@Xl4!`x$((}
zVxVAYobb3wmq(A+=gn$nd-d4YtzTz7`u9ic<u@neU;p}-wdAWM&8d=*mlGhyN99d~
zu7`KEZomC@>w@tY;H?6m{miq8Itd$WK_>d>KjxTY_(;pe!4#tw#zK-Jsm#2I+b4SN
zx#t>P2I0n9XP$Yc^~D!oSTknKNZ1w?{p_>PS`Yp8AyHsLCT6171VfVgDw<sF`N1Xf
zl~-QblM$C1KYqMeRAGn0CcVnIs;zc8bm-7r{N6OZBohyjuYmD_g-XguZ>7cb-S^*#
zC)k((dWK!QcC|LF-_RJFwQ18Pi~Hc<!93Kqi9jkbjq^CXo){HJf!DYtao-4Fnp9a?
zX}$c)%UZ2oJa(+J1lB7#a2ZD(bre@N6A!m>6EJ2fP@3K+z!oi9<Tli30(v)<-w^Mj
zPZqg=DL-Qg&T~FISF&oW`Kn;l1&s2PpZ8gR_`@F>YQo;H8Z1391#oh*(UM}Jz)2hr
znD$7S^twec%(_MO8mhE(>C!qy1c7chg8<^(vx=ovMlIg(YMELay~F`052z!@yij1x
zyaS!i0yWfTLx5Sl>)%(}xpQYd5m=wCf`UDV|2>ZAAv|0bd9$iiR#s-c{Bqr;i_01F
z>1r!jv?K<-U*c^8y*l0imq*L-)?382F7oW&z1zC`p1ZY~dhxvz?`_oeuUBC|WI*=~
zu51kg#@V?qMCDMq@pSUZCtJt#ImXS_8O?j0PMtcr`FO#y9$+jiEiDzmm}XsqMUWVi
zii(P?C!TmhygV*{@VKnmvuDdG1bH~FAAkH&mP@G+_e1*=mwiAlaWBX>s1i~<V7iMl
zX5ejpgJ>s|=w$Mkh6;;6gTwa-Eu5gZRl9fVZXI#N5puI?y6yxf5v8Z63s7odv>*be
zH{|pJdBgp~4?kFwCr`Ep4jgEmfByM$+Cg5t>|#xsf=`5?f9i;s?F5rreimrT*_Si`
zD{|^99=w!vJYZU&fN|Qk2rvqwa^eBQy9+FGY24Ux0@(N8e=o;YZb5<s4_0+KGy$us
zsuJ(dtTJ`#RJkN*mtA(5fJ`vS%b539df03NmlQ}!2&5@{f2W}f0;XVTEX^ul3Q&B^
zw{{vn%W0zLT#k6e)F?H>z2VW4k^-hnVz_e85tQ<npz&Oiw+=i6zV7<#1QZ2~{0bTm
zd-vtUUEAK57%%MZLVd1o3YNz89<Q(+1+5mpK~#pLk`!jPgibo~B<r=;UTaC!gmq3j
z>7+XO+$R+<yoOh&OfO8(3Og2BTQ+Zz`#w5V1k79-37QF_$~cfQ`cV7MJMVBmP#j#a
z*blWZrcDN-TN|y3Zo*+?9t&GSNAx(tqE*DZ<EAVgn9>Q@zGJ(YT`x_~a?rp*ZayuH
zfq-#us;W*57%P~dwJT_6-G1BcQiq---F#gh2^eJ_OhWs7^H=om#3n9s$Y}PDg)Z~%
z(%q}g!e*x-?XpWRYt&7iH*cPG{SDV!)2B~wRQwe`zaru6SJ0aBY6%*jRnaPQa&z#z
z3SQY?d8@#>1fAd?Y{1Yz&RoSn!E$w@7N!LnvqBW!+&8&7xno@J79{AZ|LRx2vL1Tq
zp%&D(t6X%^MONRwed{Tc%4Hx33{8<~X>^Eq67$XSZ)8I8-i?9zd=|#1$0RyK3{6dl
z&6_tj)%;$SW2IOJMml>5K~ume%mhmSd+DW@zBu-nV_CLObjpBJWcKp@sHuUQ4RMLW
zcNVQN=Z&ccmhzdPX<lQo2^#mrZ@&4)n)a`0b(TeZ)!Vw~?t84)Uw_@2`{vxn#MLX?
z*8_(g+jp#lP!lj>L2QKh+{Gjo2v~@t_uY5jdMK^o&B3hMM0)U`!PdR^-fQ8t?<P3y
zV%|vKcH3=@f~A5KG`(&rHkZer|NQ52pT^~oR!Uhsp}Fn$+pIZr=QJg%UODgkT1wD$
zY|=j`afT2u1x>+{*mSCyrp3{X=XxN&1W_5Td>%{1-f0<?nj(5(yg}y4JI@-a94d*F
znVD(z?%mts%;$R@c!AX|Gv$(>mdg7n9yQTb-??k2HGKGRYt5Q9R+lbaO!fxT6DCZM
zn``z7pUbmWu3RZknrU_FEwWD|MvSoVX(re8Z%7~y3VQYGg;QHotqpP4&j(<YIJ_p}
z#R&8id9Ol);q4U-sg9S(>pB*O>j>_;KZ1wWYJhPT^Jt3qXdD=4c4=9uoQiM{QR8o}
z)v)u;C3AV?MBy_qzJNo^dhx{<<*4k=JMXlzvv_!pt~nE{p?0{0H^tLXUFKsFu0lj`
z)Vg#zR4Z%LOJv2!!;d`t8ch}HRwDre4;l#`2bqzcflpoF$u9B^1W@Kc%;hmVCtDnl
zQ6opmk=6~@-(Y2CWbSpJ_602VY0H)^?<3Oh1S@EDbZ_oqEYLt^hMET-e2@o!^-pn;
z`G187+Qf+yWddbnX2_F@Yp=c5%FAo<Eoie<L!-Fm)>~$xqFR^<m<yWeC9)9~&<q*G
z!VuRK6&KCN8&v-%euIU36ZfbdJ?zIi7+*a~Nlmfz<b+nkRbYP;R+shDrcL8(0cv6O
zmP7Wzv@q?Hf<}Z1TJ_y`-~Er)UKX{n){2`_Do-^?T!yc^j=uxmI0ch~a&z4{SL>Co
z`e7BVOTp3=PC;`UN;Gu{qI!!wM-*=n8{!*q5(?a!2Qk4}Z+eM*mvC3nF6->G&rawi
z@^K4~wywVVYPZ+)QU?qeAl~YR4I8ZdynKuIU-Sy;?ePHEJa2R>?uP^>TeN+L_5<+@
zkWYN+9qKQp(_rd=)|iFqvPjgc*R5Ii3gSbKXju&EhR1i1_i}t?jZd=+3k%)iTW`Hp
z(tIVHZ|f2q270QL#h|j?O8Y5+M?PNxEP`ZOm;&YQUu-@RV9Y0zE{POU)$^#H&td?T
zEId?570ScgL?;Xc>yLl@qjZ-RbJI;Xxm|znz4xpI3l_+$1l-RQEXrb_>;pk)C-%sr
zkNg>J@s(%=EFoCzPa?nwmbs5n2v(q)s!f|Wy~s+30x4LughYTTSlqK_&YUTG*A-V>
zQOC;exZ@5P%3+5cme8^e1ZdFf${TOI@mqAn1dPT)4C+xLz{sSasg+S!6%IxJjzKVe
zNDvjOVCkcMJ}!CevB$)+2-Yhvzapm>e8dxPWwfyQ^XJRG7hmDl`zW0Z8t<>cLVgUd
zqTdhsJk3zRsPhIbtRcH+J_DT(zCOjHs#JvZS7*QZpB?gYud2p(68|)B=|76fEBE~3
zl=+2gX%j-2r-Xw5CfQLCB9uX?E>UC1L?zU6SeU2NO444dmS0fA2PGp_mHudD*k2v4
zNIE<}EBD0*ZyQgLXmyBVcR%vfm;add!WOLV-lKbT&zL>ssgvof;0-Mg9SsuSI_7H&
zyUQyo&id7zQ)5Y?Dt{=Y#urG6T0ZP&>?8XGnbKE@(Y*UvbO@1O$+A^hC*R?f{_C%8
zVc53}>vvU~6n|=s<y(4k|Gt+(0$;k}y)KWU2wXj919?L6_hFi^N~Si6IG07SvU7)@
z_2kB##pBWg-t6n!bQ(Hn>ax25gUt^uivTKCUIjr_{^cgQmJ-e#=W}}wFSGgaE&iQL
z{RkKN`6dZlCOJS$nqPtQqoBG9Yhf8SoN`R4UBS#yu6VEn3)O4yoAT<bcfPP-x#i38
zS<!0WhUM#n?|<=C-r)YncH>^gM?NHc=~~VaaWs`O@Movh{AJ;H%PcFm$_i%ISROz6
z!Hzhje~VMT&W1j)3~)**LB%nfjDs2EVO9GprqF@?X}+h1bsICFXLf20KMZ=!)i;8J
zegQ44$^8pF_0AHRXA%KpAmRcT;>s7EpLYFkuDRyv0jX(+-88h%QTHw0^@V^Y;Gkmy
zfCD1GYQ}*mxu7DSq+fbd(5VFSD|o^~S;*(-{P>kOQf0Nrswwwb<;B%jT5fePFT~pq
z0qfz}A3t~NEc|j;yKbmc?XxPw0V`aZ{Kw~J&VT#3W4c~><&_qmM7UPQ+X7O4PFB!L
z&91hx+Eya2v69ki-Ouas;M4u~BETRqkF&}J1^JT4LXH7f3OE2eA}g4F@v()&Qv4q4
z%N48s`Qr5H8^Nf{p;{I7ZI6*+;)rvgDPrf$;GH{r_Rh<H`P)9(=_#H1v<dcod_~3U
zHMAVgG9Q)@A0|C#9%B!_k;~8S@vjp4F=P2h?ihH@C4=Sst}Z^(FF|^PH2+iw{=BRN
z3{d3x`5i>$u?`K?&+qNx;R2SY9&IvHF78`+=93?N_vCM0{CtrW$^wwEl9aR>%O8Z|
z{jnc6ZZAK(Uyp*$1$lYx+qaiDtwxU?E%#?Nk!aOb&%W{U&S+A(6-uwQl0p~<UU^Hx
zB4qc?wkUSiFMV+ONAP59=ok8fB<2?S$G(%7AY!nP@!qKRcNC@va!abCyN~X6*neVq
z=60ed@@ioOt3kjhzA4gWQLT(79G-B&m|H6&wKZ)+zR(Bf7Th7AP!g8{_k))FU_WLW
ztqk49vaqK;u@;s)#Cl*AzW8axmSs62$_@o+p#UowsI@|Akw`GPdeY*}f4_Flckf$S
z9l}<2ex;SwE^KAxhpn8v3M(TwY-MCs-ZgE`JS>^93opFTnl)>d^}quUh`^`c{CM`t
ztwm+_A02SoU_aO=k}QKp|M}%oj?*pIvBY(r<(SM<ewH`3cbi}r%(K|k$&;_c?{yO>
zb2%huqhO(2R$0b-L#kXV&9i>(+DOk{N3ZPNtJkoCRA264Y5vHoKUREeTNC#raM6-#
z`D?knKwktn2T*Y?P|hxTpa}k|8pkStqwk!dv`i9tm6(<~D97nOk+cFH>xW&n6|b!>
zUJI8mW(DCeBxfKXZ3WPmpuN-JgQTmrZmT%9ux$|UaMWzwRa~^axOC@RU#$4z%BNqS
zZ>3~bTPax)OaLs0urMzsgnU&SZIEa|v~H4ob(;xvTJmJTNCP;kp8aJ1(Sr#+(z@Q<
zFZ<X0d(_KTuYG>xnWxPFhiP4$k~XxqMsS&!_9!B8x#l{(kv$LV#2&A4`ResIAJwJs
z{3>jsm%q2|mVbX&_M=u3XM-Tf{v_Z~!yxocHf(;<l?=F+FI-EZea$2t46RQE>Hei`
zHLMS?nO_4%`5=eGW*z?EURYD(v#Kh*Rz*p`D&88j!n=Z2+3t{4U6BN51mg!^FodNu
zqsq!?gMj@j1xsmKPQ(hPM6i_F08sh*eP3FZ?zLPwlr$~YXlG`Jyn&S$c6t&kQOeHp
zs<j2#>0_`I(j!!_P#q5ToceKeWY>@Xxu>!ClDgOAW1uRqG07)S<*77I2+}qcmCS6D
zn%oh8y}WwF8(aSCqix|`Tn4}g1Aw)u68TwIA!MkNVQ1KUOcOY^!aC}ZFyADzuIbQ_
zhfWQh03|NHm2ghNyZu(hZa5zRuDm1(fcdRR4ZsGkKRIfJGGJZl01kU!dS=uLrbR4Y
zs8)cH<&PGF38dD}b_p6Ml3JBG7|8bkWZZUe7%MOC{I{+d{(Nj7)nm^cc@Ez5=lul1
z((^((a~y4>&IZbbXgPaBioEV;+#oqK!k8`L%PtuAb9^PbA`5?G<dtFh4|GiR*+=7)
z%-P04vP<#<3Ek6lM#_hjF+AC;paA8S<q>st#!5crfLNFRsH8dp-imq6wt`sRLYWb<
zoK#p*X4|lpi9Iey_BiZsxK1Tt04tP&F(xCx*`Rz{7Ted4JrgJfmc^pB{x}g`usBwf
zW5O;TS9lM>;-5W!=IMX@3SezU&voyLzu#)qvSiHo!AZ~@+B0*FT6hhtddH6K^M{@_
zY;0!Gmpra(`r!Xrx@&HP%e{8PUeoP?!UUu`mB}=W!uG@*@uCdq!r23aS6pW-Mcmsk
z1E4OOn6j5kjh!}7EM<^Qg+u?cCna%D!$mNaOJ3AULP$nP%c51`IvD`No26>lX9B^S
zUV4gRUEIgSt))Qlz=FBAu@BNmY1Q+=d4<;>pBL-}tYR;}`o@1>e#ylPQGxrGS{5fg
zr{G>$7Wjmk3z*i6k7Hka{&^W5{C#rrfKx{E?`B=xBjeQRt18|pi{j`3!xy5G*+q{4
z1w}v!+^1x~4rn%~t!y%j3y(}LOEK*(@~K4Dr%ZdEQ?Px_HVC#&T=sCH0$v~5<*k9A
zOC5?ssc_%193~+Sq(`w|(Tzuc;jH)pY=Bk<nVe9ZSaee5#DdoZ3;&`_gNMX6VO{T^
zS9smPg5-Y8n!o6?2hTb4G(PK6Cxf1$y726&2uHkEq#D>OW`l{1khC#&IQH(mc|{$&
z9KO6y?>@tFL%!4rN2Cp1u(5LCrf{Un=A=S7I4T=8_$Lu1fiwqCuTN((`RHNt!`<SA
zp^UN2XlUE@Djloi?B<?FYhqpQO|p~$EI|it$ln3OkbNi%;NC0%O9}wIBzTd2c!XYn
z#rwJd!0^NMq#RxTP+cYn`$S;Ws$2`iGz8R3F6cDz`26HvWdH2z75^C6zwfh1CIU+>
zi<;PLYAImx4Y-ZI{_4!l>6zJ|^grQ*ky%(C&+nQxbVX6kXDdr;N);QoGHZz?up795
z8e|6Zb_f4uW(yDiO27lYbPRdJ&AKjlNR#yTfN80ZSn5MAZ^HE}7f4zjSP|WJE^l5g
zldwJlBzqCtN8tPyS6+ICN^DmEbIQQ)fl%}%I}i&jz38xqj?7N#$Yqe0<$$FQ1}#hX
zElO6vklcG}O~9x^2J7v&=I+2*>brw}cE%|F0nc*}OF2C+<Sm}NA-qO71RpBL=_r*V
zdxpkX{s@}p^N*5p)2BO4rP|99(vAQEP4GkpL5JKZt_hOlBSY>WaLqgj5ep<Zlt<T{
zRxkXhFC9aDwQRX&e~^dBwPJQ3Tv$oE&N`>V1BI#nY&saP%zER-bB3PA2fn&z#e*e!
zV)f<{I=4^6`Wyl^$88-`R=!n5mp=u6RHwr~r~G?bX0pExo$ZgeR((16r44_Ml3RB+
z0>Nd6d7O77rcKvfGL1ZY8G=Q~a%c~pU@EBOPn2dJiM%ArVcR4qUaX9_0pi5K;+SS%
zgq#j?nN`B-F!{9n^DgX`IxY!sz4GMenP(^c5`X6YQ?QuJAT2B2$!HO1dm7hHG(S!R
z8gH)Y+Na<>iS$pu{&wQw1#M2pwP#~_boU=V-0`RB-|t?7eFLzFg6z)gJ)8Eyy-|j;
zn5F_rT)wDh>X3QjRwJ#-N3sqnFpSAB-YGal9)+kdW5&>$G+XvUXMdC>+_LyLE?+t$
z?`E8(9u5JX9p#nlE*(GiO2>7lCm8R(Q<^S=EdmSmY5x06D#Nriy}2fEe32(*=IpnJ
z4?pXSyRe`8xNLm1rSgl>Z*F<GC|t{#XOn3a*avKv+5w7s6|0L=u!5z)$r4Cj?nw@q
z3G+C11ql4KFsY+DL0LRdTonM=wA1p>KetQDxv2plk3KD5y>3RoBfI?>_oNDxd7#Vj
z5vY9z3o`Z?JTF>_ID5<>oqc}Vl+_zHZ<;$`$k5}{lLNV((*y0V>6Lj-VVb{u_WFv|
zqA)odbb4X#Rm`G9&TjS6Bm>~d%_|D2aLLp9+^aB$%zW9CkjFZ79?knV+1Joj=GlK)
z&z^`pX=mHWzq)s3&zWZx+;d7na^EDM$6Hz*DVaQF%5R6CKIC~kFxCCa1WV5dDM5qN
z!InjKr&?AwQ7y`&rJ2^oea+n4LNn*Sb@tHHPQNWB;FS}REftZnnLk#%bnX1@bM0l$
z)I4gdwQ=u}H1c%0axIB<0H7{qqGnvn5{NPa5oer^17mxKlq+7MBO8$rp#87j8NILV
zm3cXq!FCv+hYuf@eZOkTkQ4hqhA*9}Rq4sQdV&N?EsLTE*gjKh1I7+frUFM5(HT*P
zMEAC2Jf_ch<K2Zf9NwW|WB{`jJl6JbH2n64@SLj`?tG~nJGg8A^!o@<q9s$D4Jca(
z&4~kJAfwI*1yBY-At^v|;rtK_Mq7+Q_nnY4=z?zP<GW<|b8#uBl$(pozPjNz*W5g9
z+O&<xBS<Dt<_)oe)ha-t9U;5(dewR{<!Yez6gci}v^D}K;0+i&xXsg(rvAEH=fY7~
zX2@sp&**+%T)pPyHRZ3}`3e5aFadLvh&fwd0eZu%F@<PaJVPMG{YY_SImx_sz`E#&
zv@XBtopnL4>_9KvlCZzLpO0<ax%;!f{^{=f|Mr)^tVWiC#Pd`=ZKp+<R>gkS?<+F*
zh4vR<?32o-^)RiV(b^O^7d-yqv#Br4y!!AioyOp=*U?cC+KndwYf5X@eYvyhi-(t%
zzPn^+Wr@2SDtJ`3YlTRe`I=UN4lp_aaE#`^?YNx51M-tkge7&&!($MzO5gFwD6(PO
z&i5zYar0j%J^l0s<SRgo)m2xZXuq^71*+A-f^55EOzcPE;5C?gn*tXPUeXg!J=5>(
zb4Op+J~#VBwL10>8i?%(M=Q65qg%1>ZTg|OdiDG*Rm=aqs%(vbq*kbdAy@`Lr{)FQ
zj_R7;t7n$KdqIl7FhAsLmzUy8#}j`6h}CFK+e^bMKmYXOsh3_jeja||kWK`_F@r9B
z1WSQ3!9w=_A-ALZN4zUl+hI)56gagyf~NbN0vN#GA_@Kdsb@|(w*T>Gw9UymAtUI|
zhH6!oE1ZA1wFZi&GZ2ZzqBXT1oNM6Io;bq@cs)J@F9ROD)T>J&`~#vpic7xwe#MIS
z?!5ixcRpOOfM22^C=6;zdaWQ4C<a;*!6NM!tFlGgKNAkXWN78Iwx`Ra37mqbmZ!0T
z>Boz#8Mod&@uaTZdmMw`itL`2lF}(T;LX9`MrPe63HN`s{8Nx+72%EW?pCc|_v4Dm
zPd@#@)Txv4?xO5J1VgRI1V}+*OmH+1APq?Fe^LeR|CZ{uz;?|LZ*>H~1W?mvtYCYw
z|AqSW>6=m5xpP{(_U+T!=I5scyj~xE@40;Irp=|BH?AxFdc}(Jj}|WE3!AEJwGfR7
zh6xPw^_q2f%~%1_7+D974i;cKLTz8cQ{XfvKne`g=C$%@tTHHD<ua{`WvmJ}0Z<?m
zIP;o(TE~>b^g$tWU<aiGPNUinRl3F|7@9U?^6^^v87CrB*$RLeD=-?H;A&mUJ!nAb
zpc)#WmLH5*`(%QUC~X48ekxC*KC7Zt`5G%|dL18A7V{1nQso>n9ZJv<?V|}ue45pi
zFFtK5Tmd0ZLuoBze8`bG$V0Ak4Rk2J&*rt6HmjSUG2gs4(`KDRGX1}6db*MHI!c}Z
O0000<MNUMnLSTaO$<s3c

diff --git a/browser/themes/shared/reader/reader-tour@2x.png b/browser/themes/shared/reader/reader-tour@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..1a60d93ca9311f8bf9e0ce3f6f175370a69f648e
GIT binary patch
literal 6426
zcmV+#8Rh1QP)<h;3K|Lk000e1NJLTq003YB003YJ1^@s6;+S_h00001b5ch_0Itp)
z=>Py2)Ja4^RCwC$T?trJW%s|NqAV&ZYN#o$m0MX~^_Y+OS%1r2D?ud1<<Z0~%Ow>>
z&0H{4QXs~^n*Y?#&(thS%`JgMLEKRUVHoy(XNF<+`@iRM-r=1)!#+cx+~+yZUFOcc
zGw1idzjNO09ENH9n-$6nl(eWq$URn+G;eiKHYl?tC)S*_=A;cLHk{a^*qIPpyr&I*
z2fo`1pF;!Fya|*}6y6FIXM+lD$B6?c9XaXDNf%CD<iv@SZUS+_&${BhojB=$&#=d5
zw#Ij~c;3MfD!mP*@Q$cxP-;(3`f$>plUFzy#K{m&UgP9-PKKepj@O2AGMJNBIT?W8
z?ZruV1O`B9kMC-OHRQPhgDAcwmPT7tdM7Nspzwa23<QO)TC--#xy#qQqMk~QrsNjg
z%9krLr7CSnnMS8jYIGW{j@9W{R;SYHG;+08S)x?S3gxQYwEU6>(UR0tSFYdq*2mY^
z-PYE27=qUy0ReCwDKJ`7G-dTXDBd3Fp(`pK6f<P;vSpKQ+<CAst)L{TOs!S1X4=$R
zoi@8fo^b!E`2T$O>~+W5@-ipRNL^6t+G4F}^(+BlO7R`B1Ohz_nlNF)=sS;N4-}QD
z^M#62Xmr}lQjPRUfigKbO&;-MjP&@%TlsrF56<2+{(Qz)eU2r~>vBlq@xdP%U(CCf
z?d=tj|6M>-(T|r><e?9972;H>x=^OlYJ|@%RcXp%lhc1&`SsURk<$7hO*uYGKv*Ha
zw#I5s6yF#A^r0iiJabCQ;<P$o5q(M3rAXBUpzQUL`Myk$*o~J!@pN9uu?WwFLOv(o
z3n<@vT+Q)1pCtQBT&&LG=u1msp(~WDv#*AQZ?m(rdmU?H52VDl0%~e<rM?w<9uCOw
zP~wN2JacvhaJgOs+?Fm?7yl-aUhH=)WuAe;X+>A2biMN9T}>X-;BaE|LxTH(nBrsN
zB6XIAvmxYn$W$8H-?#7kIXXJNfi<EV(xe?_tgV_-sc(x_8jRkcU3>S=E|RNr$RFkm
zr|xd9BIeUenXB~*5>d*gl^B4>WDlPOppfGrNx2B`H3Fvs;6cYE3$CQd!)Tf+RcXsE
zTn+I?YU+)4svXi&%f<`>;d)Z)!MODwF=E8X#O(Y~9a0VOdU%%n!CR+O76}!iR}`&G
z10{3vL%d7HvBX8c55UiY@G~JuK@@m`n$h7$$;@*}va2Pk3d7GCZOK<(t(t=FZx5^u
zwvEv?(3E3~{0W}TAaEfS8m*d8&7*v!<jtScJdKo2D~BkPD3n&NUL+OAfs$!P*M#@d
zU<C+(0H6^FyMsyYV1J-?!f)pMTphT;*uHSa2A+Lmq9mexYy4sG1A7CHiqo^NfZpMc
z<j6I0@LmiQuP^B)O0!;sN`~Y3X^aTZ;ky1fzI-pD?llPnsX^r35+iy7T1+TbXX|T2
zu{?3&#EJh#+wdY%QtN*j1j6^$$oIgN{T3}+Hi2^~bIVITtGkgQzt_SP%>)Q&g(y9c
zQm%or<IB&35<b=MK}6KGK*2EqMF=7dE^R{uhWkHHrN3|uKE4o@sddVOKOJ3&l++Cy
zac%x75NKoD4ok($JN^7-aU8EgW2X5&s_1`>N<3{u^(CGv-K1303Kc5d=vrL)v45Q5
zbs7l%nS$Cu*EnKx;F_qSM$G*yXG3n8Mh^c8THY6fL$_i}y*t{v1_yzropxw!Upe;k
z=_SzOgddtE*T|r8WW@79!V*u>h+a{Y^7IN#_@w-pI_H(n?dfBK&$&JMeh>wWh^koz
zph#Q{3_fk74<&pCjX~l$M@Gf$$F7YY{{#pxP_)A<pEI`JTJ))trJB5#jwH@8=6VUG
z{CF25PN(U_q(X_p<50L`Q9{Kr>_rF&Ei?eM7y&@hQ2<3tRBedJQamJfAvz)D40il=
zM>=W{n?SrBd*u9=kDfTWoG2ekiH#^>hJmpSpbcxhp<&h21yxdMWfKJli9a?F{vK{0
zfad{%YX%@tfYG4RG)CJBVx$cWbw!PUZVuv7L*Ek8Q8#1*YfHA8t<cZ6LvN@5F2B9A
zRM@nSE>I>JDc*qR5dc&C9u)VfK?xTn7%QEYfTx1Jsm};l!Wtu}8MKYi*9eKB=R~=x
zAm@@xiHD~P3BSD)yT4yVR%m4j5Qx#WK|jCG(&fu16CXdZSe3_@d?Dx4t{<&<J-^c>
z-b6_!%KSk*)j;4neQxR=a!m*jh)6(L1~r0mZ4JC6y1gQHyPhGx!<M6<J9F;BDja|4
zf(6v<E#?=H<G|qb96EI9J1UJ<s?};)g<7M@Dpkd2$y9L$A~h}9GSyRaNRCV$YwEZ@
zk|kAAzm+<cnHHH!QwBQFa?Zz|J$qcSzpE1#RI}LwE38&+k?RI2mC8qK^JcJdW}&!G
zpFVGK`gw^m$}gCUdTf#R2P7sY?$>HK)SJaf<Z}5PG|Dfcqf&1wqN%6X>eZ{qb1%|r
z)Ec%~jD^#UE;2IG8^=64QSF0zc|G>%?+;QclyS|9t`>w+Cnu*jv5`hxQ>(g`{x&$0
z)t5td10dY2<m#oMpx^?IId?|-uC+m?4R3dAYwMwaY_oD}PDS5*^UW0OmTzB|1{x{-
zz+?RqC5ii+6<a%zm&)&A1FZ{H3u?{%;C8;oAu6lu50OYD?3OKC*tv7(va@E*s*`wl
zc(98XFJ`?rc(ccj9b>aHvkcympO?@6a{3o`)5cBg(xprJ`|J9y*|TS}8#ZiUA3u6r
z?^^KXmtT$()B>y8cs@M$$Hm6^)%8c@<>s+7XU=4&PMvC2nKo@28yp<WzvJG$d#t;=
zyG7oSl$ca65TsJ+4IDq{jE%Dz(NGI)PJ=HySfkMt)b$7a`s=S|R}7I)KKX=KzMGqy
z#olr7z`^>~0`2hO!{0@ZsBKN!1;qG5mFachz=4_d@qG4+_FGIjq?B6n`CGSct+y>m
zO-Vh3Lzx|G(mE!_7p9ZE%vGV#`n+5u5*hrVk3asHUA1aet!3rPmF&WW3t1Nzmudl7
zuwVgye_h_=>gsBC0Mu%AHjW#-SQBGR=m(51xSmRL0x)C73|0q&2elNwsjt=Y$8m9S
z?B2b54W7Gw`*t=eDvH0aF3%^jY}qnH0KVO7ZkMzjGK^Jq^yADKxs~;OxhVk5<Y%*2
zuU_S!dE&$g{+zQ_^?t4;0N|aGyu9CPLPNy+0pEW>adGk0#tHxd;nb;9P{qymOiKa4
z{l;|cr0YU;Rhy(ATO4W}#FeO=#tZ;28uK=uECm2~L#<l1dL74)NiV6<MjBt;d-v}B
zwmJHJsscc%Q1Xqc+6a8dlC4)u0RR#b67m(!u4`|~4jAzNty{Oe%<<By04SA}*4i!P
zn)gi>0PLWn?SK&g);IyRUuI_J$z}k|3jkMppHi*jHbO&e;Qw>Vxoc?v%H(CNpPyf?
zL{X+_vH)=Qsu0@)UD4JW0bqkxdJt!|Gc64O@nmWvmhQo{Bmms+*WhZ-ZrIjpAq2n{
zTWdqOn-vWKKw}e&)&Nds&z}7O_6r$#LZk%@LyxbUYuvXg08~m9`}pzWT8UbvZqfi8
zKYn~JwuswS1_1b}!^}1G*ldJNx}v?PE(rqw_%?vEv-3OVdSNpFhH~%Ty)A;afDr&a
zU=*hz003pe$W?6wJg24%Kzv-hA1?eeYK)OqaF6ZVw@+;d06=QnTiMi&up~heSQ!BN
z8Zc(em{AP{!1Lw>J&t<pQyl<cgx_cgBm6u95Ed4;t|}Wq24Wh-4Fw|%<GHnwrfvhy
zo;~YH4a~GO)fMf8BVp=i%?pAy1QA%^BD@A-X#jTZ+Vu&}o;GR+kgkZXI1{4qSptA4
z7#e@jrOgj-av;Dt^e@3RIEFbzQ>IL@R9A$K8WS+t710KJ>RyGOJ4*uq3Q0&vsFl>E
zB}|kLN(N;EhyVc2>1WHz%J{+n^tNQl5*`2of|+Z899P_%9GthJCS&z4Dk{44tQcWZ
z@<G8esf;ZyD&|MhsD%|Ufr`JrXwf2e^5n^S5X=lfs$f|11ykbzunwTNI8MCpSpon`
zK9usJ!Xh>&JBPmp+r^6)^&r4!pMU;2J8|MfJqX`!`POW|qf}ZNj_b%eRW>l+5{<)4
z8#Zj1Z0RA%h7wZxp@f6-Q<76yrBcZ&e%P>K{5((s!l6Tl*zx1X>p|G^%@(tD0E*+q
z{<wzBp|W|RbdTsz?n`C$eQ8iokO2VTN@ize*GUTU3#uIx24xo(6!MBD-^)nP;FZoP
zfPM7n5qm4*7F$|c$}4@qfB`J`U)eQl*62alvuBSUgw2~a^Y5%L2vC?kJUsrVG7rd<
zA%3N-wCs_&Ye0PkX0CaAd$ZAxqYd7ZC`n|uZQW*ak}gomq)C%_rGEI~hwS_Bzt5(m
zq!<7I0<-A|2r%($+_-W4Y;2$|0zy52kYWI+Drd*h<HCKC5|e(YF93%Q9<tcH&67W$
z<lk}S$`yX1Ze{lY08pAip<~93VMmP`#U>{w8vy{aeED)c2>$;5JUu~;A|OBws|yI+
z_iy8h8Ans&!KUm$4;L4gQT4S0!PkN<I(hcupBJm0pbK0M0E`_wmi^#^57?0-M^*{|
z2)Lpoj^N*a|IJev0RfD8T|j{4UDyTTP~AEK(jo>|X(0Eqr1~1bb?eqy6ol%81_0=1
z#E21WQc_Z-0D!<mU;+Zz6955h5V*0m1p(&QVw}=$RZYqgwg-TQ`o=`Z_?lrl27Bq!
zCEgwc1_sti0s;b9FE6iZOFPWIUcGuXPaovF`}XZ)ckkZKPvBj@em&pX&B(~85&)3-
z^XFH9kdwovr=`~k1g?#7y{7adT%Oe3!NCEBCpG4n$5~&2@c<}^FlF47^4G3i%eR*G
zv#C*_0Dudcnv%*sxc`8?aQ*^YSXfvs03dVb%+a@+VHp%Gje_<9w5Ds~9RY<OK74o<
z4nwxDYG!m*YXtsoY~98O4jeF0zOSz@Um{K23#Ap52CnG6yZ6|0=g!p_01#MWMOx1A
z99VWGEs@r!7U0@|LFoP1)pVgAJx#Hvr>Eyfjct7}lx(s_VAG~eRVqOUz#o77Q7ZsI
zz`Z3PkZud81=Rt7#<verdaYtd(8l;x&I5>SY_*`IxP<S!$;`~G^1iy%07pkhzHtV|
z7zF4oBqT)Ne?&U)s-z)}rT~5aZgq(pLBf*pYsJjfHDPuTN=mA|hX&yOz5DF>^XIDt
zz{<*sjfsh=GCGP%rK%Eus0UFyFlIzYrVf!)tOT{-74FXlH^l|h1OQ@$|NQe${#*z^
z&z?QmBS((t&%tdaTVi4&o0ggeD_wa0hZ+C?R7OECwG-!oI@Kp?iWL<Z@uh(S2fkyj
zDT@sa0B|-aFzR6xd-?KZwy4Mu08l=7P_RK;fq)Pi8p>aL6!nO`_SZFj4?u!DS{Vfa
zQ^4v{9DMJ<)H7}n2~!3hQ9l^fZ>j)*9}j&<A;BR$brArZot^a!GuXny!t?;V_uhN_
zHRwGJyB@}`o(CYIWn7sn$~`*-r=fQ>NBA-;DoP?BvWBa62~7zAP!bsI%#2L-Y3x(>
z=8c=YCj;BOdGpxR)KvZ$Y5)P|qmMq)g8+R^u)(T%01$u#3WF|g6BHx|rl6u`nI(#%
zLC~g2lO~O7N>l^@0B=K=f+Ru08)DKOO%x6w`0Vh}570zJMCbt+J$kg>=*B#WF#>?5
zp3|pKFQDSa)hk$2Wf2p3D!Opt!m_3kI|u*(zJ``8&_`@cEN?`~2Hgz*J^o)lECH<S
zm&s)O^$8Ou=s~!9_ilMD;HauH0MgRZj+m2rs-hxz!7Juk#?%laV!+p62Vj6EIVo8`
zA_m47xE*K)8fdWW_4e)C{AYLW+~JkqwryKhEEel&2tX79fXk0a6kUr2aHZo#^U)J8
zhhD!J9v;r#xN%draNqIY?cFwRM%iTVwqcX~bnlJ!uDGARej|6y+uqH~yL`WX123*9
z<aoN*dcC;N$7}iXwyx{E;GEy%Ik~3)9PY*M*iKus!S>TN8*Qhq*kn8Di!HX}7H!Ke
zEXjY8l%CjilILEV_hx+GdZdeg>){^<wf@)mgB{+TbhMyI%5xO_w}OHKzDG`yo|R)W
zde%Ohaf^K4Ub_9@<!d3Dn>TN=*KgfU!L%nmk)~Uli+ZYxnC^gvW~ewVD-x=7Nokqx
zo3IoS;}bE{Kz4+G#`xTHXMApz%Z{5fnD1_t3mp4Ixbd>>M)`h6_;ltw6gb`yHl6Va
zcjfnRzKuKfF(KRV9{OI8t)b<z`HDNU{`XnT>N6fU5_2v)t~<4mS$22<vry#8%nw+?
z%=B5#Ok4joGvNzwuR~`}X|)w;O_H<o(}%AK^kru6T=|~w?_0V5tOEOySy+-cc<|tN
zv9G_Qx#NXa1wtG2aeLa?*}axsEQ{kaPUu+Ok1@r^E3z3;G5Jj;WuOCh6QLvOl5oQ$
zvMz}a9Y}>X)?X8RPQ*XvQ)XZ6G{!G_8nfpC2TtVl7Tdzg3&NIAcV<iQOlIA=+04ol
z^BK<{7cp~oEoWRee?5G4pzr*>Ck~GC3fjZCdV4V*zAL8fzqB_wGg||8qOepU#iS0s
z(dgPXRE`-dDpw4k-m7!x&co6Rr1wcE-?NFO7mc!Ika*I<oB_fJ>PEQ&stH>!5`?ff
zh?tH7pnf0i!UM7Akt+|x?z_{OJ@?$0?{0H7G3+zun@h8qwP)rrOAkYh_=1_e>nmo)
zw$;qc?W-7%-76L!z4}v9YPuG>F|rD!`J6ZSK6*Tk4XOOfKmh(5nvjuuh0J%lpR0(2
zxcdgRfds-P5z6Vz79@DKK9s#Mx;hp0+#vWiiHJ@|MUSia9sv`S58@x|!h^9l+Ep*#
zKbp={<<^i{jMuq&%&MOka6l|(JohhU79U)CAoxL8T1JL0KR=&M$;wX|Hf-2%O8It{
z3fNs65IUeu7<@lQ{F4sD+2@pLN<FUSco`&Q69&UJpe7R$*6D-`!i*ZilqSLe;dE4V
zQrkpS!UlN1KX>f^gsTk?-I$$`pK-M0!EC-f2Y_()xx73=oSp@JKv44I)3fh6IXV3c
zIp0x`Rp}qgBhwOXf&;o?uO2>jd~umt%lmqegXL_Z>>{7lj!w!(rwpN^teeV`L{giW
z$|)lRNT~EcVd@fzi&2WJy|J7;abx@*&R~4+yE8i@W^KKmbSR^sM8)_2mq>NN;kW(K
z)$ED2p3u%eo@I|V%p{*o|H+dlkIs`R^qnkOa*cG=jXWQdwjn6q)nv%~%F<JbB$a1O
z64CMhspLSy{9=R>$#3v~I-S`UGh@t|gcZ@br5RkyR|l=%!qPJ7mTf-n*vKMzV{Dj4
zmeh^Ts6^6PIa^y>4+*>bz+a&*cj>@DN98HSlP_ehGzmh0FxLzXhQu(#g;6pdfx-g>
zxx?rZZz8*1zhg=BuBDbnC?KIF$DwMjrT;WJ<J^D&1Kz@Z{jQBAeN{~px^=)3^YYlS
zWB(2LfJt64NRSp?piG>3HOtE=cch5+m?*<d_Cnec9+P{8Nf#<f{`uzVG|!t^iu(#G
z$!C74GIjmNjV>5?^(AyOn@mng+Ag%k+5ocx2KtK*%*`&AiwO`=)+EKM+#|6iCn23+
zr3pM~x)7FPIy0WIbXS%Dl(R=W?-vC^+7*?yBB5uITvb5jk?ez|zCA@bO(wmqur|;c
zRR{0f<@Z@eq4cqiN@dF#Z7rlaJP=)S6!HWcC`^=SxEG4>y2!YsLz==JcMAd|vJ_Dz
z%JS4JWGj@bvrhkUel;$jAemG<GEFR#YIWTgc1TN3*m@iUS@)tPsV5<oEUge&77V$_
zBC{2bkH?jqSrL}Ey~`o7he5vJ%5n&E0-5_D!80U)4o#QePL*m3Nq$IuvS_tdEzZad
z-o0<12bTE0sQ6B3$DWxq=fbSo1c<IkO)zWhwSfHx=S#Bku9PS>g@mFEQ-rWOD7o2k
zO=+4;QzR)?=RPe|rpFd4Qxl3+IgmXYKr2#el^TJv=}g+3EsFf@&r56Dw{QOjdN$5X
zMOt%vrXp?aGnZdp2!t*2t0R`Y-U!AJFxr=buWuG-<_71=%93SDwZarARc(;rDPN|@
zO35pVxPIsU_nw|hCgL2;SCI;PpnY<{LectJReWVYv_Kot21}j;g5iXoM;`<PW|qAM
zK}5Fs`nvt+=hI(6n%t|`!*@nLd=dz01w$k5`hxL1e(IMm_XUbP-hTV-kr*6lFqZPZ
zSlhax(mSAoV1pe0TqwS}T49Y~*r9SdARt{4lpfd$bw+Ud3ZxHy)(h|LhTnC>XSKs;
zKle(nNzI@Eu|dVzqY~R=ZRsEo2mGuZ0%(Uc*9M=}3ZG4s-mLf<0z!k*5*2A(iL^p#
oNh!No;T8a<Drw%Dx0-MN4-+oM8s$K!R{#J207*qoM6N<$g3jVX>Hq)$

literal 0
HcmV?d00001

diff --git a/browser/themes/windows/jar.mn b/browser/themes/windows/jar.mn
index c8c3fa3fe7d..8a7186e6e13 100644
--- a/browser/themes/windows/jar.mn
+++ b/browser/themes/windows/jar.mn
@@ -123,6 +123,7 @@ browser.jar:
         skin/classic/browser/tab-crashed.svg                         (../shared/incontent-icons/tab-crashed.svg)
         skin/classic/browser/welcome-back.svg                        (../shared/incontent-icons/welcome-back.svg)
         skin/classic/browser/reader-tour.png                         (../shared/reader/reader-tour.png)
+        skin/classic/browser/reader-tour@2x.png                      (../shared/reader/reader-tour@2x.png)
         skin/classic/browser/readerMode.svg                          (../shared/reader/readerMode.svg)
         skin/classic/browser/readinglist/icons.svg                   (../shared/readinglist/icons.svg)
         skin/classic/browser/readinglist/readinglist-icon.svg        (../shared/readinglist/readinglist-icon.svg)
diff --git a/testing/profiles/prefs_general.js b/testing/profiles/prefs_general.js
index 2a8f50e903f..0d748971a09 100644
--- a/testing/profiles/prefs_general.js
+++ b/testing/profiles/prefs_general.js
@@ -309,8 +309,9 @@ user_pref("browser.tabs.remote.autostart.2", false);
 // Don't forceably kill content processes after a timeout
 user_pref("dom.ipc.tabs.shutdownTimeoutSecs", 0);
 
-// Avoid performing Readinglist Intro during tests.
+// Avoid performing Reading List and Reader Mode intros during tests.
 user_pref("browser.readinglist.introShown", true);
+user_pref("browser.reader.detectedFirstArticle", true);
 
 // Don't let PAC generator to set PAC, as mochitest framework has its own PAC
 // rules during testing.

From a7c42b167255bed6ad9dc9d36b1dafb3b75d0d2a Mon Sep 17 00:00:00 2001
From: David Parks <davidp99@gmail.com>
Date: Tue, 28 Apr 2015 18:25:05 -0700
Subject: [PATCH 45/88] Bug 1083365 - Tag NS_MOUSE_EXIT messages as eTopLevel
 when sending to child process. (r=smaug)

NS_MOUSE_EXIT events were improperly being filtered by the
EventStateManager in the content process.  This patch labels them as
WidgetMouseEvent::eTopLevel to avoid the filtering.
---
 dom/events/EventStateManager.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dom/events/EventStateManager.cpp b/dom/events/EventStateManager.cpp
index e2c4a80aace..bdfe312b54d 100644
--- a/dom/events/EventStateManager.cpp
+++ b/dom/events/EventStateManager.cpp
@@ -3794,10 +3794,11 @@ EventStateManager::DispatchMouseOrPointerEvent(WidgetMouseEvent* aMouseEvent,
     // event to the remote frame.
     if (IsRemoteTarget(aTargetContent)) {
       if (aMessage == NS_MOUSE_EXIT_SYNTH) {
-        // For remote content, send a normal widget mouse exit event.
+        // For remote content, send a "top-level" widget mouse exit event.
         nsAutoPtr<WidgetMouseEvent> remoteEvent;
         CreateMouseOrPointerWidgetEvent(aMouseEvent, NS_MOUSE_EXIT,
                                         aRelatedContent, remoteEvent);
+        remoteEvent->exit = WidgetMouseEvent::eTopLevel;
 
         // mCurrentTarget is set to the new target, so we must reset it to the
         // old target and then dispatch a cross-process event. (mCurrentTarget

From 391a67daf03c708d60e43801a9788aeceab32d2e Mon Sep 17 00:00:00 2001
From: Matt King <mking@mking.me>
Date: Thu, 30 Apr 2015 13:54:05 -0700
Subject: [PATCH 46/88] Bug 952290 - Long press on navigation buttons (i.e.
 back/forward) in app menu should bring up history list. r=mcomella

---
 mobile/android/base/BrowserApp.java | 36 +++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/mobile/android/base/BrowserApp.java b/mobile/android/base/BrowserApp.java
index 43b80987733..05af3bdf645 100644
--- a/mobile/android/base/BrowserApp.java
+++ b/mobile/android/base/BrowserApp.java
@@ -104,6 +104,7 @@ import android.os.Bundle;
 import android.os.StrictMode;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
+import android.support.v4.view.MenuItemCompat;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.util.Base64;
@@ -123,6 +124,7 @@ import android.view.ViewStub;
 import android.view.ViewTreeObserver;
 import android.view.Window;
 import android.view.animation.Interpolator;
+import android.widget.Button;
 import android.widget.ListView;
 import android.widget.RelativeLayout;
 import android.widget.Toast;
@@ -3038,6 +3040,40 @@ public class BrowserApp extends GeckoApp
         desktopMode.setChecked(tab.getDesktopMode());
         desktopMode.setIcon(tab.getDesktopMode() ? R.drawable.ic_menu_desktop_mode_on : R.drawable.ic_menu_desktop_mode_off);
 
+        View backButtonView = MenuItemCompat.getActionView(back);
+
+        if (backButtonView != null) {
+            backButtonView.setOnLongClickListener(new Button.OnLongClickListener() {
+                @Override
+                public boolean onLongClick(View view) {
+                    Tab tab = Tabs.getInstance().getSelectedTab();
+                    if (tab != null) {
+                        closeOptionsMenu();
+                        return tabHistoryController.showTabHistory(tab,
+                                TabHistoryController.HistoryAction.BACK);
+                    }
+                    return false;
+                }
+            });
+        }
+
+        View forwardButtonView = MenuItemCompat.getActionView(forward);
+
+        if (forwardButtonView != null) {
+            forwardButtonView.setOnLongClickListener(new Button.OnLongClickListener() {
+                @Override
+                public boolean onLongClick(View view) {
+                    Tab tab = Tabs.getInstance().getSelectedTab();
+                    if (tab != null) {
+                        closeOptionsMenu();
+                        return tabHistoryController.showTabHistory(tab,
+                                TabHistoryController.HistoryAction.FORWARD);
+                    }
+                    return false;
+                }
+            });
+        }
+
         String url = tab.getURL();
         if (AboutPages.isAboutReader(url)) {
             String urlFromReader = ReaderModeUtils.getUrlFromAboutReader(url);

From 572b50522f1bbda2192b58afb860c5b5b3e82d24 Mon Sep 17 00:00:00 2001
From: Felipe Gomes <felipc@gmail.com>
Date: Thu, 30 Apr 2015 18:52:08 -0300
Subject: [PATCH 47/88] Bug 1156613 - Fix e10s ifdef NIGHTLY_BUILD blocks with
 E10S_TESTING_ONLY. r=billm

---
 browser/app/profile/firefox.js |  4 ++--
 modules/libpref/init/all.js    |  4 ++--
 toolkit/xre/nsAppRunner.cpp    | 14 +++++++-------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index 546d4233439..65186d8769e 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -1863,7 +1863,7 @@ pref("browser.polaris.enabled", false);
 pref("privacy.trackingprotection.ui.enabled", false);
 #endif
 
-#ifdef NIGHTLY_BUILD
+#ifdef E10S_TESTING_ONLY
 // At the moment, autostart.2 is used, while autostart.1 is unused.
 // We leave it here set to false to reset users' defaults and allow
 // us to change everybody to true in the future, when desired.
@@ -1871,7 +1871,7 @@ pref("browser.tabs.remote.autostart.1", false);
 pref("browser.tabs.remote.autostart.2", true);
 #endif
 
-#ifdef NIGHTLY_BUILD
+#ifdef E10S_TESTING_ONLY
 // Enable e10s add-on interposition by default.
 pref("extensions.interposition.enabled", true);
 pref("extensions.interposition.prefetching", true);
diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
index 940b03f3861..69da0a85f94 100644
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -179,7 +179,7 @@ pref("dom.url.encode_decode_hash", true);
 // Whether to run add-on code in different compartments from browser code. This
 // causes a separate compartment for each (addon, global) combination, which may
 // significantly increase the number of compartments in the system.
-#ifdef NIGHTLY_BUILD
+#ifdef E10S_TESTING_ONLY
 pref("dom.compartment_per_addon", true);
 #else
 pref("dom.compartment_per_addon", false);
@@ -2438,7 +2438,7 @@ pref("dom.ipc.plugins.unloadTimeoutSecs", 30);
 
 // Asynchronous plugin initialization should only be enabled on non-e10s
 // channels until some remaining bugs are resolved.
-#ifdef NIGHTLY_BUILD
+#ifdef E10S_TESTING_ONLY
 pref("dom.ipc.plugins.asyncInit", false);
 #else
 pref("dom.ipc.plugins.asyncInit", true);
diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
index c310213e854..78876a66c20 100644
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
@@ -585,7 +585,7 @@ bool gSafeMode = false;
  * singleton.
  */
 class nsXULAppInfo : public nsIXULAppInfo,
-#ifdef NIGHTLY_BUILD
+#ifdef E10S_TESTING_ONLY
                      public nsIObserver,
 #endif
 #ifdef XP_WIN
@@ -603,7 +603,7 @@ public:
   NS_DECL_ISUPPORTS_INHERITED
   NS_DECL_NSIXULAPPINFO
   NS_DECL_NSIXULRUNTIME
-#ifdef NIGHTLY_BUILD
+#ifdef E10S_TESTING_ONLY
   NS_DECL_NSIOBSERVER
 #endif
 #ifdef MOZ_CRASHREPORTER
@@ -618,7 +618,7 @@ public:
 NS_INTERFACE_MAP_BEGIN(nsXULAppInfo)
   NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIXULRuntime)
   NS_INTERFACE_MAP_ENTRY(nsIXULRuntime)
-#ifdef NIGHTLY_BUILD
+#ifdef E10S_TESTING_ONLY
   NS_INTERFACE_MAP_ENTRY(nsIObserver)
 #endif
 #ifdef XP_WIN
@@ -824,7 +824,7 @@ static bool gBrowserTabsRemoteAutostart = false;
 static nsString gBrowserTabsRemoteDisabledReason;
 static bool gBrowserTabsRemoteAutostartInitialized = false;
 
-#ifdef NIGHTLY_BUILD
+#ifdef E10S_TESTING_ONLY
 NS_IMETHODIMP
 nsXULAppInfo::Observe(nsISupports *aSubject, const char *aTopic, const char16_t *aData) {
   if (!nsCRT::strcmp(aTopic, "getE10SBlocked")) {
@@ -4339,7 +4339,7 @@ XRE_IsParentProcess()
   return XRE_GetProcessType() == GeckoProcessType_Default;
 }
 
-#ifdef NIGHTLY_BUILD
+#ifdef E10S_TESTING_ONLY
 static void
 LogE10sBlockedReason(const char *reason) {
   gBrowserTabsRemoteDisabledReason.Assign(NS_ConvertASCIItoUTF16(reason));
@@ -4381,7 +4381,7 @@ mozilla::BrowserTabsRemoteAutostart()
   } else {
     status = kE10sDisabledByUser;
   }
-#if !defined(NIGHTLY_BUILD)
+#if !defined(E10S_TESTING_ONLY)
   // When running tests with 'layers.offmainthreadcomposition.testing.enabled' and
   // autostart set to true, return enabled.  These tests must be allowed to run
   // remotely. Otherwise remote isn't allowed in non-nightly builds.
@@ -4445,7 +4445,7 @@ mozilla::BrowserTabsRemoteAutostart()
       gBrowserTabsRemoteAutostart = false;
 
       status = kE10sDisabledForMacGfx;
-#ifdef NIGHTLY_BUILD
+#ifdef E10S_TESTING_ONLY
       LogE10sBlockedReason("Hardware acceleration is disabled");
 #endif
     }

From 41d1bc0934cbdfdf211bca7a4975de9ace7209bd Mon Sep 17 00:00:00 2001
From: Nick Fitzgerald <fitzgen@gmail.com>
Date: Thu, 30 Apr 2015 15:21:11 -0700
Subject: [PATCH 48/88] Bug 1157914 - Don't re-render the graphs until
 selection is done; r=jsantell

---
 .../performance/views/details-abstract-subview.js | 15 ++++++++++++++-
 .../performance/views/details-js-call-tree.js     |  2 +-
 .../performance/views/details-js-flamegraph.js    |  2 ++
 .../views/details-memory-flamegraph.js            |  2 ++
 .../performance/views/details-waterfall.js        |  2 +-
 browser/devtools/performance/views/overview.js    | 10 ++++++++++
 browser/devtools/shared/widgets/Graphs.jsm        |  8 ++++++++
 7 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/browser/devtools/performance/views/details-abstract-subview.js b/browser/devtools/performance/views/details-abstract-subview.js
index c9aeb5609e0..5309eade24b 100644
--- a/browser/devtools/performance/views/details-abstract-subview.js
+++ b/browser/devtools/performance/views/details-abstract-subview.js
@@ -71,6 +71,12 @@ let DetailsSubview = {
    */
   observedPrefs: [],
 
+  /**
+   * Flag specifying if this view should update while the overview selection
+   * area is actively being dragged by the mouse.
+   */
+  shouldUpdateWhileMouseIsActive: false,
+
   /**
    * Called when recording stops or is selected.
    */
@@ -90,7 +96,14 @@ let DetailsSubview = {
    */
   _onOverviewRangeChange: function (_, interval) {
     if (DetailsView.isViewSelected(this)) {
-      let debounced = () => this.render(interval);
+      let debounced = () => {
+        if (!this.shouldUpdateWhileMouseIsActive && OverviewView.isMouseActive) {
+          // Don't render yet, while the selection is still being dragged.
+          setNamedTimeout("range-change-debounce", this.rangeChangeDebounceTime, debounced);
+        } else {
+          this.render(interval);
+        }
+      };
       setNamedTimeout("range-change-debounce", this.rangeChangeDebounceTime, debounced);
     } else {
       this.shouldUpdateWhenShown = true;
diff --git a/browser/devtools/performance/views/details-js-call-tree.js b/browser/devtools/performance/views/details-js-call-tree.js
index fdef5e63be2..dad25b55d47 100644
--- a/browser/devtools/performance/views/details-js-call-tree.js
+++ b/browser/devtools/performance/views/details-js-call-tree.js
@@ -13,7 +13,7 @@ let JsCallTreeView = Heritage.extend(DetailsSubview, {
     "show-platform-data"
   ],
 
-  rangeChangeDebounceTime: 50, // ms
+  rangeChangeDebounceTime: 75, // ms
 
   /**
    * Sets up the view with event binding.
diff --git a/browser/devtools/performance/views/details-js-flamegraph.js b/browser/devtools/performance/views/details-js-flamegraph.js
index 8c1a7dca408..46efe2d72d2 100644
--- a/browser/devtools/performance/views/details-js-flamegraph.js
+++ b/browser/devtools/performance/views/details-js-flamegraph.js
@@ -9,6 +9,8 @@
  */
 let JsFlameGraphView = Heritage.extend(DetailsSubview, {
 
+  shouldUpdateWhileMouseIsActive: true,
+
   rerenderPrefs: [
     "invert-flame-graph",
     "flatten-tree-recursion",
diff --git a/browser/devtools/performance/views/details-memory-flamegraph.js b/browser/devtools/performance/views/details-memory-flamegraph.js
index 66190126463..9cc7ecd7a21 100644
--- a/browser/devtools/performance/views/details-memory-flamegraph.js
+++ b/browser/devtools/performance/views/details-memory-flamegraph.js
@@ -9,6 +9,8 @@
  */
 let MemoryFlameGraphView = Heritage.extend(DetailsSubview, {
 
+  shouldUpdateWhileMouseIsActive: true,
+
   rerenderPrefs: [
     "invert-flame-graph",
     "flatten-tree-recursion",
diff --git a/browser/devtools/performance/views/details-waterfall.js b/browser/devtools/performance/views/details-waterfall.js
index 21261315f09..296e81fed5f 100644
--- a/browser/devtools/performance/views/details-waterfall.js
+++ b/browser/devtools/performance/views/details-waterfall.js
@@ -16,7 +16,7 @@ let WaterfallView = Heritage.extend(DetailsSubview, {
     "hidden-markers"
   ],
 
-  rangeChangeDebounceTime: 10, // ms
+  rangeChangeDebounceTime: 75, // ms
 
   /**
    * Sets up the view with event binding.
diff --git a/browser/devtools/performance/views/overview.js b/browser/devtools/performance/views/overview.js
index 2425d9cede2..31d236b3ffb 100644
--- a/browser/devtools/performance/views/overview.js
+++ b/browser/devtools/performance/views/overview.js
@@ -92,6 +92,16 @@ let OverviewView = {
     yield this.graphs.destroy();
   }),
 
+  /**
+   * Returns true if any of the overview graphs have mouse dragging active,
+   * false otherwise.
+   */
+  get isMouseActive() {
+    return (this.markersOverview && this.markersOverview.isMouseActive) ||
+           (this.memoryOverview && this.memoryOverview.isMouseActive) ||
+           (this.framerateGraph && this.framerateGraph.isMouseActive);
+  },
+
   /**
    * Disabled in the event we're using a Timeline mock, so we'll have no
    * timeline, ticks or memory data to show, so just block rendering and hide
diff --git a/browser/devtools/shared/widgets/Graphs.jsm b/browser/devtools/shared/widgets/Graphs.jsm
index 043783cf322..67d815d8094 100644
--- a/browser/devtools/shared/widgets/Graphs.jsm
+++ b/browser/devtools/shared/widgets/Graphs.jsm
@@ -220,6 +220,14 @@ AbstractCanvasGraph.prototype = {
     return this._height;
   },
 
+  /**
+   * Return true if the mouse is actively messing with the selection, false
+   * otherwise.
+   */
+  get isMouseActive() {
+    return this._isMouseActive;
+  },
+
   /**
    * Returns a promise resolved once this graph is ready to receive data.
    */

From 80d29bdbba9489ab19d4c44c4acf253ff708ca5c Mon Sep 17 00:00:00 2001
From: James Long <longster@gmail.com>
Date: Thu, 30 Apr 2015 15:36:53 -0700
Subject: [PATCH 49/88] Bug 1118332 - only load the HTML source from cache in
 the debugger r=fitzgen

---
 toolkit/devtools/server/actors/script.js      | 24 +++++++++++++------
 .../server/actors/utils/TabSources.js         |  1 +
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/toolkit/devtools/server/actors/script.js b/toolkit/devtools/server/actors/script.js
index b23bb6cd1c9..ec2124d3384 100644
--- a/toolkit/devtools/server/actors/script.js
+++ b/toolkit/devtools/server/actors/script.js
@@ -2251,12 +2251,13 @@ function resolveURIToLocalPath(aURI) {
  *        Optional. The content type of this source, if immediately available.
  */
 function SourceActor({ source, thread, originalUrl, generatedSource,
-                       contentType }) {
+                       isInlineSource, contentType }) {
   this._threadActor = thread;
   this._originalUrl = originalUrl;
   this._source = source;
   this._generatedSource = generatedSource;
   this._contentType = contentType;
+  this._isInlineSource = isInlineSource;
 
   this.onSource = this.onSource.bind(this);
   this._invertSourceMap = this._invertSourceMap.bind(this);
@@ -2286,8 +2287,14 @@ SourceActor.prototype = {
   _addonPath: null,
 
   get isSourceMapped() {
-    return this._originalURL || this._generatedSource ||
-           this.threadActor.sources.isPrettyPrinted(this.url);
+    return !this.isInlineSource && (
+      this._originalURL || this._generatedSource ||
+        this.threadActor.sources.isPrettyPrinted(this.url)
+    );
+  },
+
+  get isInlineSource() {
+    return this._isInlineSource;
   },
 
   get threadActor() { return this._threadActor; },
@@ -2410,10 +2417,13 @@ SourceActor.prototype = {
         return toResolvedContent(this.source.text);
       }
       else {
-        // XXX bug 865252: Don't load from the cache if this is a source mapped
-        // source because we can't guarantee that the cache has the most up to date
-        // content for this source like we can if it isn't source mapped.
-        let sourceFetched = fetch(this.url, { loadFromCache: !this.source });
+        // Only load the HTML page source from cache (which exists when
+        // there are inline sources). Otherwise, we can't trust the
+        // cache because we are most likely here because we are
+        // fetching the original text for sourcemapped code, and the
+        // page hasn't requested it before (if it has, it was a
+        // previous debugging session).
+        let sourceFetched = fetch(this.url, { loadFromCache: this.isInlineSource });
 
         // Record the contentType we just learned during fetching
         return sourceFetched.then(result => {
diff --git a/toolkit/devtools/server/actors/utils/TabSources.js b/toolkit/devtools/server/actors/utils/TabSources.js
index c647cd27e60..aa2b17073b5 100644
--- a/toolkit/devtools/server/actors/utils/TabSources.js
+++ b/toolkit/devtools/server/actors/utils/TabSources.js
@@ -156,6 +156,7 @@ TabSources.prototype = {
       source: source,
       originalUrl: originalUrl,
       generatedSource: generatedSource,
+      isInlineSource: isInlineSource,
       contentType: contentType
     });
 

From 035142af76772f05c662b06e90ba1287fe9f2fe2 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Thu, 30 Apr 2015 15:37:05 -0700
Subject: [PATCH 50/88] Bug 1159083 - Pass XAUTHORITY to Linux simulators.
 r=janx

---
 browser/devtools/webide/modules/simulator-process.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/browser/devtools/webide/modules/simulator-process.js b/browser/devtools/webide/modules/simulator-process.js
index e0445f7bbe4..1b20137b535 100644
--- a/browser/devtools/webide/modules/simulator-process.js
+++ b/browser/devtools/webide/modules/simulator-process.js
@@ -71,9 +71,11 @@ SimulatorProcess.prototype = {
     let environment;
     if (OS.indexOf("linux") > -1) {
       environment = ["TMPDIR=" + Services.dirsvc.get("TmpD", Ci.nsIFile).path];
-      if ("DISPLAY" in Environment) {
-        environment.push("DISPLAY=" + Environment.DISPLAY);
-      }
+      ["DISPLAY", "XAUTHORITY"].forEach(key => {
+        if (key in Environment) {
+          environment.push(key + "=" + Environment[key]);
+        }
+      });
     }
 
     // Spawn a B2G instance.

From b210d4c2f65975636e7c0d70fd9d6b6b3b5ff47a Mon Sep 17 00:00:00 2001
From: Tim Nguyen <ntim.bugs@gmail.com>
Date: Thu, 30 Apr 2015 15:37:19 -0700
Subject: [PATCH 51/88] Bug 1159437 - Add top green border for highlighted tabs
 in light theme. r=bgrins

---
 browser/themes/shared/devtools/toolbars.inc.css | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/browser/themes/shared/devtools/toolbars.inc.css b/browser/themes/shared/devtools/toolbars.inc.css
index 4f74214ee5a..169c8031832 100644
--- a/browser/themes/shared/devtools/toolbars.inc.css
+++ b/browser/themes/shared/devtools/toolbars.inc.css
@@ -878,9 +878,12 @@
   background-color: rgba(170,170,170,.4);
 }
 
+.devtools-tab:not([selected])[highlighted] {
+  box-shadow: 0 2px 0 var(--theme-highlight-green) inset;
+}
+
 .theme-dark .devtools-tab:not([selected])[highlighted] {
   background-color: hsla(99,100%,14%,.2);
-  box-shadow: 0 2px 0 #7bc107 inset;
 }
 
 .theme-light .devtools-tab:not([selected])[highlighted] {

From 7f73d39f947df95e0d10d9d228027ac44e02fdeb Mon Sep 17 00:00:00 2001
From: Anirudh S <anirudh24seven@gmail.com>
Date: Fri, 24 Apr 2015 09:50:03 +0530
Subject: [PATCH 52/88] Bug 1134494 - Change url_bar_entry_pressed outline
 color to action orange. r=mcomella

---
 .../drawable-hdpi/url_bar_entry_pressed.9.png   | Bin 260 -> 253 bytes
 .../drawable-mdpi/url_bar_entry_pressed.9.png   | Bin 220 -> 219 bytes
 .../drawable-xhdpi/url_bar_entry_pressed.9.png  | Bin 313 -> 313 bytes
 .../drawable-xxhdpi/url_bar_entry_pressed.9.png | Bin 431 -> 431 bytes
 4 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/mobile/android/base/resources/drawable-hdpi/url_bar_entry_pressed.9.png b/mobile/android/base/resources/drawable-hdpi/url_bar_entry_pressed.9.png
index 33adefc60ab0140afa15f9e279591fc890c0415e..33faec0e29187f0bab8959c93cd3f4a12c7764ba 100644
GIT binary patch
delta 237
zcmZo+`pY;$qMn7Bfq}t1jO_-HG6?VqaRt)<r!xGX#{7Q<$Nw4Z|5q9RpT_ckI?Mm#
z6;P>r8~@+i^#9A#|Ns8}|NsBbA;SQm1ZPQ*UoeA2+M#owzkUCm6?j?!C|K<2;uvCa
zIyr%%X{JO&qe4PabSq<!h=Wnjvh@GS4Yv<6r8#Im+xI`>05`KA8{5_IH<tWkWn5bG
zFPSyEA!zH3rRxffd?NZ|UtM2u1q3HdIyCw0M^V0tE)g46!E29R^X>SNlu&eB=ZlvJ
ghv-z}jZAE846}1emTss$19B~cr>mdKI;Vst04la>MF0Q*

delta 244
zcmV<Q01N;90fYjO7=H)@0002;rt8@N001*kOjJbx008ugApe#q{FW{KmM#6LQT?e>
z{go;Gl_~zli~s-t{gWpC-Ms$Zz5es){{H>{|Nph(YwZ94019+cPE!CFX2Q<%^Y-`q
zS-@Zu0001XNkl<Zc-rmOITnC02t`ps$ZUrFuU1ZurUq?!)NQxs!&?;u|3gYmP$E3U
z`Pj!2G_K&?gM67w*eo8PvcbqktO9OCeJQ$VqdYWdB&d9CscMD{88T$ZkRdht`l$7j
u;QRQ{&m7&L>Ss`KNVy5hgz&Gb2)G-xoR8KxAvi7o0000<MNUMnLSTXz*LH{i

diff --git a/mobile/android/base/resources/drawable-mdpi/url_bar_entry_pressed.9.png b/mobile/android/base/resources/drawable-mdpi/url_bar_entry_pressed.9.png
index 65e2d3e4855ea6975b038a24dcd0a33144007a69..04d6d800f4e865639b5902bdddb7416df4ada74d 100644
GIT binary patch
delta 203
zcmcb^c$;y8L_G^L0|SGwUh8Tgr4`^4;tHhy_c8pR&hUQ*+y5Dy|7UQ3$g^$#&$NN0
zrZW8h^7Q|gXaE2Iudr9D019!I1o;IsNK3DJ`|jPZ-+cbdcz}Z8o-U3d8t0P}5)x)~
zvPcv#s7(&_I1tIGp%PUq&Y8piC?#RTj&7zdmqsVc6;9C>l4@&QMR%EMnW(f%>@i$4
y?VyY?W5=}w6=65yCr75}G}xXjJm<nFEWxn4?@)4J(KJJ#9SokXelF{r5}E+qLQTj3

delta 204
zcmV;-05kvF0o(zQ7=H)@0002i-e{@-001XYOjJbx008!mCjXZv{+2BLmo5F4E&j}y
z{>zvE008}yCjRs2{`Bep|Njf(6nOvu00?waPE!CI8>;Q@`uoD|sTKeL09;8#K~#9!
z?bJaIz#s?((Lsc&_5SB=W7lF#y7aM~?T1g9U{BIqC$c66F-32EqPZmspjQvLj>zsP
zYMJt0?V)<26P@Vq2y$DF6V%r;N6hc#!$8#PgsHHhgn$RN1TfzP2ieL10000<MNUMn
GLSTZy8(-uA

diff --git a/mobile/android/base/resources/drawable-xhdpi/url_bar_entry_pressed.9.png b/mobile/android/base/resources/drawable-xhdpi/url_bar_entry_pressed.9.png
index 11b3e2f242c603aa5924f59a2bb6b9ef0029c609..acb1884d790886fe70c4d699be87fd4a8e0cae8e 100644
GIT binary patch
delta 71
zcmdnVw3BIqj_v;jhW}H*Xflie;Z6l{f#5%ovCj7Y@v8s#HvYf2>Hn9f|Ns5{|Nno+
L(MRqRGcN!DFx)BR

delta 71
zcmdnVw3BIqj_uV3hM#>ZzbC2wnWXY(k{S^GoviwI5)i2YNd^XnzmwJeu8I76toPsD
aJ^$|Q{rCCBzkh%K|Nk$1G0%Kr<^=#=eJW@G

diff --git a/mobile/android/base/resources/drawable-xxhdpi/url_bar_entry_pressed.9.png b/mobile/android/base/resources/drawable-xxhdpi/url_bar_entry_pressed.9.png
index 02a55e12a51a13772bf95c7d37cb18d8c5fd6174..d304f3c5dfcb25def307619e71dae91157346575 100644
GIT binary patch
delta 90
zcmZ3_yq<Z2j{pD34F4xFfXFE@G!@K%lT#Uh;6IQ%o$dcJ?f=Vl{$J?-e__J^OH=+o
c-uwUU)&IXf|Nr;*|NsAn9N7yuR+}&a0Cn*+F#rGn

delta 90
zcmZ3_yq<Z2j{nzA*>96n{!CE$J5lBDB-KBY)PU&kWVOE#a<b~*$*K$t3?PxI+JBdN
r{axz)@BI9K=NJ6DxcJ}WWB=aX{`d3Czkh%K|Nrll+V^>5wFx5t>!dd>


From f96cf282d43351a19fc341f78c3b6c4d5e91ddd3 Mon Sep 17 00:00:00 2001
From: Nick Alexander <nalexander@mozilla.com>
Date: Wed, 29 Apr 2015 09:56:02 -0700
Subject: [PATCH 53/88] Bug 1152871 - Include Adjust SDK private token in
 builds. r=mfinkle

---
 mobile/android/base/adjust/AdjustHelper.java | 5 ++++-
 mobile/android/config/mozconfigs/common      | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/mobile/android/base/adjust/AdjustHelper.java b/mobile/android/base/adjust/AdjustHelper.java
index 7eec04d075a..ce657ae6e7d 100644
--- a/mobile/android/base/adjust/AdjustHelper.java
+++ b/mobile/android/base/adjust/AdjustHelper.java
@@ -17,15 +17,18 @@ public class AdjustHelper implements AdjustHelperInterface {
     public void onCreate(final Context context, final String maybeAppToken) {
         final String environment;
         final String appToken;
+        final LogLevel logLevel;
         if (maybeAppToken != null) {
             environment = AdjustConfig.ENVIRONMENT_PRODUCTION;
             appToken = maybeAppToken;
+            logLevel = LogLevel.WARN;
         } else {
             environment = AdjustConfig.ENVIRONMENT_SANDBOX;
             appToken = "ABCDEFGHIJKL";
+            logLevel = LogLevel.VERBOSE;
         }
         AdjustConfig config = new AdjustConfig(context, appToken, environment);
-        config.setLogLevel(LogLevel.VERBOSE);
+        config.setLogLevel(logLevel);
         Adjust.onCreate(config);
     }
 
diff --git a/mobile/android/config/mozconfigs/common b/mobile/android/config/mozconfigs/common
index 6f134c9a1b9..e7e7022e5c0 100644
--- a/mobile/android/config/mozconfigs/common
+++ b/mobile/android/config/mozconfigs/common
@@ -37,6 +37,7 @@ ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-warnings-as-errors
 
 ac_add_options --with-mozilla-api-keyfile=/builds/mozilla-fennec-geoloc-api.key
+ac_add_options --with-adjust-sdk-keyfile=/builds/adjust-sdk.token
 
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1

From 02d91e29fbd54a80da2293d74908d6e8c15c20a0 Mon Sep 17 00:00:00 2001
From: Nick Alexander <nalexander@mozilla.com>
Date: Tue, 31 Mar 2015 17:46:48 -0700
Subject: [PATCH 54/88] Bug 1160357 - Share generateCodeAndResources across
 Gradle projects. r=me

This is just a clean-up: rather than having each subproject have a
generateCodeAndResources build action, we have a single action
(attached to the root project) which all subprojects depend on.
Gradle orders the task DAG accordingly, saving process invocations and
speeding up the build.
---
 mobile/android/gradle/base/build.gradle       |  2 +-
 mobile/android/gradle/build.gradle            | 27 +++++++++----------
 mobile/android/gradle/omnijar/build.gradle    |  7 +++--
 .../gradle/preprocessed_code/build.gradle     |  4 +--
 .../preprocessed_resources/build.gradle       |  2 +-
 5 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/mobile/android/gradle/base/build.gradle b/mobile/android/gradle/base/build.gradle
index 3583f063af1..ae43dc38377 100644
--- a/mobile/android/gradle/base/build.gradle
+++ b/mobile/android/gradle/base/build.gradle
@@ -68,7 +68,7 @@ dependencies {
 }
 
 android.libraryVariants.all { variant ->
-    variant.checkManifest.dependsOn generateCodeAndResources
+    variant.checkManifest.dependsOn rootProject.generateCodeAndResources
 }
 
 apply plugin: 'idea'
diff --git a/mobile/android/gradle/build.gradle b/mobile/android/gradle/build.gradle
index 18ad7607137..fcbf7a96739 100644
--- a/mobile/android/gradle/build.gradle
+++ b/mobile/android/gradle/build.gradle
@@ -26,22 +26,21 @@ repositories {
     jcenter()
 }
 
-subprojects {
-    task generateCodeAndResources(type:Exec) {
-        workingDir "${topobjdir}"
+task generateCodeAndResources(type:Exec) {
+    workingDir "${topobjdir}"
 
-        commandLine "${topsrcdir}/mach"
-        args 'build'
-        args 'mobile/android/base/gradle-targets'
+    commandLine mozconfig.substs.GMAKE
+    args '-C'
+    args "${topobjdir}/mobile/android/base"
+    args 'gradle-targets'
 
-        // Only show the output if something went wrong.
-        ignoreExitValue = true
-        standardOutput = new ByteArrayOutputStream()
-        errorOutput = standardOutput
-        doLast {
-            if (execResult.exitValue != 0) {
-                throw new GradleException("Process '${commandLine}' finished with non-zero exit value ${execResult.exitValue}:\n\n${standardOutput.toString()}")
-            }
+    // Only show the output if something went wrong.
+    ignoreExitValue = true
+    standardOutput = new ByteArrayOutputStream()
+    errorOutput = standardOutput
+    doLast {
+        if (execResult.exitValue != 0) {
+            throw new GradleException("Process '${commandLine}' finished with non-zero exit value ${execResult.exitValue}:\n\n${standardOutput.toString()}")
         }
     }
 }
diff --git a/mobile/android/gradle/omnijar/build.gradle b/mobile/android/gradle/omnijar/build.gradle
index 44ea426383f..1ed4ca36c60 100644
--- a/mobile/android/gradle/omnijar/build.gradle
+++ b/mobile/android/gradle/omnijar/build.gradle
@@ -4,7 +4,7 @@ apply plugin: 'java'
  * This task runs when any input file is newer than the omnijar.
  */
 task buildOmnijar(type:Exec) {
-    dependsOn generateCodeAndResources
+    dependsOn rootProject.generateCodeAndResources
 
     // Depend on all the Gecko resources.
     inputs.sourceDir 'src/main/java/locales'
@@ -18,10 +18,9 @@ task buildOmnijar(type:Exec) {
 
     workingDir "${topobjdir}"
 
-    commandLine "${topsrcdir}/mach"
-    args 'build'
+    commandLine mozconfig.substs.GMAKE
     args '-C'
-    args 'mobile/android/base'
+    args "${topobjdir}/mobile/android/base"
     args 'gradle-omnijar'
 
     // Only show the output if something went wrong.
diff --git a/mobile/android/gradle/preprocessed_code/build.gradle b/mobile/android/gradle/preprocessed_code/build.gradle
index 16674606b66..5386c3d476d 100644
--- a/mobile/android/gradle/preprocessed_code/build.gradle
+++ b/mobile/android/gradle/preprocessed_code/build.gradle
@@ -1,4 +1,4 @@
-apply plugin: 'android-library'
+apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion 21
@@ -37,7 +37,7 @@ android {
 }
 
 android.libraryVariants.all { variant ->
-    variant.checkManifest.dependsOn generateCodeAndResources
+    variant.checkManifest.dependsOn rootProject.generateCodeAndResources
 }
 
 
diff --git a/mobile/android/gradle/preprocessed_resources/build.gradle b/mobile/android/gradle/preprocessed_resources/build.gradle
index 5c3c2b38576..3f5b379f3d6 100644
--- a/mobile/android/gradle/preprocessed_resources/build.gradle
+++ b/mobile/android/gradle/preprocessed_resources/build.gradle
@@ -24,7 +24,7 @@ android {
 }
 
 android.libraryVariants.all { variant ->
-    variant.checkManifest.dependsOn generateCodeAndResources
+    variant.checkManifest.dependsOn rootProject.generateCodeAndResources
 }
 
 dependencies {

From 12c061623afccdb6aa188525c3cd42924146aeb4 Mon Sep 17 00:00:00 2001
From: Nick Alexander <nalexander@mozilla.com>
Date: Thu, 30 Apr 2015 14:28:14 -0700
Subject: [PATCH 55/88] Bug 1160324 - Handle missing robocopApk files in
 runtestsremote.py. r=gbrown

---
 testing/mochitest/runtestsremote.py                     | 8 +++-----
 testing/mozbase/mozlog/mozlog/structured/commandline.py | 2 ++
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/testing/mochitest/runtestsremote.py b/testing/mochitest/runtestsremote.py
index e0192afbb9a..08e84bd40a2 100644
--- a/testing/mochitest/runtestsremote.py
+++ b/testing/mochitest/runtestsremote.py
@@ -492,17 +492,15 @@ def main(args):
     auto.setDeviceManager(dm)
     options = parser.verifyRemoteOptions(options, auto)
 
+    if options is None:
+        raise ValueError("Invalid options specified, use --help for a list of valid options")
+
     mochitest = MochiRemote(auto, dm, options)
 
     log = mochitest.log
     message_logger.logger = log
     mochitest.message_logger = message_logger
 
-    if (options is None):
-        log.error(
-            "Invalid options specified, use --help for a list of valid options")
-        return 1
-
     productPieces = options.remoteProductName.split('.')
     if (productPieces is not None):
         auto.setProduct(productPieces[0])
diff --git a/testing/mozbase/mozlog/mozlog/structured/commandline.py b/testing/mozbase/mozlog/mozlog/structured/commandline.py
index d4a993febe5..2ea9214da36 100644
--- a/testing/mozbase/mozlog/mozlog/structured/commandline.py
+++ b/testing/mozbase/mozlog/mozlog/structured/commandline.py
@@ -179,6 +179,8 @@ def setup_logging(suite, args, defaults=None):
     formatters = defaultdict(list)
     found = False
     found_stdout_logger = False
+    if args is None:
+        args = {}
     if not hasattr(args, 'iteritems'):
         args = vars(args)
 

From 6275c8999f36738741a3aa5cdfe37ede87a1e0e5 Mon Sep 17 00:00:00 2001
From: Richard Marti <richard.marti@gmail.com>
Date: Wed, 22 Apr 2015 20:17:21 +0200
Subject: [PATCH 56/88] Bug 1157389 - In-content pages: Move the spinbutton
 rules from preferences.css to common.css r=mossop

---
 .../preferences/in-content/preferences.css    |  4 ---
 .../preferences/in-content/preferences.css    | 23 --------------
 .../themes/linux/global/in-content/common.css |  4 +++
 .../themes/osx/global/in-content/common.css   | 31 ++++++++++++++++---
 4 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/browser/themes/linux/preferences/in-content/preferences.css b/browser/themes/linux/preferences/in-content/preferences.css
index 83436b9c279..11f22340efd 100644
--- a/browser/themes/linux/preferences/in-content/preferences.css
+++ b/browser/themes/linux/preferences/in-content/preferences.css
@@ -4,10 +4,6 @@
 
 %include ../../../shared/incontentprefs/preferences.inc.css
 
-spinbuttons {
-  -moz-appearance: none;
-}
-
 .treecol-sortdirection {
   /* override the Linux only toolkit rule */
   -moz-appearance: none;
diff --git a/browser/themes/osx/preferences/in-content/preferences.css b/browser/themes/osx/preferences/in-content/preferences.css
index 761841fe476..0ba5d47fb82 100644
--- a/browser/themes/osx/preferences/in-content/preferences.css
+++ b/browser/themes/osx/preferences/in-content/preferences.css
@@ -9,29 +9,6 @@ prefpane .groupbox-title {
   margin-bottom: 0;
 }
 
-spinbuttons {
-  -moz-appearance: none;
-}
-
-.spinbuttons-up {
-  margin-top: 0 !important;
-  border-radius: 4px 4px 0 0;
-}
-
-.spinbuttons-down  {
-  margin-bottom: 0 !important;
-  border-radius: 0 0 4px 4px;
-}
-
-.spinbuttons-button > .button-box {
-  -moz-padding-start: 2px !important;
-  -moz-padding-end: 3px !important;
-}
-
-.spinbuttons-button > .button-box > .button-text {
-  display: none;
-}
-
 .actionsMenu > .menulist-label-box > .menulist-icon {
   margin-top: 2px;
   -moz-margin-start: 2px;
diff --git a/toolkit/themes/linux/global/in-content/common.css b/toolkit/themes/linux/global/in-content/common.css
index e3e19b4778f..fcadd858265 100644
--- a/toolkit/themes/linux/global/in-content/common.css
+++ b/toolkit/themes/linux/global/in-content/common.css
@@ -88,3 +88,7 @@ xul|*.text-link:-moz-focusring,
 xul|*.inline-link:-moz-focusring {
   border: 1px dotted -moz-DialogText;
 }
+
+xul|spinbuttons {
+  -moz-appearance: none;
+}
diff --git a/toolkit/themes/osx/global/in-content/common.css b/toolkit/themes/osx/global/in-content/common.css
index 0017197aa63..3c0d7dfd219 100644
--- a/toolkit/themes/osx/global/in-content/common.css
+++ b/toolkit/themes/osx/global/in-content/common.css
@@ -89,11 +89,34 @@ xul|menulist:-moz-focusring,
 xul|checkbox:-moz-focusring > .checkbox-check,
 xul|radio[focused="true"] > .radio-check,
 xul|tab:-moz-focusring > .tab-middle > .tab-text {
-	outline: 2px solid rgba(0,149,221,0.5);
-	outline-offset: 1px;
-	-moz-outline-radius: 2px;
+  outline: 2px solid rgba(0,149,221,0.5);
+  outline-offset: 1px;
+  -moz-outline-radius: 2px;
 }
 
 xul|radio[focused="true"] > .radio-check {
-	-moz-outline-radius: 100%;
+  -moz-outline-radius: 100%;
+}
+
+xul|spinbuttons {
+  -moz-appearance: none;
+}
+
+xul|*.spinbuttons-up {
+  margin-top: 0 !important;
+  border-radius: 4px 4px 0 0;
+}
+
+xul|*.spinbuttons-down  {
+  margin-bottom: 0 !important;
+  border-radius: 0 0 4px 4px;
+}
+
+xul|*.spinbuttons-button > xul|*.button-box {
+  -moz-padding-start: 2px !important;
+  -moz-padding-end: 3px !important;
+}
+
+xul|*.spinbuttons-button > xul|*.button-box > xul|*.button-text {
+  display: none;
 }

From 76c1834d053670a73030ac28b81851d23f1188d7 Mon Sep 17 00:00:00 2001
From: Richard Marti <richard.marti@gmail.com>
Date: Thu, 30 Apr 2015 21:51:43 +0200
Subject: [PATCH 57/88] Bug 1157143 - In-content pages: Add a disabled state to
 the menu/menuitem rules. r=Dao

---
 .../themes/shared/in-content/common.inc.css   | 28 +++++++++++++------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/toolkit/themes/shared/in-content/common.inc.css b/toolkit/themes/shared/in-content/common.inc.css
index 533f0a87fd1..487e5dadd69 100644
--- a/toolkit/themes/shared/in-content/common.inc.css
+++ b/toolkit/themes/shared/in-content/common.inc.css
@@ -333,20 +333,30 @@ xul|button[type="menu"] > xul|menupopup xul|menuitem {
   -moz-padding-end: 30px;
 }
 
-xul|menulist > xul|menupopup > xul|menu[_moz-menuactive="true"],
-xul|menulist > xul|menupopup > xul|menuitem[_moz-menuactive="true"],
-xul|button[type="menu"] > xul|menupopup > xul|menu[_moz-menuactive="true"],
-xul|button[type="menu"] > xul|menupopup > xul|menuitem[_moz-menuactive="true"] {
+xul|menulist > xul|menupopup > xul|menu:not([disabled="true"])[_moz-menuactive="true"],
+xul|menulist > xul|menupopup > xul|menuitem:not([disabled="true"])[_moz-menuactive="true"],
+xul|button[type="menu"] > xul|menupopup > xul|menu:not([disabled="true"])[_moz-menuactive="true"],
+xul|button[type="menu"] > xul|menupopup > xul|menuitem:not([disabled="true"])[_moz-menuactive="true"] {
   color: #333;
   background-color: rgba(0,149,221,0.25);
 }
 
-xul|menulist > xul|menupopup > xul|menu[selected="true"],
-xul|menulist > xul|menupopup > xul|menuitem[selected="true"],
-xul|button[type="menu"] > xul|menupopup > xul|menu[selected="true"],
-xul|button[type="menu"] > xul|menupopup > xul|menuitem[selected="true"] {
+xul|menulist > xul|menupopup > xul|menu:not([disabled="true"])[selected="true"],
+xul|menulist > xul|menupopup > xul|menuitem:not([disabled="true"])[selected="true"],
+xul|button[type="menu"] > xul|menupopup > xul|menu:not([disabled="true"])[selected="true"],
+xul|button[type="menu"] > xul|menupopup > xul|menuitem:not([disabled="true"])[selected="true"] {
   color: #fff;
-  background-color: #0095DD;
+  background-color: #0095dd;
+}
+
+xul|menulist > xul|menupopup > xul|menu[disabled="true"],
+xul|menulist > xul|menupopup > xul|menuitem[disabled="true"],
+xul|button[type="menu"] > xul|menupopup > xul|menu[disabled="true"],
+xul|button[type="menu"] > xul|menupopup > xul|menuitem[disabled="true"] {
+  color: #999;
+  /* override the [_moz-menuactive="true"] background color from
+     global/menu.css */
+  background-color: transparent;
 }
 
 xul|menulist > xul|menupopup xul|menuseparator,

From 7a457e5ec01af2b0d4c20862316c9a2d7e4b0fcf Mon Sep 17 00:00:00 2001
From: Dave Townsend <dtownsend@oxymoronical.com>
Date: Thu, 30 Apr 2015 16:28:52 -0700
Subject: [PATCH 58/88] Bug 989469: Fix browser_gmpProvider.js to switch views
 correctly. r=spohl

---
 .../test/browser/browser_gmpProvider.js         | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/toolkit/mozapps/extensions/test/browser/browser_gmpProvider.js b/toolkit/mozapps/extensions/test/browser/browser_gmpProvider.js
index 1813df78cb9..8b80e0f3d98 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_gmpProvider.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_gmpProvider.js
@@ -69,10 +69,14 @@ function getInstallItem() {
 }
 
 function openDetailsView(aId) {
+  let view = gManagerWindow.document.getElementById("view-port").selectedPanel
+  Assert.equal(view.id, "list-view", "Should be in the list view to use this function");
+
   let item = get_addon_element(gManagerWindow, aId);
   Assert.ok(item, "Should have got add-on element.");
   is_element_visible(item, "Add-on element should be visible.");
 
+  item.scrollIntoView();
   EventUtils.synthesizeMouseAtCenter(item, { clickCount: 1 }, gManagerWindow);
   EventUtils.synthesizeMouseAtCenter(item, { clickCount: 2 }, gManagerWindow);
 
@@ -165,13 +169,12 @@ add_task(function* testNotInstalledDisabledDetails() {
     el = doc.getElementById("detail-warning");
     is_element_hidden(el, "Warning notification is hidden.");
     el = doc.getElementsByTagName("setting")[0];
+
+    yield gCategoryUtilities.openType("plugin");
   }
 });
 
 add_task(function* testNotInstalled() {
-  Assert.ok(gCategoryUtilities.isTypeVisible("plugin"), "Plugin tab visible.");
-  yield gCategoryUtilities.openType("plugin");
-
   for (let addon of gMockAddons) {
     gPrefs.setBoolPref(getKey(GMPScope.GMPPrefs.KEY_PLUGIN_ENABLED, addon.id), true);
     let item = get_addon_element(gManagerWindow, addon.id);
@@ -208,6 +211,8 @@ add_task(function* testNotInstalledDetails() {
     el = doc.getElementById("detail-warning");
     is_element_visible(el, "Warning notification is visible.");
     el = doc.getElementsByTagName("setting")[0];
+
+    yield gCategoryUtilities.openType("plugin");
   }
 });
 
@@ -218,8 +223,6 @@ add_task(function* testInstalled() {
     gPrefs.setBoolPref(getKey(GMPScope.GMPPrefs.KEY_PLUGIN_AUTOUPDATE, addon.id), false);
     gPrefs.setCharPref(getKey(GMPScope.GMPPrefs.KEY_PLUGIN_VERSION, addon.id), "1.2.3.4");
 
-    yield gCategoryUtilities.openType("plugin");
-
     let item = get_addon_element(gManagerWindow, addon.id);
     Assert.ok(item, "Got add-on element.");
     item.parentNode.ensureElementIsVisible(item);
@@ -269,14 +272,14 @@ add_task(function* testInstalledDetails() {
     let menuSep = doc.getElementById("addonitem-menuseparator");
     is_element_hidden(menuSep, "Menu separator is hidden.");
     contextMenu.hidePopup();
+
+    yield gCategoryUtilities.openType("plugin");
   }
 });
 
 add_task(function* testInstalledGlobalEmeDisabled() {
   gPrefs.setBoolPref(GMPScope.GMPPrefs.KEY_EME_ENABLED, false);
   for (let addon of gMockAddons) {
-    yield gCategoryUtilities.openType("plugin");
-
     let item = get_addon_element(gManagerWindow, addon.id);
     if (addon.isEME) {
       Assert.ok(!item, "Couldn't get add-on element.");

From c1f6768ba4b480518bd7b84520c9611d76e2782e Mon Sep 17 00:00:00 2001
From: Richard Marti <richard.marti@gmail.com>
Date: Fri, 3 Apr 2015 17:00:56 +0200
Subject: [PATCH 59/88] Bug 989469 - Use new style for add-on manager.
 ui-r=mmasalaney r=mossop CLOSED TREE

---
 .../mozapps/extensions/content/extensions.js  |   11 +-
 .../mozapps/extensions/content/extensions.xml |  140 +-
 .../mozapps/extensions/content/extensions.xul | 1109 +++++++--------
 .../test/browser/browser_bug591663.js         |    2 +-
 .../test/browser/browser_details.js           |    8 +-
 .../browser/browser_inlinesettings_info.js    |    4 +
 .../linux/mozapps/extensions/extensions.css   |  899 +-----------
 .../themes/linux/mozapps/extensions/heart.png |  Bin 0 -> 2949 bytes
 toolkit/themes/linux/mozapps/jar.mn           |    5 +-
 .../osx/mozapps/extensions/extensions.css     | 1165 +---------------
 toolkit/themes/osx/mozapps/jar.mn             |    2 +-
 .../shared/extensions/extensions.inc.css      | 1023 ++++++++++++++
 .../themes/shared/extensions/navigation.png   |  Bin 0 -> 663 bytes
 .../windows/mozapps/extensions/extensions.css | 1202 +----------------
 .../windows/mozapps/extensions/navigation.png |  Bin 1411 -> 0 bytes
 toolkit/themes/windows/mozapps/jar.mn         |    2 +-
 16 files changed, 1709 insertions(+), 3863 deletions(-)
 create mode 100644 toolkit/themes/linux/mozapps/extensions/heart.png
 create mode 100644 toolkit/themes/shared/extensions/extensions.inc.css
 create mode 100644 toolkit/themes/shared/extensions/navigation.png
 delete mode 100644 toolkit/themes/windows/mozapps/extensions/navigation.png

diff --git a/toolkit/mozapps/extensions/content/extensions.js b/toolkit/mozapps/extensions/content/extensions.js
index 0aeca0c35d3..378f21790e0 100644
--- a/toolkit/mozapps/extensions/content/extensions.js
+++ b/toolkit/mozapps/extensions/content/extensions.js
@@ -2639,6 +2639,7 @@ var gListView = {
 
   showEmptyNotice: function gListView_showEmptyNotice(aShow) {
     this._emptyNotice.hidden = !aShow;
+    this._listBox.hidden = aShow;
   },
 
   onSortChanged: function gListView_onSortChanged(aSortBy, aAscending) {
@@ -2785,6 +2786,7 @@ var gDetailView = {
       version.hidden = true;
     }
 
+    var screenshotbox = document.getElementById("detail-screenshot-box");
     var screenshot = document.getElementById("detail-screenshot");
     if (aAddon.screenshots && aAddon.screenshots.length > 0) {
       if (aAddon.screenshots[0].thumbnailURL) {
@@ -2797,9 +2799,9 @@ var gDetailView = {
         screenshot.height = aAddon.screenshots[0].height;
       }
       screenshot.setAttribute("loading", "true");
-      screenshot.hidden = false;
+      screenshotbox.hidden = false;
     } else {
-      screenshot.hidden = true;
+      screenshotbox.hidden = true;
     }
 
     var desc = document.getElementById("detail-desc");
@@ -3467,8 +3469,8 @@ var gUpdatesView = {
         self.showEmptyNotice(false);
         self._updateSelected.hidden = true;
 
-        while (self._listBox.itemCount > 0)
-          self._listBox.removeItemAt(0);
+        while (self._listBox.childNodes.length > 0)
+          self._listBox.removeChild(self._listBox.firstChild);
       }
 
       var elements = [];
@@ -3502,6 +3504,7 @@ var gUpdatesView = {
 
   showEmptyNotice: function gUpdatesView_showEmptyNotice(aShow) {
     this._emptyNotice.hidden = !aShow;
+    this._listBox.hidden = aShow;
   },
 
   isManualUpdate: function gUpdatesView_isManualUpdate(aInstall, aOnlyAvailable) {
diff --git a/toolkit/mozapps/extensions/content/extensions.xml b/toolkit/mozapps/extensions/content/extensions.xml
index 372459d3c7d..8b15554e240 100644
--- a/toolkit/mozapps/extensions/content/extensions.xml
+++ b/toolkit/mozapps/extensions/content/extensions.xml
@@ -787,7 +787,7 @@
         <xul:spacer flex="5000"/> <!-- Necessary to allow the message to wrap -->
       </xul:hbox>
 
-      <xul:hbox class="content-container">
+      <xul:hbox class="content-container" align="center">
         <xul:vbox class="icon-container">
           <xul:image anonid="icon" class="icon"/>
         </xul:vbox>
@@ -842,77 +842,77 @@
                             oncommand="document.getBindingParent(this).toggleReleaseNotes();"/>
               </xul:hbox>
             </xul:vbox>
-            <xul:vbox class="status-control-wrapper">
-              <xul:hbox class="status-container">
-                <xul:hbox anonid="checking-update" hidden="true">
-                  <xul:image class="spinner"/>
-                  <xul:label value="&addon.checkingForUpdates.label;"/>
-                </xul:hbox>
-                <xul:vbox anonid="update-available" class="update-available"
-                          hidden="true">
-                  <xul:checkbox anonid="include-update" class="include-update"
-                                label="&addon.includeUpdate.label;" checked="true"
-                                oncommand="document.getBindingParent(this).onIncludeUpdateChanged();"/>
-                  <xul:hbox class="update-info-container">
-                    <xul:label class="update-available-notice"
-                               value="&addon.updateAvailable.label;"/>
-                    <xul:button anonid="update-btn" class="addon-control update"
-                                label="&addon.updateNow.label;"
-                                tooltiptext="&addon.updateNow.tooltip;"
-                                oncommand="document.getBindingParent(this).upgrade();"/>
-                  </xul:hbox>
-                </xul:vbox>
-                <xul:hbox anonid="install-status" class="install-status"
-                          hidden="true"/>
-              </xul:hbox>
-              <xul:hbox anonid="control-container" class="control-container">
-                <xul:button anonid="preferences-btn"
-                            class="addon-control preferences"
-#ifdef XP_WIN
-                            label="&cmd.showPreferencesWin.label;"
-                            tooltiptext="&cmd.showPreferencesWin.tooltip;"
-#else
-                            label="&cmd.showPreferencesUnix.label;"
-                            tooltiptext="&cmd.showPreferencesUnix.tooltip;"
-#endif
-                            oncommand="document.getBindingParent(this).showPreferences();"/>
-                            <!-- label="&cmd.debugAddon.label;" -->
-                <xul:button anonid="debug-btn" class="addon-control debug"
-                            label="&cmd.debugAddon.label;"
-                            oncommand="document.getBindingParent(this).debug();"/>
-
-                <xul:button anonid="enable-btn"  class="addon-control enable"
-                            label="&cmd.enableAddon.label;"
-                            oncommand="document.getBindingParent(this).userDisabled = false;"/>
-                <xul:button anonid="disable-btn" class="addon-control disable"
-                            label="&cmd.disableAddon.label;"
-                            oncommand="document.getBindingParent(this).userDisabled = true;"/>
-                <xul:button anonid="remove-btn" class="addon-control remove"
-                            label="&cmd.uninstallAddon.label;"
-                            oncommand="document.getBindingParent(this).uninstall();"/>
-                <xul:menulist anonid="state-menulist"
-                              class="addon-control state"
-                              tooltiptext="&cmd.stateMenu.tooltip;">
-                  <xul:menupopup>
-                    <xul:menuitem anonid="ask-to-activate-menuitem"
-                                  class="addon-control"
-                                  label="&cmd.askToActivate.label;"
-                                  tooltiptext="&cmd.askToActivate.tooltip;"
-                                  oncommand="document.getBindingParent(this).userDisabled = AddonManager.STATE_ASK_TO_ACTIVATE;"/>
-                    <xul:menuitem anonid="always-activate-menuitem"
-                                  class="addon-control"
-                                  label="&cmd.alwaysActivate.label;"
-                                  tooltiptext="&cmd.alwaysActivate.tooltip;"
-                                  oncommand="document.getBindingParent(this).userDisabled = false;"/>
-                    <xul:menuitem anonid="never-activate-menuitem"
-                                  class="addon-control"
-                                  label="&cmd.neverActivate.label;"
-                                  tooltiptext="&cmd.neverActivate.tooltip;"
-                                  oncommand="document.getBindingParent(this).userDisabled = true;"/>
-                  </xul:menupopup>
-                </xul:menulist>
+          </xul:hbox>
+        </xul:vbox>
+        <xul:vbox class="status-control-wrapper">
+          <xul:hbox class="status-container">
+            <xul:hbox anonid="checking-update" hidden="true">
+              <xul:image class="spinner"/>
+              <xul:label value="&addon.checkingForUpdates.label;"/>
+            </xul:hbox>
+            <xul:vbox anonid="update-available" class="update-available"
+                      hidden="true">
+              <xul:checkbox anonid="include-update" class="include-update"
+                            label="&addon.includeUpdate.label;" checked="true"
+                            oncommand="document.getBindingParent(this).onIncludeUpdateChanged();"/>
+              <xul:hbox class="update-info-container">
+                <xul:label class="update-available-notice"
+                           value="&addon.updateAvailable.label;"/>
+                <xul:button anonid="update-btn" class="addon-control update"
+                            label="&addon.updateNow.label;"
+                            tooltiptext="&addon.updateNow.tooltip;"
+                            oncommand="document.getBindingParent(this).upgrade();"/>
               </xul:hbox>
             </xul:vbox>
+            <xul:hbox anonid="install-status" class="install-status"
+                      hidden="true"/>
+          </xul:hbox>
+          <xul:hbox anonid="control-container" class="control-container">
+            <xul:button anonid="preferences-btn"
+                        class="addon-control preferences"
+#ifdef XP_WIN
+                        label="&cmd.showPreferencesWin.label;"
+                        tooltiptext="&cmd.showPreferencesWin.tooltip;"
+#else
+                        label="&cmd.showPreferencesUnix.label;"
+                        tooltiptext="&cmd.showPreferencesUnix.tooltip;"
+#endif
+                        oncommand="document.getBindingParent(this).showPreferences();"/>
+                        <!-- label="&cmd.debugAddon.label;" -->
+            <xul:button anonid="debug-btn" class="addon-control debug"
+                        label="&cmd.debugAddon.label;"
+                        oncommand="document.getBindingParent(this).debug();"/>
+
+            <xul:button anonid="enable-btn"  class="addon-control enable"
+                        label="&cmd.enableAddon.label;"
+                        oncommand="document.getBindingParent(this).userDisabled = false;"/>
+            <xul:button anonid="disable-btn" class="addon-control disable"
+                        label="&cmd.disableAddon.label;"
+                        oncommand="document.getBindingParent(this).userDisabled = true;"/>
+            <xul:button anonid="remove-btn" class="addon-control remove"
+                        label="&cmd.uninstallAddon.label;"
+                        oncommand="document.getBindingParent(this).uninstall();"/>
+            <xul:menulist anonid="state-menulist"
+                          class="addon-control state"
+                          tooltiptext="&cmd.stateMenu.tooltip;">
+              <xul:menupopup>
+                <xul:menuitem anonid="ask-to-activate-menuitem"
+                              class="addon-control"
+                              label="&cmd.askToActivate.label;"
+                              tooltiptext="&cmd.askToActivate.tooltip;"
+                              oncommand="document.getBindingParent(this).userDisabled = AddonManager.STATE_ASK_TO_ACTIVATE;"/>
+                <xul:menuitem anonid="always-activate-menuitem"
+                              class="addon-control"
+                              label="&cmd.alwaysActivate.label;"
+                              tooltiptext="&cmd.alwaysActivate.tooltip;"
+                              oncommand="document.getBindingParent(this).userDisabled = false;"/>
+                <xul:menuitem anonid="never-activate-menuitem"
+                              class="addon-control"
+                              label="&cmd.neverActivate.label;"
+                              tooltiptext="&cmd.neverActivate.tooltip;"
+                              oncommand="document.getBindingParent(this).userDisabled = true;"/>
+              </xul:menupopup>
+            </xul:menulist>
           </xul:hbox>
         </xul:vbox>
       </xul:hbox>
diff --git a/toolkit/mozapps/extensions/content/extensions.xul b/toolkit/mozapps/extensions/content/extensions.xul
index 33103598407..a2a13468d27 100644
--- a/toolkit/mozapps/extensions/content/extensions.xul
+++ b/toolkit/mozapps/extensions/content/extensions.xul
@@ -119,570 +119,577 @@
     <key id="focusSearch" key="&search.commandkey;" modifiers="accel"
          disabled="true"/>
   </keyset>
-
-  <!-- main header -->
-  <hbox id="header" align="center">
-    <toolbarbutton id="back-btn" class="nav-button header-button" command="cmd_back"
-            tooltiptext="&cmd.back.tooltip;" hidden="true" disabled="true"/>
-    <toolbarbutton id="forward-btn" class="nav-button header-button" command="cmd_forward"
-            tooltiptext="&cmd.forward.tooltip;" hidden="true" disabled="true"/>
-    <spacer flex="1"/>
-    <hbox id="updates-container" align="center">
-      <image class="spinner"/>
-      <label id="updates-noneFound" hidden="true"
-             value="&updates.noneFound.label;"/>
-      <button id="updates-manualUpdatesFound-btn" class="button-link"
-              hidden="true" label="&updates.manualUpdatesFound.label;"
-              command="cmd_goToAvailableUpdates"/>
-      <label id="updates-progress" hidden="true"
-             value="&updates.updating.label;"/>
-      <label id="updates-installed" hidden="true"
-             value="&updates.installed.label;"/>
-      <label id="updates-downloaded" hidden="true"
-             value="&updates.downloaded.label;"/>
-      <button id="updates-restart-btn" class="button-link" hidden="true"
-              label="&updates.restart.label;"
-              command="cmd_restartApp"/>
-    </hbox>
-    <toolbarbutton id="header-utils-btn" class="header-button" type="menu"
-            tooltiptext="&toolsMenu.tooltip;">
-      <menupopup id="utils-menu">
-        <menuitem id="utils-updateNow"
-                  label="&updates.checkForUpdates.label;"
-                  accesskey="&updates.checkForUpdates.accesskey;"
-                  command="cmd_findAllUpdates"/>
-        <menuitem id="utils-viewUpdates"
-                  label="&updates.viewUpdates.label;"
-                  accesskey="&updates.viewUpdates.accesskey;"
-                  command="cmd_goToRecentUpdates"/>
-        <menuseparator id="utils-installFromFile-separator"/>
-        <menuitem id="utils-installFromFile"
-                  label="&installAddonFromFile.label;"
-                  accesskey="&installAddonFromFile.accesskey;"
-                  command="cmd_installFromFile"/>
-        <menuseparator/>
-        <menuitem id="utils-autoUpdateDefault"
-                  label="&updates.updateAddonsAutomatically.label;"
-                  accesskey="&updates.updateAddonsAutomatically.accesskey;"
-                  type="checkbox" autocheck="false"
-                  command="cmd_toggleAutoUpdateDefault"/>
-        <menuitem id="utils-resetAddonUpdatesToAutomatic"
-                  label="&updates.resetUpdatesToAutomatic.label;"
-                  accesskey="&updates.resetUpdatesToAutomatic.accesskey;"
-                  command="cmd_resetAddonAutoUpdate"/>
-        <menuitem id="utils-resetAddonUpdatesToManual"
-                  label="&updates.resetUpdatesToManual.label;"
-                  accesskey="&updates.resetUpdatesToManual.accesskey;"
-                  command="cmd_resetAddonAutoUpdate"/>
-      </menupopup>
-    </toolbarbutton>
-    <textbox id="header-search" type="search" searchbutton="true"
-             searchbuttonlabel="&search.buttonlabel;"
-             placeholder="&search.placeholder;"/>
-  </hbox>
-
   <hbox flex="1">
-
-    <!-- category list -->
-    <richlistbox id="categories">
-      <richlistitem id="category-search" value="addons://search/"
-                    class="category"
-                    name="&view.search.label;" priority="0"
-                    tooltiptext="&view.search.label;" disabled="true"/>
-      <richlistitem id="category-discover" value="addons://discover/"
-                    class="category"
-                    name="&view.discover.label;" priority="1000"
-                    tooltiptext="&view.discover.label;"/>
-      <richlistitem id="category-availableUpdates" value="addons://updates/available"
-                    class="category"
-                    name="&view.availableUpdates.label;" priority="100000"
-                    tooltiptext="&view.availableUpdates.label;"
-                    disabled="true"/>
-      <richlistitem id="category-recentUpdates" value="addons://updates/recent"
-                    class="category"
-                    name="&view.recentUpdates.label;" priority="101000"
-                    tooltiptext="&view.recentUpdates.label;" disabled="true"/>
-    </richlistbox>
-
-    <box id="view-port-container" class="main-content" flex="1">
-
-      <!-- view port -->
-      <deck id="view-port" flex="1" selectedIndex="0">
-
-        <!-- discover view -->
-        <deck id="discover-view" flex="1" class="view-pane" selectedIndex="0" tabindex="0">
-          <vbox id="discover-loading" align="center" pack="stretch" flex="1" class="alert-container">
-            <spacer class="alert-spacer-before"/>
-            <hbox class="alert loading" align="center">
-              <image/>
-              <label value="&loading.label;"/>
-            </hbox>
-            <spacer class="alert-spacer-after"/>
-          </vbox>
-          <vbox id="discover-error" align="center" pack="stretch" flex="1" class="alert-container">
-            <spacer class="alert-spacer-before"/>
-            <hbox>
-              <spacer class="discover-spacer-before"/>
-              <hbox class="alert" align="center">
-                <image class="discover-logo"/>
-                <vbox flex="1" align="stretch">
-                  <label class="discover-title">&discover.title;</label>
-                  <description class="discover-description">&discover.description2;</description>
-                  <description class="discover-footer">&discover.footer;</description>
-                </vbox>
-              </hbox>
-              <spacer class="discover-spacer-after"/>
-            </hbox>
-            <spacer class="alert-spacer-after"/>
-          </vbox>
-          <browser id="discover-browser" type="content" flex="1"
-                   disablehistory="true" homepage="about:blank"/>
-        </deck>
-
-        <!-- search view -->
-        <vbox id="search-view" flex="1" class="view-pane" tabindex="0">
-          <hbox class="view-header global-warning-container" align="center">
-            <!-- global warnings -->
-            <hbox class="global-warning" flex="1">
-              <hbox class="global-warning-safemode" flex="1" align="center"
-                    tooltiptext="&warning.safemode.label;">
-                <image class="warning-icon"/>
-                <label class="global-warning-text" flex="1" crop="end"
-                       value="&warning.safemode.label;"/>
-              </hbox>
-              <hbox class="global-warning-checkcompatibility" flex="1" align="center"
-                    tooltiptext="&warning.checkcompatibility.label;">
-                <image class="warning-icon"/>
-                <label class="global-warning-text" flex="1" crop="end"
-                       value="&warning.checkcompatibility.label;"/>
-              </hbox>
-              <button class="button-link global-warning-checkcompatibility"
-                      label="&warning.checkcompatibility.enable.label;"
-                      tooltiptext="&warning.checkcompatibility.enable.tooltip;"
-                      command="cmd_enableCheckCompatibility"/>
-              <hbox class="global-warning-updatesecurity" flex="1" align="center"
-                    tooltiptext="&warning.updatesecurity.label;">
-                <image class="warning-icon"/>
-                <label class="global-warning-text" flex="1" crop="end"
-                       value="&warning.updatesecurity.label;"/>
-              </hbox>
-              <button class="button-link global-warning-updatesecurity"
-                      label="&warning.updatesecurity.enable.label;"
-                      tooltiptext="&warning.updatesecurity.enable.tooltip;"
-                      command="cmd_enableUpdateSecurity"/>
-              <spacer flex="5000"/> <!-- Necessary to allow the message to wrap -->
-            </hbox>
-            <spacer flex="1"/>
-            <hbox id="search-sorters" class="sort-controls"
-                  showrelevance="true" sortby="relevancescore" ascending="false"/>
-          </hbox>
-          <hbox id="search-filter" align="center">
-            <label id="search-filter-label" value="&search.filter2.label;"/>
-            <radiogroup id="search-filter-radiogroup" orient="horizontal"
-                        align="center" persist="value" value="remote">
-              <radio id="search-filter-local" class="search-filter-radio"
-                     label="&search.filter2.installed.label;" value="local"
-                     tooltiptext="&search.filter2.installed.tooltip;"/>
-              <radio id="search-filter-remote" class="search-filter-radio"
-                     label="&search.filter2.available.label;" value="remote"
-                     tooltiptext="&search.filter2.available.tooltip;"/>
-            </radiogroup>
-          </hbox>
-          <vbox id="search-loading" class="alert-container"
-                flex="1" hidden="true">
-            <spacer class="alert-spacer-before"/>
-            <hbox class="alert loading" align="center">
-              <image/>
-              <label value="&loading.label;"/>
-            </hbox>
-            <spacer class="alert-spacer-after"/>
-          </vbox>
-          <vbox id="search-list-empty" class="alert-container"
-                flex="1" hidden="true">
-            <spacer class="alert-spacer-before"/>
-            <vbox class="alert">
-              <label value="&listEmpty.search.label;"/>
-              <button class="discover-button"
-                      id="discover-button-search"
-                      label="&listEmpty.button.label;"
-                      command="cmd_goToDiscoverPane"/>
-            </vbox>
-            <spacer class="alert-spacer-after"/>
-          </vbox>
-          <richlistbox id="search-list" class="list" flex="1">
-            <hbox pack="center">
-              <label id="search-allresults-link" class="text-link"/>
-            </hbox>
-          </richlistbox>
-        </vbox>
-
-        <!-- list view -->
-        <vbox id="list-view" flex="1" class="view-pane" align="stretch" tabindex="0">
-          <hbox class="view-header global-warning-container">
-            <!-- global warnings -->
-            <hbox class="global-warning" flex="1">
-              <hbox class="global-warning-safemode" flex="1" align="center"
-                    tooltiptext="&warning.safemode.label;">
-                <image class="warning-icon"/>
-                <label class="global-warning-text" flex="1" crop="end"
-                       value="&warning.safemode.label;"/>
-              </hbox>
-              <hbox class="global-warning-checkcompatibility" flex="1" align="center"
-                    tooltiptext="&warning.checkcompatibility.label;">
-                <image class="warning-icon"/>
-                <label class="global-warning-text" flex="1" crop="end"
-                       value="&warning.checkcompatibility.label;"/>
-              </hbox>
-              <button class="button-link global-warning-checkcompatibility"
-                      label="&warning.checkcompatibility.enable.label;"
-                      tooltiptext="&warning.checkcompatibility.enable.tooltip;"
-                      command="cmd_enableCheckCompatibility"/>
-              <hbox class="global-warning-updatesecurity" flex="1" align="center"
-                    tooltiptext="&warning.updatesecurity.label;">
-                <image class="warning-icon"/>
-                <label class="global-warning-text" flex="1" crop="end"
-                       value="&warning.updatesecurity.label;"/>
-              </hbox>
-              <button class="button-link global-warning-updatesecurity"
-                      label="&warning.updatesecurity.enable.label;"
-                      tooltiptext="&warning.updatesecurity.enable.tooltip;"
-                      command="cmd_enableUpdateSecurity"/>
-              <spacer flex="5000"/> <!-- Necessary to allow the message to wrap -->
-            </hbox>
-          </hbox>
-          <hbox class="view-header global-info-container plugin-info-container">
-            <hbox class="global-info" flex="1" align="center">
-              <button class="button-link global-info-plugincheck"
-                      label="&info.plugincheck.label;"
-                      tooltiptext="&info.plugincheck.tooltip;"
-                      command="cmd_pluginCheck"/>
-              <spacer flex="5000"/> <!-- Necessary to allow the message to wrap -->
-            </hbox>
-          </hbox>
-          <hbox class="view-header global-info-container experiment-info-container">
-            <hbox class="global-info" flex="1" align="center">
-              <label value="&experiment.info.label;"/>
-              <button id="experiments-learn-more"
-                      label="&experiment.info.learnmore;"
-                      tooltiptext="&experiment.info.learnmore;"
-                      accesskey="&experiment.info.learnmore.accesskey;"
-                      command="cmd_experimentsLearnMore"/>
-              <button id="experiments-change-telemetry"
-                      label="&experiment.info.changetelemetry;"
-                      tooltiptext="&experiment.info.changetelemetry;"
-                      accesskey="&experiment.info.changetelemetry.accesskey;"
-                      command="cmd_experimentsOpenTelemetryPreferences"/>
-              <spacer flex="5000"/> <!-- Necessary to allow the message to wrap. -->
-            </hbox>
-          </hbox>
-          <vbox id="addon-list-empty" class="alert-container"
-                flex="1" hidden="true">
-            <spacer class="alert-spacer-before"/>
-            <vbox class="alert">
-              <label value="&listEmpty.installed.label;"/>
-              <button class="discover-button"
-                      id="discover-button-install"
-                      label="&listEmpty.button.label;"
-                      command="cmd_goToDiscoverPane"/>
-            </vbox>
-            <spacer class="alert-spacer-after"/>
-          </vbox>
-          <richlistbox id="addon-list" class="list" flex="1"/>
-        </vbox>
-
-        <!-- updates view -->
-        <vbox id="updates-view" flex="1" class="view-pane" tabindex="0">
-          <hbox class="view-header global-warning-container" align="center">
-            <!-- global warnings -->
-            <hbox class="global-warning" flex="1">
-              <hbox class="global-warning-safemode" flex="1" align="center"
-                    tooltiptext="&warning.safemode.label;">
-                <image class="warning-icon"/>
-                <label class="global-warning-text" flex="1" crop="end"
-                       value="&warning.safemode.label;"/>
-              </hbox>
-              <hbox class="global-warning-checkcompatibility" flex="1" align="center"
-                    tooltiptext="&warning.checkcompatibility.label;">
-                <image class="warning-icon"/>
-                <label class="global-warning-text" flex="1" crop="end"
-                       value="&warning.checkcompatibility.label;"/>
-              </hbox>
-              <button class="button-link global-warning-checkcompatibility"
-                      label="&warning.checkcompatibility.enable.label;"
-                      tooltiptext="&warning.checkcompatibility.enable.tooltip;"
-                      command="cmd_enableCheckCompatibility"/>
-              <hbox class="global-warning-updatesecurity" flex="1" align="center"
-                    tooltiptext="&warning.updatesecurity.label;">
-                <image class="warning-icon"/>
-                <label class="global-warning-text" flex="1" crop="end"
-                       value="&warning.updatesecurity.label;"/>
-              </hbox>
-              <button class="button-link global-warning-updatesecurity"
-                      label="&warning.updatesecurity.enable.label;"
-                      tooltiptext="&warning.updatesecurity.enable.tooltip;"
-                      command="cmd_enableUpdateSecurity"/>
-              <spacer flex="5000"/> <!-- Necessary to allow the message to wrap -->
-            </hbox>
-            <spacer flex="1"/>
-            <hbox id="updates-sorters" class="sort-controls" sortby="updateDate"
-                  ascending="false"/>
-          </hbox>
-          <vbox id="updates-list-empty" class="alert-container"
-                flex="1" hidden="true">
-            <spacer class="alert-spacer-before"/>
-            <vbox class="alert">
-              <label id="empty-availableUpdates-msg" value="&listEmpty.availableUpdates.label;"/>
-              <label id="empty-recentUpdates-msg" value="&listEmpty.recentUpdates.label;"/>
-              <button label="&listEmpty.findUpdates.label;"
+    <vbox>
+      <hbox id="nav-header"
+            align="center"
+            pack="center">
+        <toolbarbutton id="back-btn"
+                       class="nav-button header-button"
+                       command="cmd_back"
+                       tooltiptext="&cmd.back.tooltip;"
+                       hidden="true"
+                       disabled="true"/>
+        <toolbarbutton id="forward-btn"
+                       class="nav-button header-button"
+                       command="cmd_forward"
+                       tooltiptext="&cmd.forward.tooltip;"
+                       hidden="true"
+                       disabled="true"/>
+      </hbox>
+      <!-- category list -->
+      <richlistbox id="categories" flex="1">
+        <richlistitem id="category-search" value="addons://search/"
+                      class="category"
+                      name="&view.search.label;" priority="0"
+                      tooltiptext="&view.search.label;" disabled="true"/>
+        <richlistitem id="category-discover" value="addons://discover/"
+                      class="category"
+                      name="&view.discover.label;" priority="1000"
+                      tooltiptext="&view.discover.label;"/>
+        <richlistitem id="category-availableUpdates" value="addons://updates/available"
+                      class="category"
+                      name="&view.availableUpdates.label;" priority="100000"
+                      tooltiptext="&view.availableUpdates.label;"
+                      disabled="true"/>
+        <richlistitem id="category-recentUpdates" value="addons://updates/recent"
+                      class="category"
+                      name="&view.recentUpdates.label;" priority="101000"
+                      tooltiptext="&view.recentUpdates.label;" disabled="true"/>
+      </richlistbox>
+    </vbox>
+    <vbox flex="1">
+      <!-- main header -->
+      <hbox id="header" align="center">
+        <spacer flex="1"/>
+        <hbox id="updates-container" align="center">
+          <image class="spinner"/>
+          <label id="updates-noneFound" hidden="true"
+                 value="&updates.noneFound.label;"/>
+          <button id="updates-manualUpdatesFound-btn" class="button-link"
+                  hidden="true" label="&updates.manualUpdatesFound.label;"
+                  command="cmd_goToAvailableUpdates"/>
+          <label id="updates-progress" hidden="true"
+                 value="&updates.updating.label;"/>
+          <label id="updates-installed" hidden="true"
+                 value="&updates.installed.label;"/>
+          <label id="updates-downloaded" hidden="true"
+                 value="&updates.downloaded.label;"/>
+          <button id="updates-restart-btn" class="button-link" hidden="true"
+                  label="&updates.restart.label;"
+                  command="cmd_restartApp"/>
+        </hbox>
+        <toolbarbutton id="header-utils-btn" class="header-button" type="menu"
+                tooltiptext="&toolsMenu.tooltip;">
+          <menupopup id="utils-menu">
+            <menuitem id="utils-updateNow"
+                      label="&updates.checkForUpdates.label;"
+                      accesskey="&updates.checkForUpdates.accesskey;"
                       command="cmd_findAllUpdates"/>
-            </vbox>
-            <spacer class="alert-spacer-after"/>
-          </vbox>
-          <hbox id="update-actions" pack="center">
-            <button id="update-selected-btn" hidden="true"
-                    label="&updates.updateSelected.label;"
-                    tooltiptext="&updates.updateSelected.tooltip;"/>
-          </hbox>
-          <richlistbox id="updates-list" class="list" flex="1"/>
-        </vbox>
+            <menuitem id="utils-viewUpdates"
+                      label="&updates.viewUpdates.label;"
+                      accesskey="&updates.viewUpdates.accesskey;"
+                      command="cmd_goToRecentUpdates"/>
+            <menuseparator id="utils-installFromFile-separator"/>
+            <menuitem id="utils-installFromFile"
+                      label="&installAddonFromFile.label;"
+                      accesskey="&installAddonFromFile.accesskey;"
+                      command="cmd_installFromFile"/>
+            <menuseparator/>
+            <menuitem id="utils-autoUpdateDefault"
+                      label="&updates.updateAddonsAutomatically.label;"
+                      accesskey="&updates.updateAddonsAutomatically.accesskey;"
+                      type="checkbox" autocheck="false"
+                      command="cmd_toggleAutoUpdateDefault"/>
+            <menuitem id="utils-resetAddonUpdatesToAutomatic"
+                      label="&updates.resetUpdatesToAutomatic.label;"
+                      accesskey="&updates.resetUpdatesToAutomatic.accesskey;"
+                      command="cmd_resetAddonAutoUpdate"/>
+            <menuitem id="utils-resetAddonUpdatesToManual"
+                      label="&updates.resetUpdatesToManual.label;"
+                      accesskey="&updates.resetUpdatesToManual.accesskey;"
+                      command="cmd_resetAddonAutoUpdate"/>
+          </menupopup>
+        </toolbarbutton>
+        <textbox id="header-search" type="search" searchbutton="true"
+                 searchbuttonlabel="&search.buttonlabel;"
+                 placeholder="&search.placeholder;"/>
+      </hbox>
+      <box id="view-port-container" class="main-content" flex="1">
+        <!-- view port -->
+        <deck id="view-port" flex="1" selectedIndex="0">
 
-        <!-- detail view -->
-        <scrollbox id="detail-view" flex="1" class="view-pane addon-view" orient="vertical" tabindex="0"
-                   role="document">
-          <!-- global warnings -->
-          <hbox class="global-warning-container global-warning">
-            <hbox class="global-warning-safemode" flex="1" align="center"
-                  tooltiptext="&warning.safemode.label;">
-              <image class="warning-icon"/>
-              <label class="global-warning-text" flex="1" crop="end"
-                     value="&warning.safemode.label;"/>
-            </hbox>
-            <hbox class="global-warning-checkcompatibility" flex="1" align="center"
-                  tooltiptext="&warning.checkcompatibility.label;">
-              <image class="warning-icon"/>
-              <label class="global-warning-text" flex="1" crop="end"
-                     value="&warning.checkcompatibility.label;"/>
-            </hbox>
-            <button class="button-link global-warning-checkcompatibility"
-                    label="&warning.checkcompatibility.enable.label;"
-                    tooltiptext="&warning.checkcompatibility.enable.tooltip;"
-                    command="cmd_enableCheckCompatibility"/>
-            <hbox class="global-warning-updatesecurity" flex="1" align="center"
-                  tooltiptext="&warning.updatesecurity.label;">
-              <image class="warning-icon"/>
-              <label class="global-warning-text" flex="1" crop="end"
-                     value="&warning.updatesecurity.label;"/>
-            </hbox>
-            <button class="button-link global-warning-updatesecurity"
-                    label="&warning.updatesecurity.enable.label;"
-                    tooltiptext="&warning.updatesecurity.enable.tooltip;"
-                    command="cmd_enableUpdateSecurity"/>
-            <spacer flex="5000"/> <!-- Necessary to allow the message to wrap -->
-          </hbox>
-          <hbox flex="1">
-            <spacer flex="1"/>
-            <!-- "loading" splash screen -->
-            <vbox class="alert-container">
+          <!-- discover view -->
+          <deck id="discover-view" flex="1" class="view-pane" selectedIndex="0" tabindex="0">
+            <vbox id="discover-loading" align="center" pack="stretch" flex="1" class="alert-container">
               <spacer class="alert-spacer-before"/>
-              <hbox class="alert loading">
+              <hbox class="alert loading" align="center">
                 <image/>
                 <label value="&loading.label;"/>
               </hbox>
               <spacer class="alert-spacer-after"/>
             </vbox>
-            <!-- actual detail view -->
-            <vbox class="detail-view-container" flex="3" contextmenu="addonitem-popup">
-              <vbox id="detail-notifications">
-                <hbox id="warning-container" align="center" class="warning">
+            <vbox id="discover-error" align="center" pack="stretch" flex="1" class="alert-container">
+              <spacer class="alert-spacer-before"/>
+              <hbox>
+                <spacer class="discover-spacer-before"/>
+                <hbox class="alert" align="center">
+                  <image class="discover-logo"/>
+                  <vbox flex="1" align="stretch">
+                    <label class="discover-title">&discover.title;</label>
+                    <description class="discover-description">&discover.description2;</description>
+                    <description class="discover-footer">&discover.footer;</description>
+                  </vbox>
+                </hbox>
+                <spacer class="discover-spacer-after"/>
+              </hbox>
+              <spacer class="alert-spacer-after"/>
+            </vbox>
+            <browser id="discover-browser" type="content" flex="1"
+                     disablehistory="true" homepage="about:blank"/>
+          </deck>
+
+          <!-- search view -->
+          <vbox id="search-view" flex="1" class="view-pane" tabindex="0">
+            <hbox class="view-header global-warning-container" align="center">
+              <!-- global warnings -->
+              <hbox class="global-warning" flex="1">
+                <hbox class="global-warning-safemode" flex="1" align="center"
+                      tooltiptext="&warning.safemode.label;">
                   <image class="warning-icon"/>
-                  <label id="detail-warning" flex="1"/>
-                  <label id="detail-warning-link" class="text-link"/>
-                  <spacer flex="5000"/> <!-- Necessary to allow the message to wrap -->
+                  <label class="global-warning-text" flex="1" crop="end"
+                         value="&warning.safemode.label;"/>
                 </hbox>
-                <hbox id="error-container" align="center" class="error">
-                  <image class="error-icon"/>
-                  <label id="detail-error" flex="1"/>
-                  <label id="detail-error-link" class="text-link"/>
-                  <spacer flex="5000"/> <!-- Necessary to allow the message to wrap -->
+                <hbox class="global-warning-checkcompatibility" flex="1" align="center"
+                      tooltiptext="&warning.checkcompatibility.label;">
+                  <image class="warning-icon"/>
+                  <label class="global-warning-text" flex="1" crop="end"
+                         value="&warning.checkcompatibility.label;"/>
                 </hbox>
-                <hbox id="pending-container" align="center" class="pending">
-                  <image class="pending-icon"/>
-                  <label id="detail-pending" flex="1"/>
-                  <button id="detail-restart-btn" class="button-link"
-                          label="&addon.restartNow.label;"
-                          command="cmd_restartApp"/>
-                  <button id="detail-undo-btn" class="button-link"
-                          label="&addon.undoAction.label;"
-                          tooltipText="&addon.undoAction.tooltip;"
-                          command="cmd_cancelOperation"/>
-                  <spacer flex="5000"/> <!-- Necessary to allow the message to wrap -->
+                <button class="button-link global-warning-checkcompatibility"
+                        label="&warning.checkcompatibility.enable.label;"
+                        tooltiptext="&warning.checkcompatibility.enable.tooltip;"
+                        command="cmd_enableCheckCompatibility"/>
+                <hbox class="global-warning-updatesecurity" flex="1" align="center"
+                      tooltiptext="&warning.updatesecurity.label;">
+                  <image class="warning-icon"/>
+                  <label class="global-warning-text" flex="1" crop="end"
+                         value="&warning.updatesecurity.label;"/>
+                </hbox>
+                <button class="button-link global-warning-updatesecurity"
+                        label="&warning.updatesecurity.enable.label;"
+                        tooltiptext="&warning.updatesecurity.enable.tooltip;"
+                        command="cmd_enableUpdateSecurity"/>
+                <spacer flex="5000"/> <!-- Necessary to allow the message to wrap -->
+              </hbox>
+              <spacer flex="1"/>
+              <hbox id="search-sorters" class="sort-controls"
+                    showrelevance="true" sortby="relevancescore" ascending="false"/>
+            </hbox>
+            <hbox id="search-filter" align="center">
+              <label id="search-filter-label" value="&search.filter2.label;"/>
+              <radiogroup id="search-filter-radiogroup" orient="horizontal"
+                          align="center" persist="value" value="remote">
+                <radio id="search-filter-local" class="search-filter-radio"
+                       label="&search.filter2.installed.label;" value="local"
+                       tooltiptext="&search.filter2.installed.tooltip;"/>
+                <radio id="search-filter-remote" class="search-filter-radio"
+                       label="&search.filter2.available.label;" value="remote"
+                       tooltiptext="&search.filter2.available.tooltip;"/>
+              </radiogroup>
+            </hbox>
+            <vbox id="search-loading" class="alert-container"
+                  flex="1" hidden="true">
+              <spacer class="alert-spacer-before"/>
+              <hbox class="alert loading" align="center">
+                <image/>
+                <label value="&loading.label;"/>
+              </hbox>
+              <spacer class="alert-spacer-after"/>
+            </vbox>
+            <vbox id="search-list-empty" class="alert-container"
+                  flex="1" hidden="true">
+              <spacer class="alert-spacer-before"/>
+              <vbox class="alert">
+                <label value="&listEmpty.search.label;"/>
+                <button class="discover-button"
+                        id="discover-button-search"
+                        label="&listEmpty.button.label;"
+                        command="cmd_goToDiscoverPane"/>
+              </vbox>
+              <spacer class="alert-spacer-after"/>
+            </vbox>
+            <richlistbox id="search-list" class="list" flex="1">
+              <hbox pack="center">
+                <label id="search-allresults-link" class="text-link"/>
+              </hbox>
+            </richlistbox>
+          </vbox>
+
+          <!-- list view -->
+          <vbox id="list-view" flex="1" class="view-pane" align="stretch" tabindex="0">
+            <hbox class="view-header global-warning-container">
+              <!-- global warnings -->
+              <hbox class="global-warning" flex="1">
+                <hbox class="global-warning-safemode" flex="1" align="center"
+                      tooltiptext="&warning.safemode.label;">
+                  <image class="warning-icon"/>
+                  <label class="global-warning-text" flex="1" crop="end"
+                         value="&warning.safemode.label;"/>
+                </hbox>
+                <hbox class="global-warning-checkcompatibility" flex="1" align="center"
+                      tooltiptext="&warning.checkcompatibility.label;">
+                  <image class="warning-icon"/>
+                  <label class="global-warning-text" flex="1" crop="end"
+                         value="&warning.checkcompatibility.label;"/>
+                </hbox>
+                <button class="button-link global-warning-checkcompatibility"
+                        label="&warning.checkcompatibility.enable.label;"
+                        tooltiptext="&warning.checkcompatibility.enable.tooltip;"
+                        command="cmd_enableCheckCompatibility"/>
+                <hbox class="global-warning-updatesecurity" flex="1" align="center"
+                      tooltiptext="&warning.updatesecurity.label;">
+                  <image class="warning-icon"/>
+                  <label class="global-warning-text" flex="1" crop="end"
+                         value="&warning.updatesecurity.label;"/>
+                </hbox>
+                <button class="button-link global-warning-updatesecurity"
+                        label="&warning.updatesecurity.enable.label;"
+                        tooltiptext="&warning.updatesecurity.enable.tooltip;"
+                        command="cmd_enableUpdateSecurity"/>
+                <spacer flex="5000"/> <!-- Necessary to allow the message to wrap -->
+              </hbox>
+            </hbox>
+            <hbox class="view-header global-info-container plugin-info-container">
+              <hbox class="global-info" flex="1" align="center">
+                <button class="button-link global-info-plugincheck"
+                        label="&info.plugincheck.label;"
+                        tooltiptext="&info.plugincheck.tooltip;"
+                        command="cmd_pluginCheck"/>
+                <spacer flex="5000"/> <!-- Necessary to allow the message to wrap -->
+              </hbox>
+            </hbox>
+            <hbox class="view-header global-info-container experiment-info-container">
+              <hbox class="global-info" flex="1" align="center">
+                <label value="&experiment.info.label;"/>
+                <button id="experiments-learn-more"
+                        label="&experiment.info.learnmore;"
+                        tooltiptext="&experiment.info.learnmore;"
+                        accesskey="&experiment.info.learnmore.accesskey;"
+                        command="cmd_experimentsLearnMore"/>
+                <button id="experiments-change-telemetry"
+                        label="&experiment.info.changetelemetry;"
+                        tooltiptext="&experiment.info.changetelemetry;"
+                        accesskey="&experiment.info.changetelemetry.accesskey;"
+                        command="cmd_experimentsOpenTelemetryPreferences"/>
+                <spacer flex="5000"/> <!-- Necessary to allow the message to wrap. -->
+              </hbox>
+            </hbox>
+            <vbox id="addon-list-empty" class="alert-container"
+                  flex="1" hidden="true">
+              <spacer class="alert-spacer-before"/>
+              <vbox class="alert">
+                <label value="&listEmpty.installed.label;"/>
+                <button class="discover-button"
+                        id="discover-button-install"
+                        label="&listEmpty.button.label;"
+                        command="cmd_goToDiscoverPane"/>
+              </vbox>
+              <spacer class="alert-spacer-after"/>
+            </vbox>
+            <richlistbox id="addon-list" class="list" flex="1"/>
+          </vbox>
+          <!-- updates view -->
+          <vbox id="updates-view" flex="1" class="view-pane" tabindex="0">
+            <hbox class="view-header global-warning-container" align="center">
+              <!-- global warnings -->
+              <hbox class="global-warning" flex="1">
+                <hbox class="global-warning-safemode" flex="1" align="center"
+                      tooltiptext="&warning.safemode.label;">
+                  <image class="warning-icon"/>
+                  <label class="global-warning-text" flex="1" crop="end"
+                         value="&warning.safemode.label;"/>
+                </hbox>
+                <hbox class="global-warning-checkcompatibility" flex="1" align="center"
+                      tooltiptext="&warning.checkcompatibility.label;">
+                  <image class="warning-icon"/>
+                  <label class="global-warning-text" flex="1" crop="end"
+                         value="&warning.checkcompatibility.label;"/>
+                </hbox>
+                <button class="button-link global-warning-checkcompatibility"
+                        label="&warning.checkcompatibility.enable.label;"
+                        tooltiptext="&warning.checkcompatibility.enable.tooltip;"
+                        command="cmd_enableCheckCompatibility"/>
+                <hbox class="global-warning-updatesecurity" flex="1" align="center"
+                      tooltiptext="&warning.updatesecurity.label;">
+                  <image class="warning-icon"/>
+                  <label class="global-warning-text" flex="1" crop="end"
+                         value="&warning.updatesecurity.label;"/>
+                </hbox>
+                <button class="button-link global-warning-updatesecurity"
+                        label="&warning.updatesecurity.enable.label;"
+                        tooltiptext="&warning.updatesecurity.enable.tooltip;"
+                        command="cmd_enableUpdateSecurity"/>
+                <spacer flex="5000"/> <!-- Necessary to allow the message to wrap -->
+              </hbox>
+              <spacer flex="1"/>
+              <hbox id="updates-sorters" class="sort-controls" sortby="updateDate"
+                    ascending="false"/>
+            </hbox>
+            <vbox id="updates-list-empty" class="alert-container"
+                  flex="1" hidden="true">
+              <spacer class="alert-spacer-before"/>
+              <vbox class="alert">
+                <label id="empty-availableUpdates-msg" value="&listEmpty.availableUpdates.label;"/>
+                <label id="empty-recentUpdates-msg" value="&listEmpty.recentUpdates.label;"/>
+                <button label="&listEmpty.findUpdates.label;"
+                        command="cmd_findAllUpdates"/>
+              </vbox>
+              <spacer class="alert-spacer-after"/>
+            </vbox>
+            <hbox id="update-actions" pack="center">
+              <button id="update-selected-btn" hidden="true"
+                      label="&updates.updateSelected.label;"
+                      tooltiptext="&updates.updateSelected.tooltip;"/>
+            </hbox>
+            <richlistbox id="updates-list" class="list" flex="1"/>
+          </vbox>
+
+          <!-- detail view -->
+          <scrollbox id="detail-view" flex="1" class="view-pane addon-view" orient="vertical" tabindex="0"
+                     role="document">
+            <!-- global warnings -->
+            <hbox class="global-warning-container global-warning">
+              <hbox class="global-warning-safemode" flex="1" align="center"
+                    tooltiptext="&warning.safemode.label;">
+                <image class="warning-icon"/>
+                <label class="global-warning-text" flex="1" crop="end"
+                       value="&warning.safemode.label;"/>
+              </hbox>
+              <hbox class="global-warning-checkcompatibility" flex="1" align="center"
+                    tooltiptext="&warning.checkcompatibility.label;">
+                <image class="warning-icon"/>
+                <label class="global-warning-text" flex="1" crop="end"
+                       value="&warning.checkcompatibility.label;"/>
+              </hbox>
+              <button class="button-link global-warning-checkcompatibility"
+                      label="&warning.checkcompatibility.enable.label;"
+                      tooltiptext="&warning.checkcompatibility.enable.tooltip;"
+                      command="cmd_enableCheckCompatibility"/>
+              <hbox class="global-warning-updatesecurity" flex="1" align="center"
+                    tooltiptext="&warning.updatesecurity.label;">
+                <image class="warning-icon"/>
+                <label class="global-warning-text" flex="1" crop="end"
+                       value="&warning.updatesecurity.label;"/>
+              </hbox>
+              <button class="button-link global-warning-updatesecurity"
+                      label="&warning.updatesecurity.enable.label;"
+                      tooltiptext="&warning.updatesecurity.enable.tooltip;"
+                      command="cmd_enableUpdateSecurity"/>
+              <spacer flex="5000"/> <!-- Necessary to allow the message to wrap -->
+            </hbox>
+            <hbox flex="1">
+              <spacer flex="1"/>
+              <!-- "loading" splash screen -->
+              <vbox class="alert-container">
+                <spacer class="alert-spacer-before"/>
+                <hbox class="alert loading">
+                  <image/>
+                  <label value="&loading.label;"/>
+                </hbox>
+                <spacer class="alert-spacer-after"/>
+              </vbox>
+              <!-- actual detail view -->
+              <vbox class="detail-view-container" flex="3" contextmenu="addonitem-popup">
+                <vbox id="detail-notifications">
+                  <hbox id="warning-container" align="center" class="warning">
+                    <image class="warning-icon"/>
+                    <label id="detail-warning" flex="1"/>
+                    <label id="detail-warning-link" class="text-link"/>
+                    <spacer flex="5000"/> <!-- Necessary to allow the message to wrap -->
+                  </hbox>
+                  <hbox id="error-container" align="center" class="error">
+                    <image class="error-icon"/>
+                    <label id="detail-error" flex="1"/>
+                    <label id="detail-error-link" class="text-link"/>
+                    <spacer flex="5000"/> <!-- Necessary to allow the message to wrap -->
+                  </hbox>
+                  <hbox id="pending-container" align="center" class="pending">
+                    <image class="pending-icon"/>
+                    <label id="detail-pending" flex="1"/>
+                    <button id="detail-restart-btn" class="button-link"
+                            label="&addon.restartNow.label;"
+                            command="cmd_restartApp"/>
+                    <button id="detail-undo-btn" class="button-link"
+                            label="&addon.undoAction.label;"
+                            tooltipText="&addon.undoAction.tooltip;"
+                            command="cmd_cancelOperation"/>
+                    <spacer flex="5000"/> <!-- Necessary to allow the message to wrap -->
+                  </hbox>
+                </vbox>
+                <hbox align="start">
+                  <vbox id="detail-icon-container" align="end">
+                    <image id="detail-icon" class="icon"/>
+                  </vbox>
+                  <vbox flex="1">
+                    <vbox id="detail-summary">
+                      <hbox id="detail-name-container" class="name-container"
+                            align="start">
+                        <label id="detail-name" flex="1"/>
+                        <label id="detail-version"/>
+                        <label class="disabled-postfix" value="&addon.disabled.postfix;"/>
+                        <label class="update-postfix" value="&addon.update.postfix;"/>
+                        <spacer flex="5000"/> <!-- Necessary to allow the name to wrap -->
+                      </hbox>
+                      <label id="detail-creator" class="creator"/>
+                    </vbox>
+                    <hbox id="detail-experiment-container">
+                      <svg width="8" height="8" viewBox="0 0 8 8" version="1.1"
+                           xmlns="http://www.w3.org/2000/svg"
+                           id="detail-experiment-bullet-container">
+                        <circle cx="4" cy="4" r="4" id="detail-experiment-bullet"/>
+                      </svg>
+                      <label id="detail-experiment-state"/>
+                      <label id="detail-experiment-time"/>
+                    </hbox>
+                    <hbox id="detail-desc-container" align="start">
+                      <vbox id="detail-screenshot-box" pack="center" hidden="true"> <!-- Necessary to work around bug 394738 -->
+                        <image id="detail-screenshot"/>
+                      </vbox>
+                      <vbox flex="1">
+                        <description id="detail-desc"/>
+                        <description id="detail-fulldesc"/>
+                      </vbox>
+                    </hbox>
+                    <vbox id="detail-contributions">
+                      <description id="detail-contrib-description">
+                        &detail.contributions.description;
+                      </description>
+                      <hbox align="center">
+                        <label id="detail-contrib-suggested"/>
+                        <spacer flex="1"/>
+                        <button id="detail-contrib-btn"
+                                label="&cmd.contribute.label;"
+                                accesskey="&cmd.contribute.accesskey;"
+                                tooltiptext="&cmd.contribute.tooltip;"
+                                command="cmd_contribute"/>
+                      </hbox>
+                    </vbox>
+                    <grid id="detail-grid">
+                      <columns>
+                         <column flex="1"/>
+                         <column flex="2"/>
+                      </columns>
+                      <rows id="detail-rows">
+                        <row class="detail-row-complex" id="detail-updates-row">
+                          <label class="detail-row-label" value="&detail.updateType;"/>
+                          <hbox align="center">
+                            <radiogroup id="detail-autoUpdate" orient="horizontal">
+                              <!-- The values here need to match the values of
+                                   AddonManager.AUTOUPDATE_* -->
+                              <radio label="&detail.updateDefault.label;"
+                                     tooltiptext="&detail.updateDefault.tooltip;"
+                                     value="1"/>
+                              <radio label="&detail.updateAutomatic.label;"
+                                     tooltiptext="&detail.updateAutomatic.tooltip;"
+                                     value="2"/>
+                              <radio label="&detail.updateManual.label;"
+                                     tooltiptext="&detail.updateManual.tooltip;"
+                                     value="0"/>
+                            </radiogroup>
+                            <button id="detail-findUpdates-btn" class="button-link"
+                                    label="&detail.checkForUpdates.label;"
+                                    accesskey="&detail.checkForUpdates.accesskey;"
+                                    tooltiptext="&detail.checkForUpdates.tooltip;"
+                                    command="cmd_findItemUpdates"/>
+                          </hbox>
+                        </row>
+                        <row class="detail-row" id="detail-dateUpdated" label="&detail.lastupdated.label;"/>
+                        <row class="detail-row-complex" id="detail-homepage-row" label="&detail.home;">
+                          <label class="detail-row-label" value="&detail.home;"/>
+                          <label id="detail-homepage" class="detail-row-value text-link" crop="end"/>
+                        </row>
+                        <row class="detail-row-complex" id="detail-repository-row" label="&detail.repository;">
+                          <label class="detail-row-label" value="&detail.repository;"/>
+                          <label id="detail-repository" class="detail-row-value text-link"/>
+                        </row>
+                        <row class="detail-row" id="detail-size" label="&detail.size;"/>
+                        <row class="detail-row-complex" id="detail-rating-row">
+                          <label class="detail-row-label" value="&rating2.label;"/>
+                          <hbox>
+                            <label id="detail-rating" class="meta-value meta-rating"
+                                   showrating="average"/>
+                            <label id="detail-reviews" class="text-link"/>
+                          </hbox>
+                        </row>
+                        <row class="detail-row" id="detail-downloads" label="&detail.numberOfDownloads.label;"/>
+                      </rows>
+                    </grid>
+                    <hbox id="detail-controls">
+                      <button id="detail-prefs-btn" class="addon-control preferences"
+#ifdef XP_WIN
+                              label="&detail.showPreferencesWin.label;"
+                              accesskey="&detail.showPreferencesWin.accesskey;"
+                              tooltiptext="&detail.showPreferencesWin.tooltip;"
+#else
+                              label="&detail.showPreferencesUnix.label;"
+                              accesskey="&detail.showPreferencesUnix.accesskey;"
+                              tooltiptext="&detail.showPreferencesUnix.tooltip;"
+#endif
+                              command="cmd_showItemPreferences"/>
+                      <spacer flex="1"/>
+                      <button id="detail-debug-btn" class="addon-control debug"
+                              label="&cmd.debugAddon.label;"
+                              accesskey="&cmd.debugAddon.accesskey;"
+                              command="cmd_debugItem" />
+                      <button id="detail-enable-btn" class="addon-control enable"
+                              label="&cmd.enableAddon.label;"
+                              accesskey="&cmd.enableAddon.accesskey;"
+                              command="cmd_enableItem"/>
+                      <button id="detail-disable-btn" class="addon-control disable"
+                              label="&cmd.disableAddon.label;"
+                              accesskey="&cmd.disableAddon.accesskey;"
+                              command="cmd_disableItem"/>
+                      <button id="detail-uninstall-btn" class="addon-control remove"
+                              label="&cmd.uninstallAddon.label;"
+                              accesskey="&cmd.uninstallAddon.accesskey;"
+                              command="cmd_uninstallItem"/>
+                      <button id="detail-purchase-btn" class="addon-control purchase"
+                              command="cmd_purchaseItem"/>
+                      <button id="detail-install-btn" class="addon-control install"
+                              label="&cmd.installAddon.label;"
+                              accesskey="&cmd.installAddon.accesskey;"
+                              command="cmd_installItem"/>
+                      <menulist id="detail-state-menulist"
+                                crop="none" sizetopopup="always"
+                                tooltiptext="&cmd.stateMenu.tooltip;">
+                        <menupopup>
+                          <menuitem id="detail-ask-to-activate-menuitem"
+                                    class="addon-control"
+                                    label="&cmd.askToActivate.label;"
+                                    tooltiptext="&cmd.askToActivate.tooltip;"
+                                    command="cmd_askToActivateItem"/>
+                          <menuitem id="detail-always-activate-menuitem"
+                                    class="addon-control"
+                                    label="&cmd.alwaysActivate.label;"
+                                    tooltiptext="&cmd.alwaysActivate.tooltip;"
+                                    command="cmd_alwaysActivateItem"/>
+                          <menuitem id="detail-never-activate-menuitem"
+                                    class="addon-control"
+                                    label="&cmd.neverActivate.label;"
+                                    tooltiptext="&cmd.neverActivate.tooltip;"
+                                    command="cmd_neverActivateItem"/>
+                        </menupopup>
+                      </menulist>
+                    </hbox>
+                  </vbox>
                 </hbox>
               </vbox>
-              <hbox align="start">
-                <vbox id="detail-icon-container" align="end">
-                  <image id="detail-icon" class="icon"/>
-                </vbox>
-                <vbox flex="1">
-                  <vbox id="detail-summary">
-                    <hbox id="detail-name-container" class="name-container"
-                          align="start">
-                      <label id="detail-name" flex="1"/>
-                      <label id="detail-version"/>
-                      <label class="disabled-postfix" value="&addon.disabled.postfix;"/>
-                      <label class="update-postfix" value="&addon.update.postfix;"/>
-                      <spacer flex="5000"/> <!-- Necessary to allow the name to wrap -->
-                    </hbox>
-                    <label id="detail-creator" class="creator"/>
-                  </vbox>
-                  <hbox id="detail-experiment-container">
-                    <svg width="8" height="8" viewBox="0 0 8 8" version="1.1"
-                         xmlns="http://www.w3.org/2000/svg"
-                         id="detail-experiment-bullet-container">
-                      <circle cx="4" cy="4" r="4" id="detail-experiment-bullet"/>
-                    </svg>
-                    <label id="detail-experiment-state"/>
-                    <label id="detail-experiment-time"/>
-                  </hbox>
-                  <hbox id="detail-desc-container" align="start">
-                    <vbox pack="center"> <!-- Necessary to work around bug 394738 -->
-                      <image id="detail-screenshot" hidden="true"/>
-                    </vbox>
-                    <vbox flex="1">
-                      <description id="detail-desc"/>
-                      <description id="detail-fulldesc"/>
-                    </vbox>
-                  </hbox>
-                  <vbox id="detail-contributions">
-                    <description id="detail-contrib-description">
-                      &detail.contributions.description;
-                    </description>
-                    <hbox align="center">
-                      <label id="detail-contrib-suggested"/>
-                      <spacer flex="1"/>
-                      <button id="detail-contrib-btn"
-                              label="&cmd.contribute.label;"
-                              accesskey="&cmd.contribute.accesskey;"
-                              tooltiptext="&cmd.contribute.tooltip;"
-                              command="cmd_contribute"/>
-                    </hbox>
-                  </vbox>
-                  <grid id="detail-grid">
-                    <columns>
-                       <column flex="1"/>
-                       <column flex="2"/>
-                    </columns>
-                    <rows id="detail-rows">
-                      <row class="detail-row-complex" id="detail-updates-row">
-                        <label class="detail-row-label" value="&detail.updateType;"/>
-                        <hbox align="center">
-                          <radiogroup id="detail-autoUpdate" orient="horizontal">
-                            <!-- The values here need to match the values of
-                                 AddonManager.AUTOUPDATE_* -->
-                            <radio label="&detail.updateDefault.label;"
-                                   tooltiptext="&detail.updateDefault.tooltip;"
-                                   value="1"/>
-                            <radio label="&detail.updateAutomatic.label;"
-                                   tooltiptext="&detail.updateAutomatic.tooltip;"
-                                   value="2"/>
-                            <radio label="&detail.updateManual.label;"
-                                   tooltiptext="&detail.updateManual.tooltip;"
-                                   value="0"/>
-                          </radiogroup>
-                          <button id="detail-findUpdates-btn" class="button-link"
-                                  label="&detail.checkForUpdates.label;"
-                                  accesskey="&detail.checkForUpdates.accesskey;"
-                                  tooltiptext="&detail.checkForUpdates.tooltip;"
-                                  command="cmd_findItemUpdates"/>
-                        </hbox>
-                      </row>
-                      <row class="detail-row" id="detail-dateUpdated" label="&detail.lastupdated.label;"/>
-                      <row class="detail-row-complex" id="detail-homepage-row" label="&detail.home;">
-                        <label class="detail-row-label" value="&detail.home;"/>
-                        <label id="detail-homepage" class="detail-row-value text-link" crop="end"/>
-                      </row>
-                      <row class="detail-row-complex" id="detail-repository-row" label="&detail.repository;">
-                        <label class="detail-row-label" value="&detail.repository;"/>
-                        <label id="detail-repository" class="detail-row-value text-link"/>
-                      </row>
-                      <row class="detail-row" id="detail-size" label="&detail.size;"/>
-                      <row class="detail-row-complex" id="detail-rating-row">
-                        <label class="detail-row-label" value="&rating2.label;"/>
-                        <hbox>
-                          <label id="detail-rating" class="meta-value meta-rating"
-                                 showrating="average"/>
-                          <label id="detail-reviews" class="text-link"/>
-                        </hbox>
-                      </row>
-                      <row class="detail-row" id="detail-downloads" label="&detail.numberOfDownloads.label;"/>
-                    </rows>
-                  </grid>
-                  <hbox id="detail-controls">
-                    <button id="detail-prefs-btn" class="addon-control preferences"
-#ifdef XP_WIN
-                            label="&detail.showPreferencesWin.label;"
-                            accesskey="&detail.showPreferencesWin.accesskey;"
-                            tooltiptext="&detail.showPreferencesWin.tooltip;"
-#else
-                            label="&detail.showPreferencesUnix.label;"
-                            accesskey="&detail.showPreferencesUnix.accesskey;"
-                            tooltiptext="&detail.showPreferencesUnix.tooltip;"
-#endif
-                            command="cmd_showItemPreferences"/>
-                    <spacer flex="1"/>
-                    <button id="detail-debug-btn" class="addon-control debug"
-                            label="&cmd.debugAddon.label;"
-                            accesskey="&cmd.debugAddon.accesskey;"
-                            command="cmd_debugItem" />
-                    <button id="detail-enable-btn" class="addon-control enable"
-                            label="&cmd.enableAddon.label;"
-                            accesskey="&cmd.enableAddon.accesskey;"
-                            command="cmd_enableItem"/>
-                    <button id="detail-disable-btn" class="addon-control disable"
-                            label="&cmd.disableAddon.label;"
-                            accesskey="&cmd.disableAddon.accesskey;"
-                            command="cmd_disableItem"/>
-                    <button id="detail-uninstall-btn" class="addon-control remove"
-                            label="&cmd.uninstallAddon.label;"
-                            accesskey="&cmd.uninstallAddon.accesskey;"
-                            command="cmd_uninstallItem"/>
-                    <button id="detail-purchase-btn" class="addon-control purchase"
-                            command="cmd_purchaseItem"/>
-                    <button id="detail-install-btn" class="addon-control install"
-                            label="&cmd.installAddon.label;"
-                            accesskey="&cmd.installAddon.accesskey;"
-                            command="cmd_installItem"/>
-                    <menulist id="detail-state-menulist"
-                              crop="none" sizetopopup="always"
-                              tooltiptext="&cmd.stateMenu.tooltip;">
-                      <menupopup>
-                        <menuitem id="detail-ask-to-activate-menuitem"
-                                  class="addon-control"
-                                  label="&cmd.askToActivate.label;"
-                                  tooltiptext="&cmd.askToActivate.tooltip;"
-                                  command="cmd_askToActivateItem"/>
-                        <menuitem id="detail-always-activate-menuitem"
-                                  class="addon-control"
-                                  label="&cmd.alwaysActivate.label;"
-                                  tooltiptext="&cmd.alwaysActivate.tooltip;"
-                                  command="cmd_alwaysActivateItem"/>
-                        <menuitem id="detail-never-activate-menuitem"
-                                  class="addon-control"
-                                  label="&cmd.neverActivate.label;"
-                                  tooltiptext="&cmd.neverActivate.tooltip;"
-                                  command="cmd_neverActivateItem"/>
-                      </menupopup>
-                    </menulist>
-                  </hbox>
-                </vbox>
-              </hbox>
-            </vbox>
-            <spacer flex="1"/>
-          </hbox>
-        </scrollbox>
-
-      </deck>
-
-    </box>
+              <spacer flex="1"/>
+            </hbox>
+          </scrollbox>
+        </deck>
+      </box>
+    </vbox>
   </hbox>
-
 </page>
diff --git a/toolkit/mozapps/extensions/test/browser/browser_bug591663.js b/toolkit/mozapps/extensions/test/browser/browser_bug591663.js
index 0736aa39191..8c3061b7638 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_bug591663.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_bug591663.js
@@ -64,7 +64,7 @@ function check_list(aItem) {
 
   // Check the children of the list
   let list = gManagerWindow.document.getElementById(LIST_ID);
-  is(list.itemCount, aItem ? 1 : 0, "Should get expected number of items in list");
+  is(list.childNodes.length, aItem ? 1 : 0, "Should get expected number of items in list");
   if (aItem != null) {
     let itemName = list.firstChild.getAttribute("name");
     is(itemName, aItem.name, "List item should have correct name");
diff --git a/toolkit/mozapps/extensions/test/browser/browser_details.js b/toolkit/mozapps/extensions/test/browser/browser_details.js
index 4179b496ccf..489d26011c5 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_details.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_details.js
@@ -181,7 +181,7 @@ add_test(function() {
     is(get("detail-version").value, "2.1", "Version should be correct");
     is(get("detail-icon").src, "chrome://foo/skin/icon64.png", "Icon should be correct");
     is_element_hidden(get("detail-creator"), "Creator should be hidden");
-    is_element_hidden(get("detail-screenshot"), "Screenshot should be hidden");
+    is_element_hidden(get("detail-screenshot-box"), "Screenshot should be hidden");
     is(get("detail-screenshot").width, "", "Screenshot dimensions should not be set");
     is(get("detail-screenshot").height, "", "Screenshot dimensions should not be set");
     is(get("detail-desc").textContent, "Short description", "Description should be correct");
@@ -288,7 +288,7 @@ add_test(function() {
     is(get("detail-creator")._creatorName.value, "Mozilla", "Creator should be correct");
     is_element_hidden(get("detail-creator")._creatorLink, "Creator link should be hidden");
 
-    is_element_visible(get("detail-screenshot"), "Screenshot should be visible");
+    is_element_visible(get("detail-screenshot-box"), "Screenshot should be visible");
     is(get("detail-screenshot").src, "chrome://branding/content/about.png", "Should be showing the full sized screenshot");
     is(get("detail-screenshot").width, 200, "Screenshot dimensions should be set");
     is(get("detail-screenshot").height, 150, "Screenshot dimensions should be set");
@@ -345,7 +345,7 @@ add_test(function() {
     is(get("detail-creator")._creatorLink.value, "Mozilla", "Creator link should be correct");
     is(get("detail-creator")._creatorLink.href, "http://www.mozilla.org", "Creator link href should be correct");
 
-    is_element_visible(get("detail-screenshot"), "Screenshot should be visible");
+    is_element_visible(get("detail-screenshot-box"), "Screenshot should be visible");
     is(get("detail-screenshot").src, "chrome://branding/content/icon64.png", "Should be showing the thumbnail");
     is(get("detail-screenshot").width, 160, "Screenshot dimensions should be set");
     is(get("detail-screenshot").height, 120, "Screenshot dimensions should be set");
@@ -786,7 +786,7 @@ add_test(function() {
     is(get("detail-version").value, "2.5", "Version should be correct");
     is(get("detail-icon").src, "chrome://foo/skin/icon264.png", "Icon should be correct");
     is_element_hidden(get("detail-creator"), "Creator should be hidden");
-    is_element_hidden(get("detail-screenshot"), "Screenshot should be hidden");
+    is_element_hidden(get("detail-screenshot-box"), "Screenshot should be hidden");
     is(get("detail-desc").textContent, "Short description replacement", "Description should be correct");
     is(get("detail-fulldesc").textContent, "Longer description replacement", "Full description should be correct");
 
diff --git a/toolkit/mozapps/extensions/test/browser/browser_inlinesettings_info.js b/toolkit/mozapps/extensions/test/browser/browser_inlinesettings_info.js
index 05b43a23882..b7009f3f035 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_inlinesettings_info.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_inlinesettings_info.js
@@ -271,6 +271,10 @@ add_test(function() {
     try {
       ok(!settings[6].hasAttribute("first-row"), "Not the first row");
       var button = gManagerWindow.document.getAnonymousElementByAttribute(settings[6], "anonid", "button");
+
+      // Workaround for bug 1155324 - we need to ensure that the button is scrolled into view.
+      button.scrollIntoView();
+
       input = gManagerWindow.document.getAnonymousElementByAttribute(settings[6], "anonid", "input");
       is(input.value, "", "Label value should be empty");
       is(input.tooltipText, "", "Label tooltip should be empty");
diff --git a/toolkit/themes/linux/mozapps/extensions/extensions.css b/toolkit/themes/linux/mozapps/extensions/extensions.css
index 5c642fbbf1a..33bbf754bb7 100644
--- a/toolkit/themes/linux/mozapps/extensions/extensions.css
+++ b/toolkit/themes/linux/mozapps/extensions/extensions.css
@@ -2,318 +2,26 @@
  * 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/. */
 
-@import url("chrome://global/skin/inContentUI.css");
+%include ../../../shared/extensions/extensions.inc.css
 
-
-/*** global warnings ***/
-
-.global-warning-container {
-  overflow-x: hidden;
+#header-utils-btn .toolbarbutton-icon {
+  list-style-image: url("chrome://mozapps/skin/extensions/utilities.svg#utilities-native");
 }
 
-.global-warning {
-  -moz-box-align: center;
-  padding: 0 8px;
-  font-weight: bold;
-}
-
-.global-warning-text {
-  color: -moz-FieldText;
-}
-
-#addons-page[warning] .global-warning-container {
-  background-color: rgba(255, 255, 0, 0.1);
-  background-image: url("chrome://mozapps/skin/extensions/stripes-warning.png");
-  background-repeat: repeat-x;
-}
-
-#detail-view .global-warning {
-  padding: 4px 12px;
-  border-bottom: 1px solid ThreeDShadow;
-  min-height: 41px;
-}
-
-@media (max-width: 600px) {
-  .global-warning-text {
-    display: none;
-  }
-}
-
-/* Plugins aren't yet disabled by safemode (bug 342333),
-   so don't show that warning when viewing plugins. */
-#addons-page[warning="safemode"] .view-pane[type="plugin"] .global-warning-container,
-#addons-page[warning="safemode"] #detail-view[loading="true"] .global-warning-container {
-  background-color: inherit;
-  background-image: none;
-}
-
-
-/*** notification icons ***/
-
 .warning-icon {
   list-style-image: url("moz-icon://stock/gtk-dialog-warning?size=menu");
-  width: 16px;
   height: 16px;
-  margin: 3px 0;
 }
 
 .error-icon {
   list-style-image: url("moz-icon://stock/gtk-dialog-error?size=menu");
-  width: 16px;
   height: 16px;
-  margin: 3px 0;
 }
 
 .pending-icon,
 .info-icon {
   list-style-image: url("moz-icon://stock/gtk-dialog-info?size=menu");
-  width: 16px;
   height: 16px;
-  margin: 3px 0;
-}
-
-/*** view alert boxes ***/
-
-.alert-container {
-  -moz-box-align: center;
-}
-
-.alert-spacer-before {
-  -moz-box-flex: 1;
-}
-
-.alert-spacer-after {
-  -moz-box-flex: 3;
-}
-
-.alert {
-  -moz-box-align: center;
-  padding: 10px;
-  font-size: 12px;
-  border: 1px solid ThreeDShadow;
-  border-radius: 8px;
-  color: WindowText;
-  background-color: Window;
-  background-clip: padding-box;
-}
-
-.alert .alert-title {
-  font-weight: bold;
-  font-size: 200%;
-  margin-bottom: 15px;
-}
-
-.alert button {
-  margin: 1em 2em;
-}
-
-.loading {
-  list-style-image: url("chrome://global/skin/icons/loading_16.png");
-  padding-left: 20px;
-  padding-right: 20px;
-}
-
-/*** category selector ***/
-
-#categories {
-  -moz-appearance: none;
-  border: none;
-  -moz-margin-end: -1px;
-  background-color: transparent;
-  position: relative;
-  margin-top: 41px;
-}
-
-.category {
-  -moz-appearance: none;
-  border-width: 1px;
-  -moz-border-end-width: 0;
-  border-style: solid;
-  border-color: transparent;
-  padding: 10px 4px;
-  -moz-box-align: center;
-  overflow: hidden;
-  min-height: 0;
-  color: WindowText;
-}
-
-.category:-moz-locale-dir(ltr) {
-  border-top-left-radius: 5px;
-  border-bottom-left-radius: 5px;
-}
-
-.category:-moz-locale-dir(rtl) {
-  border-top-right-radius: 5px;
-  border-bottom-right-radius: 5px;
-}
-
-.category[disabled] {
-  border-top: 0;
-  border-bottom: 0;
-  height: 0;
-  opacity: 0;
-  transition-property: height, opacity;
-  transition-duration: 1s, 0.8s;
-}
-
-.category:not([disabled]) {
-  height: 52px;
-  transition-property: height, opacity;
-  transition-duration: 1s, 0.8s;
-}
-
-.category[selected] {
-  background-color: -moz-Field;
-  color: -moz-FieldText;
-  border-color: ThreeDShadow;
-}
-
-.category-name {
-  font-size: 150%;
-}
-
-/* Maximize the size of the viewport when the window is small */
-@media (max-width: 800px) {
-  .category-name {
-    display: none;
-  }
-}
-
-.category-badge {
-  background-color: Highlight;
-  padding: 2px 8px;
-  margin: 6px 0;
-  border-radius: 10000px;
-  color: HighlightText;
-  font-weight: bold;
-  text-align: center;
-}
-
-.category-badge[value="0"] {
-  visibility: hidden;
-}
-
-.category-icon {
-  width: 32px;
-  height: 32px;
-  -moz-margin-start: 6px;
-}
-
-#category-search > .category-icon {
-  list-style-image: url("chrome://mozapps/skin/extensions/category-search.png");
-}
-#category-discover > .category-icon {
-  list-style-image: url("chrome://mozapps/skin/extensions/category-discover.png");
-}
-#category-locale > .category-icon {
-  list-style-image: url("chrome://mozapps/skin/extensions/category-languages.png");
-}
-#category-searchengine > .category-icon {
-  list-style-image: url("chrome://mozapps/skin/extensions/category-searchengines.png");
-}
-#category-extension > .category-icon {
-  list-style-image: url("chrome://mozapps/skin/extensions/category-extensions.png");
-}
-#category-service > .category-icon {
-  list-style-image: url("chrome://mozapps/skin/extensions/category-service.png");
-}
-#category-theme > .category-icon {
-  list-style-image: url("chrome://mozapps/skin/extensions/category-themes.png");
-}
-#category-plugin > .category-icon {
-  list-style-image: url("chrome://mozapps/skin/extensions/category-plugins.png");
-}
-#category-dictionary > .category-icon {
-  list-style-image: url("chrome://mozapps/skin/extensions/category-dictionaries.png");
-}
-#category-experiment > .category-icon {
-  list-style-image: url("chrome://mozapps/skin/extensions/category-experiments.png");
-}
-#category-availableUpdates > .category-icon {
-  list-style-image: url("chrome://mozapps/skin/extensions/category-available.png");
-}
-#category-recentUpdates > .category-icon {
-  list-style-image: url("chrome://mozapps/skin/extensions/category-recent.png");
-}
-
-
-/*** header ***/
-
-#header {
-  margin-bottom: 18px;
-}
-
-.nav-button {
-  min-width: 0;
-}
-
-#back-btn:-moz-locale-dir(ltr) {
-  list-style-image: url("moz-icon://stock/gtk-go-back-ltr?size=toolbar");
-}
-
-#forward-btn:-moz-locale-dir(ltr) {
-  list-style-image: url("moz-icon://stock/gtk-go-forward-ltr?size=toolbar");
-}
-
-#back-btn:-moz-locale-dir(rtl) {
-  list-style-image: url("moz-icon://stock/gtk-go-back-rtl?size=toolbar");
-}
-
-#forward-btn:-moz-locale-dir(rtl) {
-  list-style-image: url("moz-icon://stock/gtk-go-forward-rtl?size=toolbar");
-}
-
-#back-btn[disabled="true"]:-moz-locale-dir(ltr) {
-  list-style-image: url("moz-icon://stock/gtk-go-back-ltr?size=toolbar&state=disabled");
-}
-
-#forward-btn[disabled="true"]:-moz-locale-dir(ltr) {
-  list-style-image: url("moz-icon://stock/gtk-go-forward-ltr?size=toolbar&state=disabled");
-}
-
-#back-btn[disabled="true"]:-moz-locale-dir(rtl) {
-  list-style-image: url("moz-icon://stock/gtk-go-back-rtl?size=toolbar&state=disabled");
-}
-
-#forward-btn[disabled="true"]:-moz-locale-dir(rtl) {
-  list-style-image: url("moz-icon://stock/gtk-go-forward-rtl?size=toolbar&state=disabled");
-}
-
-#header-utils-btn {
-  min-width: 4.5em;
-}
-
-#header-utils-btn .toolbarbutton-icon {
-  list-style-image: url("moz-icon://stock/gtk-preferences?size=toolbar");
-}
-
-#header-utils-btn:-moz-focusring > .button-box {
-  border: none;
-}
-
-#header-search {
-  margin: 0;
-}
-
-@media (max-width: 600px) {
-  #header-search {
-    width: 12em;
-  }
-}
-
-.view-header {
-  padding: 4px;
-  margin: 0;
-  min-height: 41px;
-  background-color: ThreeDHighlight;
-  border-bottom: 1px solid ThreeDShadow;
-}
-
-
-/*** sorters ***/
-
-.sort-controls {
-  -moz-appearance: none;
 }
 
 .sorter[checkState="1"] .button-icon {
@@ -326,247 +34,7 @@
   list-style-image: url("moz-icon://stock/gtk-sort-ascending?size=16");
 }
 
-
-/*** discover view ***/
-
-.discover-spacer-before,
-.discover-spacer-after {
-  -moz-box-flex: 1;
-}
-
-#discover-error .alert {
-  max-width: 45em;
-  -moz-box-flex: 1;
-}
-
-.discover-logo {
-  list-style-image: url("chrome://mozapps/skin/extensions/discover-logo.png");
-  -moz-margin-end: 15px;
-}
-
-.discover-title {
-  font-weight: bold;
-  font-size: 24px;
-  font-family: MetaWebPro-Book, "Trebuchet MS", sans-serif;
-  margin: 0 0 15px 0;
-}
-
-.discover-description {
-  text-align: justify;
-  margin: 0 0 15px 0;
-}
-
-.discover-footer {
-  text-align: justify;
-}
-
-
-/*** list ***/
-
-.list {
-  -moz-appearance: none;
-  margin: 0;
-  border: none;
-  background-color: transparent;
-}
-
-.addon {
-  border-bottom: 1px solid ThreeDLightShadow;
-  padding: 5px;
-}
-
-.addon[selected] .text-link,
-.addon[selected] .button-link {
-  color: inherit;
-}
-
-.details {
-  cursor: pointer;
-  margin: 0;
-  -moz-margin-start: 10px;
-}
-
-.icon-container {
-  width: 48px;
-  height: 48px;
-  margin: 3px 7px;
-  -moz-box-align: center;
-  -moz-box-pack: center;
-}
-
-.icon {
-  list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png");
-  max-width: 48px;
-  max-height: 48px;
-}
-
-.addon[active="false"] .icon {
-  filter: grayscale(1);
-}
-
-.addon-view[type="theme"] .icon {
-  list-style-image: url("chrome://mozapps/skin/extensions/themeGeneric.png");
-}
-
-.addon-view[type="locale"] .icon {
-  list-style-image: url("chrome://mozapps/skin/extensions/localeGeneric.png");
-}
-
-.addon-view[type="plugin"] .icon {
-  list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric.png");
-}
-
-.addon-view[type="dictionary"] .icon {
-  list-style-image: url("chrome://mozapps/skin/extensions/dictionaryGeneric.png");
-}
-
-.addon-view[type="experiment"] .icon {
-  list-style-image: url("chrome://mozapps/skin/extensions/experimentGeneric.png");
-}
-
-.name-container {
-  font-size: 150%;
-  margin-bottom: 0;
-  font-weight: bold;
-  -moz-box-align: end;
-  -moz-box-flex: 1;
-}
-
-.creator {
-  font-weight: bold;
-}
-
-.addon-view[active="false"]:not([selected]) {
-  color: GrayText;
-}
-
-.description-container {
-  -moz-margin-start: 6px;
-  -moz-box-align: center;
-}
-
-.description {
-  margin: 0;
-}
-
-.warning,
-.pending,
-.error {
-  -moz-margin-start: 48px;
-  -moz-box-align: center;
-}
-
-.content-container,
-.basicinfo-container {
-  -moz-box-align: start;
-}
-
-.addon[status="installing"] > .content-container {
-  -moz-box-align: stretch;
-}
-
-.advancedinfo-container,
-.update-info-container {
-  -moz-box-align: center;
-}
-
-.update-available {
-  -moz-box-align: end;
-}
-
-.install-status-container {
-  -moz-box-pack: end;
-  -moz-box-align: end;
-}
-
-.name-outer-container {
-  -moz-box-pack: center;
-}
-
-.relnotes-toggle-container,
-.icon-outer-container {
-  -moz-box-pack: start;
-}
-
-.status-container,
-.control-container {
-  -moz-box-pack: end;
-}
-
-.addon-view:not([selected]) .warning {
-  color: #90792E;
-}
-
-.addon-view:not([selected]) .error {
-  color: #7C322B;
-}
-
-.addon-view:not([selected]) .pending {
-  color: #4F7939;
-}
-
-.addon[active="false"] {
-  background-image: linear-gradient(rgba(135, 135, 135, 0.2),
-                                    rgba(135, 135, 135, 0.1));
-}
-
-.addon-view[notification="warning"] {
-  background-image: url("chrome://mozapps/skin/extensions/stripes-warning.png"),
-                    linear-gradient(rgba(255, 255, 0, 0.04),
-                                    rgba(255, 255, 0, 0));
-  background-repeat: repeat-x;
-}
-
-.addon-view[notification="error"] {
-  background-image: url("chrome://mozapps/skin/extensions/stripes-error.png"),
-                    linear-gradient(rgba(255, 0, 0, 0.04),
-                                    rgba(255, 0, 0, 0));
-  background-repeat: repeat-x;
-}
-
-.addon-view[pending="enable"],
-.addon-view[pending="upgrade"],
-.addon-view[pending="install"] {
-  background-image: url("chrome://mozapps/skin/extensions/stripes-info-positive.png"),
-                    linear-gradient(rgba(0, 255, 0, 0.04),
-                                    rgba(0, 255, 0, 0));
-  background-repeat: repeat-x;
-}
-
-.addon-view[pending="disable"],
-.addon-view[pending="uninstall"] {
-  background-image: url("chrome://mozapps/skin/extensions/stripes-info-negative.png"),
-                    linear-gradient(rgba(128, 128, 128, 0.04),
-                                    rgba(128, 128, 128, 0));
-  background-repeat: repeat-x;
-}
-
-.addon .relnotes-container {
-  -moz-box-align: start;
-  height: 0;
-  overflow: hidden;
-  opacity: 0;
-  transition-property: height, opacity;
-  transition-duration: 0.5s, 0.5s;
-}
-
-.addon[show-relnotes] .relnotes-container {
-  opacity: 1;
-  transition-property: height, opacity;
-  transition-duration: 0.5s, 0.5s;
-}
-
-.addon .relnotes-header {
-  font-weight: bold;
-  margin: 10px 0;
-}
-
 .addon .relnotes-toggle {
-  -moz-appearance: none;
-  border: none;
-  background: transparent;
-  font-weight: bold;
-  cursor: pointer;
   list-style-image: url("moz-icon://stock/gtk-go-down?size=16");
 }
 
@@ -578,221 +46,6 @@
   list-style-image: url("moz-icon://stock/gtk-go-up?size=16");
 }
 
-
-/*** search view ***/
-
-#search-filter {
-  padding: 5px 20px;
-  font-size: 120%;
-  overflow-x: hidden;
-  border-bottom: 1px solid ThreeDShadow;
-}
-
-#search-filter-label {
-  font-weight: bold;
-}
-
-#search-allresults-link {
-  margin-top: 1em;
-  margin-bottom: 2em;
-}
-
-/*** detail view ***/
-
-#detail-view[active="false"] .fade {
-  opacity: 0.6;
-}
-
-#detail-view .loading {
-  opacity: 0;
-}
-
-#detail-view[loading-extended] .loading {
-  -moz-box-align: center;
-  -moz-box-pack: center;
-  opacity: 1;
-  transition-property: opacity;
-  transition-duration: 1s;
-}
-
-.detail-view-container {
-  padding: 0 2em 2em 2em;
-  font-size: 110%;
-}
-
-#detail-notifications {
-  margin-top: 1em;
-  margin-bottom: 2em;
-}
-
-#detail-notifications .warning,
-#detail-notifications .pending,
-#detail-notifications .error {
-  -moz-margin-start: 0;
-}
-
-#detail-icon-container {
-  width: 64px;
-  -moz-margin-end: 10px;
-}
-
-#detail-icon {
-  max-width: 64px;
-  max-height: 64px;
-}
-
-#detail-summary {
-  margin-bottom: 2em;
-}
-
-#detail-name-container {
-  font-size: 200%;
-}
-
-#detail-screenshot {
-  -moz-margin-end: 2em;
-  max-width: 300px;
-  max-height: 300px;
-}
-
-#detail-screenshot[loading] {
-  background-image: url("chrome://global/skin/icons/loading_16.png");
-  background-position: 50% 50%;
-  background-repeat: no-repeat;
-  border: 1px threedshadow solid;
-  border-radius: 5px;
-  box-sizing: border-box;
-}
-
-#detail-screenshot[loading="error"] {
-  background-image: url("chrome://global/skin/media/error.png");
-}
-
-#detail-desc-container {
-  margin-bottom: 2em;
-}
-
-#detail-desc, #detail-fulldesc {
-  -moz-margin-start: 6px;
-  /* This is necessary to fix layout issues with multi-line descriptions, see
-     bug 592712*/
-  outline: solid transparent;
-  white-space: pre-wrap;
-  min-width: 10em;
-}
-
-#detail-fulldesc {
-  margin-top: 1em;
-}
-
-#detail-contributions {
-  border-radius: 5px;
-  border: 1px solid ThreeDShadow;
-  margin-bottom: 2em;
-  padding: 1em;
-  background: ThreeDHighlight;
-}
-
-#detail-contrib-description {
-  font-style: italic;
-  margin-bottom: 1em;
-}
-
-#detail-contrib-suggested {
-  color: GrayText;
-}
-
-#detail-grid {
-  margin-bottom: 2em;
-}
-
-#detail-grid > columns > column:first-child {
-  min-width: 15em;
-  max-width: 25em;
-}
-
-.detail-row[first-row="true"],
-.detail-row-complex[first-row="true"],
-setting[first-row="true"] {
-  border-top: none;
-}
-
-.detail-row,
-.detail-row-complex,
-setting {
-  border-top: 1px solid ThreeDShadow;
-  -moz-box-align: center;
-  min-height: 32px;
-}
-
-#detail-controls {
-  margin-bottom: 1em;
-}
-
-#detail-view[active="false"]:not([pending]):not([notification]) {
-  background-image: linear-gradient(rgba(135, 135, 135, 0.1),
-                                    rgba(135, 135, 135, 0));
-}
-
-setting[first-row="true"] {
-  margin-top: 2em;
-}
-
-setting {
-  -moz-box-align: start;
-}
-
-.preferences-alignment {
-  min-height: 32px;
-  -moz-box-align: center;
-}
-
-.preferences-description {
-  font-size: 90.9%;
-  color: graytext;
-  margin-top: -2px;
-  -moz-margin-start: 2em;
-  white-space: pre-wrap;
-}
-
-.preferences-description:empty {
-  display: none;
-}
-
-menulist { /* Fixes some styling inconsistencies */
-  font-size: 100%;
-  margin: 1px 5px 2px 5px;
-}
-
-colorpicker[type="button"] { /* Fixes some styling inconsistencies */
-  height: 29px;
-  margin: 1px 5px 2px 5px;
-}
-
-setting[type="radio"] > radiogroup {
-  -moz-box-orient: horizontal;
-}
-
-/*** creator ***/
-
-.creator > label {
-  -moz-margin-start: 0;
-  -moz-margin-end: 0;
-}
-
-.creator > .text-link {
-  margin-top: 1px;
-  margin-bottom: 1px;
-}
-
-
-/*** rating ***/
-
-.meta-rating {
-  -moz-margin-end: 0;
-  vertical-align: text-top;
-}
-
 .meta-rating[showrating="average"] > .star {
   list-style-image: url("chrome://mozapps/skin/extensions/rating-not-won.png");
   padding: 0 1px;
@@ -808,149 +61,3 @@ setting[type="radio"] > radiogroup {
   list-style-image: url("chrome://mozapps/skin/extensions/rating-won.png");
   padding: 0 1px;
 }
-
-
-/*** download progress ***/
-
-.download-progress {
-  width: 200px;
-}
-
-.download-progress .start-cap,
-.download-progress .end-cap {
-  display: none;
-}
-
-.download-progress .progress {
-  padding: 0;
-  margin: 0;
-  border: none;
-}
-
-.download-progress .cancel {
-  -moz-appearance: none;
-  background-color: ButtonFace;
-  padding-bottom: 1px;
-  -moz-padding-start: 2px;
-  border-width: 1px;
-  border-style: solid;
-  border-color: ButtonHighlight ButtonShadow ButtonShadow ButtonHighlight;
-  border-radius: 10000px;
-  min-width: 16px;
-  width: 16px;
-  height: 16px;
-  margin: 3px;
-}
-
-.download-progress .cancel:hover {
-  background-color: -moz-ButtonHoverFace;
-}
-
-.download-progress .cancel {
-  list-style-image: url('chrome://mozapps/skin/extensions/cancel.png');
-}
-
-.download-progress .status-container {
-  -moz-box-align: center;
-}
-
-
-/*** install status ***/
-
-.install-status {
-  -moz-box-align: center;
-}
-
-
-/*** check for updates ***/
-
-#updates-container {
-  -moz-box-align: center;
-}
-
-#updates-installed,
-#updates-downloaded {
-  font-weight: bold;
-}
-
-#update-selected {
-  margin: 12px;
-}
-
-
-/*** buttons ***/
-
-.addon-control[disabled="true"]:not(.no-auto-hide) {
-  display: none;
-}
-
-.no-auto-hide .addon-control {
-  display: block !important;
-}
-
-.addon-control.enable {
-  list-style-image: url("moz-icon://stock/gtk-yes?size=button");
-}
-
-.addon-control.disable {
-  list-style-image: url("moz-icon://stock/gtk-no?size=button");
-}
-
-.addon-control.remove {
-  list-style-image: url("moz-icon://stock/gtk-remove?size=button");
-}
-
-.addon-control.preferences {
-  list-style-image: url("moz-icon://stock/gtk-preferences?size=button");
-}
-
-.addon-control.install,
-.addon-control.update {
-  list-style-image: url("moz-icon://stock/gtk-save?size=button");
-}
-
-.button-link {
-  -moz-appearance: none;
-  background: transparent;
-  border: none;
-  text-decoration: underline;
-  color: -moz-nativehyperlinktext;
-  cursor: pointer;
-  min-width: 0;
-  margin: 0 6px;
-}
-
-.button-link:active {
-  color: -moz-activehyperlinktext;
-}
-
-.header-button .toolbarbutton-text {
-  display: none;
-}
-
-/*** telemetry experiments ***/
-
-#detail-experiment-container {
-  font-size: 80%;
-  margin-bottom: 1em;
-}
-
-#detail-experiment-bullet-container,
-#detail-experiment-state,
-#detail-experiment-time,
-.experiment-bullet-container,
-.experiment-state,
-.experiment-time {
-  vertical-align: middle;
-  display: inline-block;
-}
-
-.addon .experiment-bullet,
-#detail-experiment-bullet {
-  fill: rgb(158, 158, 158);
-}
-
-.addon[active="true"] .experiment-bullet,
-#detail-view[active="true"] #detail-experiment-bullet {
-  fill: rgb(106, 201, 20);
-}
diff --git a/toolkit/themes/linux/mozapps/extensions/heart.png b/toolkit/themes/linux/mozapps/extensions/heart.png
new file mode 100644
index 0000000000000000000000000000000000000000..655f4c4be795d4c49cf842e4b8858e74eef816dd
GIT binary patch
literal 2949
zcmV;03wrd4P)<h;3K|Lk000e1NJLTq000dD000aK1^@s6xwkjj00009a7bBm000XU
z000XU0RWnu7ytkYPiaF#P*7-ZbZ>KLZ*U+<Lqi~Na&Km7Y-Iodc-oy)XH-+^7Crag
z^g>IBfRsybQWXdwQbLP>6p<z>Aqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uh<iVD~V
z<RPMtgQJLw%KPDaqifc@_vX$1wbwr9tn;0-&j-K=43<bUQ8j=JsX`tR;Dg7+#^K~H
zK!FM*Z~zbpvt%K2{UZSY_<lS*D<Z%Lz5oGu(+dayz)hRLFdT>f59&ghTmgWD0l;*T
zI7<kC6aYYajzXpYKt=(8otP$50H6c_V9R4-;{Z@C0AMG7=F<Rxo%or10RUT+Ar%3j
zkpLhQWr#!oXgdI`&sK^>09Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p
z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-<?i
z0%4j!F2Z@488U%158(66005wo6%pWr^Zj_v4zAA5HjcIqUoGmt2LB>rV&neh&#Q1i
z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_<lS*MWK+n+1cgf
z<k(8YLR(?VSAG6x!e78w{cQPuJpA|d;J)G{fihizM+Erb!p!tcr5w+a34~(Y=8s4G
zw+sLL9n&JjNn*KJDiq^U5^;`1nvC-@r6P$!k}1U{(*I=Q-z@tBKHoI}uxdU5dyy@u
zU1J0GOD7Ombim^G008p4Z^6_k2m^p<gW=D2|L;HjN1!DDfM!XOaR2~bL?kX$%CkSm
z2mk;?pn)o|K^yeJ7%adB9Ki+L!3+FgHiSYX#KJ-lLJDMn9CBbOtb#%)hRv`YDqt_v
zKpix|QD}yfa1JiQRk#j4a1Z)n2%f<xynzV>LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW
zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_Ifq<Ex{*7`05XF7hP+2Hl!3BQJ=6@fL%FCo
z8iYoo3(#bAF`ADSpqtQgv>H8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X
zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ<AYmRsNLWl*PS{AOARHt#5!wki2?K;t
z!Y3k=s7tgax)J%r7-BLphge7~Bi0g+6E6^Zh(p9TBoc{3GAFr^0!gu?RMHaCM$&Fl
zBk3%un>0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4
z<uv66WtcKSRim0x-Ke2d5jBrmLam{;Qm;{ms1r1GnmNsb7D-E`t)i9F8fX`2_i3-_
zbh;7Ul^#x)&{xvS=|||7=mYe33=M`AgU5(xC>fg=2N-7=cNnjjOr{yriy6mMFgG#l
znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U
zt5vF<Q0r40Q)j6=sE4X&sBct1q<&fbi3VB2Ov6t@q*0);U*o*SAPZv|vv@2aYYnT0
zb%8a+Cb7-ge0D0knEf5Qi#@8Tp*ce{N;6lpQuCB%KL_KOarm5cP6_8Ir<e17iry6O
zDdH&`rZh~sF=bq9s+O0QSgS~@QL9Jmy*94xr=6y~MY~!1fet~(N+(<=M`w@D1)b+p
z*;C!83a1uLJv#NSE~;y#8=<>IcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya?
z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y
zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB
zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt
z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a<fJbF^|4I#xQ~n$Dc=
zKYhjYmgz5NSkDm8*fZm{6U!;YX`NG>(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C
z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB
zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe
zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0
z?2xS?_ve_-k<Mujg;0Lz*3buG=3$G&ehepthlN*$KaOySSQ^nWmo<0M+(UEUMEXRQ
zMBbZcF;6+KElM>iKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$
z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4
z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu
zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu
z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E
ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw
zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX
z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i&
z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01
z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R
z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw
zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD
zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3|
zawq-H%e&ckC+@AhPrP6BK<z=<L*0kfKU@CX*zeqbYQT4(^U>T#_XdT7&;F71j}Joy
zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z
zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot<a{81DF0~rvGr5Xr~8u`lav1h
z1DNytV>2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F}
z00026Nkl<Zc-oYaF$%&!6hwza0v<rH3J5uXV4F5zD+so^hpk8Q61G-$HnA6kKp^le
z{0p097j<A@|NNce&j^smGMF8g{_GwH;Kc`5pfSAxI@6!P&Y3D;V2T0QCiH41sg+b{
zibB#^QXbLUOj4;h@`PSyk{<dGcL6Iq@)vZ#!lkzXZeI)+3r&6(bKnGw!RHY;0(sbz
v&pptap||K2D>r0qoz$^?$|PW&+Pwz=X#J7QPFnQr00000NkvXXu0mjfQzLf|

literal 0
HcmV?d00001

diff --git a/toolkit/themes/linux/mozapps/jar.mn b/toolkit/themes/linux/mozapps/jar.mn
index a13287a40a8..db6d7bc797e 100644
--- a/toolkit/themes/linux/mozapps/jar.mn
+++ b/toolkit/themes/linux/mozapps/jar.mn
@@ -6,7 +6,7 @@ toolkit.jar:
 + skin/classic/mozapps/update/updates.css                  (update/updates.css)
 + skin/classic/mozapps/downloads/downloadIcon.png          (downloads/downloadIcon.png)
 + skin/classic/mozapps/downloads/downloads.css             (downloads/downloads.css)
-+ skin/classic/mozapps/extensions/extensions.css           (extensions/extensions.css)
+* skin/classic/mozapps/extensions/extensions.css           (extensions/extensions.css)
 + skin/classic/mozapps/extensions/category-search.png      (extensions/category-search.png)
 + skin/classic/mozapps/extensions/category-discover.png    (extensions/category-discover.png)
 + skin/classic/mozapps/extensions/category-plugins.png     (extensions/category-plugins.png)
@@ -22,6 +22,9 @@ toolkit.jar:
 + skin/classic/mozapps/extensions/localeGeneric.png        (extensions/localeGeneric.png)
 * skin/classic/mozapps/extensions/newaddon.css             (extensions/newaddon.css)
 + skin/classic/mozapps/extensions/selectAddons.css         (extensions/selectAddons.css)
++ skin/classic/mozapps/extensions/heart.png                (extensions/heart.png)
++ skin/classic/mozapps/extensions/navigation.png           (../../shared/extensions/navigation.png)
++ skin/classic/mozapps/extensions/utilities.svg            (../../shared/extensions/utilities.svg)
 + skin/classic/mozapps/passwordmgr/key-16.png              (passwordmgr/key-16.png)
 + skin/classic/mozapps/passwordmgr/key-64.png              (passwordmgr/key-64.png)
 + skin/classic/mozapps/plugins/pluginGeneric.png           (plugins/pluginGeneric.png)
diff --git a/toolkit/themes/osx/mozapps/extensions/extensions.css b/toolkit/themes/osx/mozapps/extensions/extensions.css
index 9614967a4b5..5297c25f394 100644
--- a/toolkit/themes/osx/mozapps/extensions/extensions.css
+++ b/toolkit/themes/osx/mozapps/extensions/extensions.css
@@ -2,298 +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/. */
 
-@import url("chrome://global/skin/inContentUI.css");
+%include ../../../shared/extensions/extensions.inc.css
 
-%include ../../global/shared.inc
-
-@namespace html url("http://www.w3.org/1999/xhtml");
-
-
-/*** global warnings ***/
-
-.global-warning-container {
-  overflow-x: hidden;
-}
-
-.global-warning {
-  -moz-box-align: center;
-  padding: 0 8px;
-  color: #916D15;
-  font-weight: bold;
-}
-
-.global-warning,
-.global-warning .button-link {
-  text-shadow: @loweredShadow@;
-}
-
-#addons-page[warning] .global-warning-container {
-  background-color: rgba(255, 255, 0, 0.1);
-  background-image: url("chrome://mozapps/skin/extensions/stripes-warning.png");
-  background-repeat: repeat-x;
-}
-
-#detail-view .global-warning {
-  padding: 4px 12px;
-  min-height: 31px;
-  border-bottom: 1px solid rgba(50, 65, 92, 0.4);
-}
-
-@media (max-width: 600px) {
-  .global-warning-text {
-    display: none;
-  }
-
-  .global-warning .warning-icon {
-    background-color: rgba(255, 255, 255, 0.7);
-    box-shadow: 0px 0px 2px 4px rgba(255, 255, 255, 0.7);
-    border-radius: 10px;
-  }
-}
-
-/*** global informations ***/
-#addons-page .global-info-container {
-  background-color: #e3e6eb;
-  border-top-right-radius: 5px;
-  border-top-left-radius: 5px;
-}
-
-/* Plugins aren't yet disabled by safemode (bug 342333),
-   so don't show that warning when viewing plugins. */
-#addons-page[warning="safemode"] .view-pane[type="plugin"] .global-warning-container,
-#addons-page[warning="safemode"] #detail-view[loading="true"] .global-warning-container {
-  background-color: inherit;
-  background-image: none;
-}
-
-
-/*** notification icons ***/
-
-.warning-icon {
-  list-style-image: url("chrome://mozapps/skin/extensions/alerticon-warning.png");
-  width: 16px;
-  height: 15px;
-  margin: 3px 0;
-}
-
-.error-icon {
-  list-style-image: url("chrome://mozapps/skin/extensions/alerticon-error.png");
-  width: 16px;
-  height: 15px;
-  margin: 3px 0;
-}
-
-.pending-icon,
-.info-icon {
-  list-style-image: url("chrome://mozapps/skin/extensions/alerticon-info-positive.png");
-  width: 16px;
-  height: 15px;
-  margin: 3px 0;
-}
-
-.addon-view[pending="disable"] .pending-icon,
-.addon-view[pending="uninstall"] .pending-icon {
-  list-style-image: url("chrome://mozapps/skin/extensions/alerticon-info-negative.png");
-  width: 16px;
-  height: 15px;
-  margin: 3px 0;
-}
-
-
-/*** view alert boxes ***/
-
-.alert-container {
-  -moz-box-align: center;
-}
-
-.alert-spacer-before {
-  -moz-box-flex: 1;
-}
-
-.alert-spacer-after {
-  -moz-box-flex: 3;
-}
-
-.alert {
-  -moz-box-align: center;
-  padding: 10px;
-  color: #373D48;
-  font-size: 12px;
-  border: 1px solid #A8B8D1;
-  border-radius: 8px;
-  background-image: linear-gradient(rgba(255, 255, 255, 0.7), rgba(236, 241, 247, 0.7));
-  background-clip: padding-box;
-  box-shadow: 0 -3px 0 rgba(58, 78, 103, 0.05) inset,
-              0 3px 0 rgba(175, 195, 220, 0.3);  
-}
-
-.alert .alert-title {
-  font-weight: bold;
-  font-size: 200%;
-  margin-bottom: 15px;
-}
-
-.alert button {
-  margin: 1em 2em;
-}
-
-.loading {
-  list-style-image: url("chrome://global/skin/icons/loading_16.png");
-  padding-left: 20px;
-  padding-right: 20px;
-}
-
-
-
-/*** category selector ***/
-
-#categories {
-  -moz-appearance: none;
-  border: none;
-  -moz-margin-end: -1px;
-  background-color: transparent;
-  position: relative;
-  margin-top: 31px;
-}
-
-.category {
-  -moz-appearance: none;
-  color: #252F3B;
-  border-width: 1px;
-  border-style: solid;
-  border-color: transparent;
-  padding: 10px 4px;
-  -moz-box-align: center;
-  overflow: hidden;
-  min-height: 0;
-}
-
-.category:-moz-locale-dir(ltr) {
-  border-top-left-radius: 5px;
-  border-bottom-left-radius: 5px;
-}
-
-.category:-moz-locale-dir(rtl) {
-  border-top-right-radius: 5px;
-  border-bottom-right-radius: 5px;
-}
-
-.category[disabled] {
-  border-top: 0;
-  border-bottom: 0;
-  height: 0;
-  opacity: 0;
-  transition-property: height, opacity;
-  transition-duration: 1s, 0.8s;
-}
-
-.category:not([disabled]) {
-  height: 52px;
-  transition-property: height, opacity;
-  transition-duration: 1s, 0.8s;
-}
-
-.category[selected] {
-  background-color: rgba(255, 255, 255, 0.35);
-  color: -moz-dialogtext;
-  border-color: rgba(50, 65, 92, 0.4);
-  -moz-border-end-color: #C9CFD7;
-}
-
-.category-name {
-  font-size: 150%;
-}
-
-/* Maximize the size of the viewport when the window is small */
-@media (max-width: 800px) {
-  .category-name {
-    display: none;
-  }
-}
-
-.category-badge {
-  background-color: #55D4FF;
-  padding: 2px 8px;
-  margin: 6px 0;
-  border-radius: 10000px;
-  color: #FFF;
-  font-weight: bold;
-  text-align: center;
-}
-
-.category-badge[value="0"] {
-  visibility: hidden;
-}
-
-.category-icon {
-  width: 32px;
-  height: 32px;
-  -moz-margin-start: 6px;
-}
-
-#category-search > .category-icon {
-  list-style-image: url("chrome://mozapps/skin/extensions/category-search.png");
-}
-#category-discover > .category-icon {
-  list-style-image: url("chrome://mozapps/skin/extensions/category-discover.png");
-}
-#category-locale > .category-icon {
-  list-style-image: url("chrome://mozapps/skin/extensions/category-languages.png");
-}
-#category-searchengine > .category-icon {
-  list-style-image: url("chrome://mozapps/skin/extensions/category-searchengines.png");
-}
-#category-extension > .category-icon {
-  list-style-image: url("chrome://mozapps/skin/extensions/category-extensions.png");
-}
-#category-service > .category-icon {
-  list-style-image: url("chrome://mozapps/skin/extensions/category-service.png");
-}
-#category-theme > .category-icon {
-  list-style-image: url("chrome://mozapps/skin/extensions/category-themes.png");
-}
-#category-plugin > .category-icon {
-  list-style-image: url("chrome://mozapps/skin/extensions/category-plugins.png");
-}
-#category-dictionary > .category-icon {
-  list-style-image: url("chrome://mozapps/skin/extensions/category-dictionaries.png");
-}
-#category-experiment > .category-icon {
-  list-style-image: url("chrome://mozapps/skin/extensions/category-experiments.png");
-}
-#category-availableUpdates > .category-icon {
-  list-style-image: url("chrome://mozapps/skin/extensions/category-available.png");
-}
-#category-recentUpdates > .category-icon {
-  list-style-image: url("chrome://mozapps/skin/extensions/category-recent.png");
-}
-
-
-/*** header ***/
-
-#header {
-  margin-bottom: 18px;
-}
-
-.nav-button {
-  list-style-image: url(chrome://mozapps/skin/extensions/navigation.png);
-}
-
-#back-btn:-moz-locale-dir(ltr),
-#forward-btn:-moz-locale-dir(rtl) {
-  border-top-right-radius: 0;
-  border-bottom-right-radius: 0;
-  border-right: none;
-  -moz-image-region: rect(0, 20px, 20px, 0);
-  padding-right: 3px;
-}
-
-#back-btn:-moz-locale-dir(rtl),
-#forward-btn:-moz-locale-dir(ltr) {
-  border-top-left-radius: 0;
-  border-bottom-left-radius: 0;
-  -moz-image-region: rect(0, 40px, 20px, 20px);
-  padding-left: 3px;
+.no-auto-hide > .menulist-dropmarker {
+  -moz-padding-start: 0px !important;
 }
 
 #header-utils-btn {
@@ -307,80 +19,25 @@
   -moz-margin-start: 2px;
 }
 
-#header-search {
-  margin: 0;
-  -moz-appearance: none;
-  padding: 3px 5px 2px;
-  border: 1px solid rgba(60,73,97,0.5);
-  border-radius: 10000px;
-  box-shadow: inset 0 1px 1px rgba(0,0,0,0.15), 0 1px rgba(255,255,255,0.25);
-  background: linear-gradient(rgba(255,255,255,0.2), rgba(255,255,255,0.3));
-  background-clip: padding-box;
+.warning-icon {
+  list-style-image: url("chrome://mozapps/skin/extensions/alerticon-warning.png");
+  height: 15px;
 }
 
-@media (max-width: 600px) {
-  #header-search {
-    width: 12em;
-  }
+.error-icon {
+  list-style-image: url("chrome://mozapps/skin/extensions/alerticon-error.png");
+  height: 15px;
 }
 
-#header-search[focused] {
-  box-shadow: @focusRingShadow@, inset 0 1px 1px rgba(0,0,0,0.15);
-  border-color: -moz-mac-focusring;
+.pending-icon,
+.info-icon {
+  list-style-image: url("chrome://mozapps/skin/extensions/alerticon-info-positive.png");
+  height: 15px;
 }
 
-#header-search > .textbox-input-box {
-  -moz-padding-start: 15px;
-  background: url("chrome://mozapps/skin/extensions/search.png") left no-repeat;
-}
-
-#header-search > .textbox-input-box:-moz-locale-dir(rtl) {
-  background-position: right;
-}
-
-#header-search > .textbox-input-box > html|*.textbox-input::-moz-placeholder {
-  color: #5C6470;
-  opacity: 1.0;
-}
-
-.view-header {
-  padding: 4px;
-  margin: 0;
-  min-height: 31px;
-  border-bottom: 1px solid rgba(50, 65, 92, 0.4);
-  background-image: linear-gradient(rgba(255, 255, 255, 0.2), rgba(255, 255, 255, 0.05));
-}
-
-
-/*** sorters ***/
-
-.sort-controls {
-  -moz-appearance: none;
-}
-
-.sorter {
-  -moz-appearance: none;
-  border: none;
-  color: #41434B;
-  background-color: transparent;
-  border-radius: 10000px;
-  padding: 0 6px;
-  margin: 0 6px;
-  min-width: 12px !important;
-  -moz-box-direction: reverse;
-}
-
-.sorter[checkState="1"],
-.sorter[checkState="2"],
-.sorter:active:hover {
-  text-shadow: @loweredShadow@;
-  background-color: #C0C3CB;
-  box-shadow: inset #A3A6AC 0 1px 1px, @loweredShadow@;
-}
-
-.sorter:hover {
-  text-shadow: @loweredShadow@;
-  background-color: #C0C3CB;
+.addon-view[pending="disable"] .pending-icon,
+.addon-view[pending="uninstall"] .pending-icon {
+  list-style-image: url("chrome://mozapps/skin/extensions/alerticon-info-negative.png");
 }
 
 .sorter[checkState="1"] {
@@ -391,576 +48,18 @@
   list-style-image: url("chrome://global/skin/arrow/arrow-up.gif");
 }
 
-.sorter .button-icon {
-  -moz-margin-start: 4px;
-}
-
-
-/*** discover view ***/
-
-.discover-spacer-before,
-.discover-spacer-after {
-  -moz-box-flex: 1;
-}
-
-#discover-error .alert {
-  max-width: 45em;
-  -moz-box-flex: 1;
-}
-
-.discover-logo {
-  list-style-image: url("chrome://mozapps/skin/extensions/discover-logo.png");
-  -moz-margin-end: 15px;
-}
-
-.discover-title {
-  font-weight: bold;
-  font-size: 24px;
-  font-family: MetaWebPro-Book, "Trebuchet MS", sans-serif;
-  margin: 0 0 15px 0;
-}
-
-.discover-description {
-  text-align: justify;
-  margin: 0 0 15px 0;
-}
-
-.discover-footer {
-  text-align: justify;
-}
-
-
-/*** list ***/
-
-.list {
-  -moz-appearance: none;
-  margin: 0;
-  border: none;
-  background-color: transparent;
-}
-
-.addon {
-  border-bottom: 1px solid #B6B1B9;
-  padding: 5px;
-  color: #373D48;
-}
-
-.details {
-  cursor: pointer;
-  margin: 0;
-  -moz-margin-start: 10px;
-}
-
-.icon-container {
-  width: 48px;
-  height: 48px;
-  margin: 3px 7px;
-  -moz-box-align: center;
-  -moz-box-pack: center;
-}
-
-.icon {
-  list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png");
-  max-width: 48px;
-  max-height: 48px;
-}
-
-.addon[active="false"] .icon {
-  filter: grayscale(1);
-}
-
-.addon-view[type="theme"] .icon {
-  list-style-image: url("chrome://mozapps/skin/extensions/themeGeneric.png");
-}
-
-.addon-view[type="locale"] .icon {
-  list-style-image: url("chrome://mozapps/skin/extensions/localeGeneric.png");
-}
-
-.addon-view[type="plugin"] .icon {
-  list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric.png");
-}
-
-.addon-view[type="dictionary"] .icon {
-  list-style-image: url("chrome://mozapps/skin/extensions/dictionaryGeneric.png");
-}
-
-.addon-view[type="experiment"] .icon {
-  list-style-image: url("chrome://mozapps/skin/extensions/experimentGeneric.png");
-}
-
-.name-container {
-  font-size: 150%;
-  margin-bottom: 0;
-  font-weight: bold;
-  color: #000;
-  text-shadow: @loweredShadow@;
-  -moz-box-align: end;
-  -moz-box-flex: 1;
-}
-
-.creator {
-  font-weight: bold;
-}
-
-.creator .text-link {
-  color: #0066CC;
-}
-
-.description-container {
-  margin-top: 8px;
-  -moz-margin-start: 6px;
-  -moz-box-align: center;
-}
-
-.description {
-  margin: 0;
-}
-
-.warning,
-.pending,
-.error {
-  -moz-margin-start: 48px;
-  font-weight: bold;
-  text-shadow: @loweredShadow@;
-  -moz-box-align: center;
-}
-
-.content-container,
-.basicinfo-container {
-  -moz-box-align: start;
-}
-
-.addon[status="installing"] > .content-container {
-  -moz-box-align: stretch;
-}
-
-.update-info-container {
-  -moz-box-align: center;
-}
-
-.advancedinfo-container,
-.update-available {
-  -moz-box-align: end;
-}
-
-.install-status-container {
-  -moz-box-pack: end;
-  -moz-box-align: end;
-}
-
-.name-outer-container {
-  -moz-box-pack: center;
-}
-
-.relnotes-toggle-container,
-.icon-outer-container {
-  -moz-box-pack: start;
-}
-
-.status-container,
-.control-container {
-  -moz-box-pack: end;
-}
-
-.addon-view .warning {
-  color: #916D15;
-}
-
-.addon-view .error {
-  color: #864441;
-}
-
-.addon-view .pending {
-  color: #1B7123;
-}
-
-.addon-view[pending="disable"] .pending,
-.addon-view[pending="uninstall"] .pending {
-  color: #62666E;
-}
-
-.addon-view[notification="warning"] {
-  background-image: linear-gradient(rgba(255, 255, 0, 0.2), rgba(255, 255, 0, 0.1));
-}
-
-.addon-view[notification="error"] {
-  background-image: linear-gradient(rgba(255, 0, 0, 0.2), rgba(255, 0, 0, 0.1));
-}
-
-.addon-view[notification="info"] {
-  background-image: linear-gradient(rgba(0, 0, 255, 0.2), rgba(0, 0, 255, 0.1));
-}
-
-.addon-view[pending="enable"],
-.addon-view[pending="upgrade"],
-.addon-view[pending="install"] {
-  background-image: linear-gradient(rgba(0, 255, 0, 0.2), rgba(0, 255, 0, 0.1));
-}
-
-.addon-view[pending="disable"],
-.addon-view[pending="uninstall"] {
-  background-image: linear-gradient(rgba(128, 128, 128, 0.2), rgba(128, 128, 128, 0.1));
-}
-
-.addon .relnotes-container {
-  -moz-box-align: start;
-  height: 0;
-  overflow: hidden;
-  opacity: 0;
-  transition-property: height, opacity;
-  transition-duration: 0.5s, 0.5s;
-}
-
-.addon[show-relnotes] .relnotes-container {
-  opacity: 1;
-  transition-property: height, opacity;
-  transition-duration: 0.5s, 0.5s;
-}
-
-.addon .relnotes-header {
-  font-weight: bold;
-  margin: 10px 0;
-}
-
 .addon .relnotes-toggle {
-  -moz-appearance: none;
-  border: none;
-  background: transparent;
-  font-weight: bold;
   -moz-box-direction: reverse;
-  cursor: pointer;
   list-style-image: url("chrome://global/skin/arrow/arrow-dn.gif");
 }
 
-.addon .relnotes-toggle > .button-box > .button-icon {
-  -moz-padding-start: 4px;
-}
-
 .addon[show-relnotes] .relnotes-toggle {
   list-style-image: url("chrome://global/skin/arrow/arrow-up.gif");
 }
 
-.addon[active="false"] {
-  background-color: rgba(135, 135, 135, 0.1);
-  background-image: linear-gradient(rgba(135, 135, 135, 0),
-                                    rgba(135, 135, 135, 0.1));
-}
-
-.addon-view[active="false"],
-.addon-view[active="false"] .name-container {
-  color: #686A6B;
-}
-
-.addon-view[notification="warning"] {
-  background-image: url("chrome://mozapps/skin/extensions/stripes-warning.png"),
-                    linear-gradient(rgba(255, 255, 0, 0.04),
-                                    rgba(255, 255, 0, 0));
-  background-repeat: repeat-x;
-}
-
-.addon-view[notification="error"] {
-  background-image: url("chrome://mozapps/skin/extensions/stripes-error.png"),
-                    linear-gradient(rgba(255, 0, 0, 0.04),
-                                    rgba(255, 0, 0, 0));
-  background-repeat: repeat-x;
-}
-
-.addon-view[pending="enable"],
-.addon-view[pending="upgrade"],
-.addon-view[pending="install"] {
-  background-image: url("chrome://mozapps/skin/extensions/stripes-info-positive.png"),
-                    linear-gradient(rgba(0, 255, 0, 0.04),
-                                    rgba(0, 255, 0, 0));
-  background-repeat: repeat-x;
-}
-
-.addon-view[pending="disable"],
-.addon-view[pending="uninstall"] {
-  background-image: url("chrome://mozapps/skin/extensions/stripes-info-negative.png"),
-                    linear-gradient(rgba(128, 128, 128, 0.04),
-                                    rgba(128, 128, 128, 0));
-  background-repeat: repeat-x;
-}
-
-.addon[selected] {
-  background-color: rgba(105, 125, 149, 0.39);
-  color: black;
-}
-
-.addon[selected] .name-container {
-  text-shadow: @loweredShadow@;
-}
-
-.addon[active="false"][selected] .name-container {
-  color: #3F3F3F;
-}
-
-
-/*** search view ***/
-
-#search-filter {
-  padding: 5px 20px;
-  font-size: 120%;
-  overflow-x: hidden;
-  border-bottom: 1px solid rgba(50, 65, 92, 0.4);
-}
-
-#search-filter-label {
-  font-weight: bold;
-  color: #666;
-}
-
-.search-filter-radio {
-  -moz-appearance: none;
-  padding: 0 10px;
-  margin: 0 3px;
-  border-radius: 10000px;
-}
-
-.search-filter-radio[selected] {
-  text-shadow: @loweredShadow@;
-  background-color: #C0C3CB;
-  box-shadow: inset #A3A6AC 0 1px 1px, @loweredShadow@;
-}
-
-.search-filter-radio:hover {
-  text-shadow: @loweredShadow@;
-  background-color: #C0C3CB;
-}
-
-.search-filter-radio .radio-check {
-  display: none;
-}
-
-.search-filter-radio .radio-icon {
-  display: none;
-}
-
-#search-allresults-link {
-  margin-top: 1em;
-  margin-bottom: 2em;
-}
-
-/*** detail view ***/
-
-#detail-view .loading {
-  opacity: 0;
-}
-
-#detail-view[loading-extended] .loading {
-  opacity: 1;
-  transition-property: opacity;
-  transition-duration: 1s;
-}
-
-.detail-view-container {
-  padding: 0 2em 2em 2em;
-  font-size: 110%;
-}
-
-#detail-notifications {
-  margin-top: 1em;
-  margin-bottom: 2em;
-}
-
-#detail-notifications .warning,
-#detail-notifications .pending,
-#detail-notifications .error {
-  -moz-margin-start: 0;
-}
-
-#detail-icon-container {
-  width: 64px;
-  -moz-margin-end: 10px;
-  margin-top: 6px;
-}
-
-#detail-icon {
-  max-width: 64px;
-  max-height: 64px;
-}
-
-#detail-summary {
-  margin-bottom: 2em;
-}
-
-#detail-name-container {
-  font-size: 200%;
-}
-
-#detail-screenshot {
-  -moz-margin-end: 2em;
-  max-width: 300px;
-  max-height: 300px;
-}
-
-#detail-screenshot[loading] {
-  background-image: url("chrome://global/skin/icons/loading_16.png"),
-                    linear-gradient(rgba(255, 255, 255, 0.5), transparent);
-  background-position: 50% 50%;
-  background-repeat: no-repeat;
-  border-radius: 3px;
-}
-
-#detail-screenshot[loading="error"] {
-  background-image: url("chrome://global/skin/media/error.png"),
-                    linear-gradient(rgba(255, 255, 255, 0.5), transparent);
-}
-
-#detail-desc-container {
-  margin-bottom: 2em;
-}
-
-#detail-desc, #detail-fulldesc {
-  -moz-margin-start: 6px;
-  /* This is necessary to fix layout issues with multi-line descriptions, see
-     bug 592712*/
-  outline: solid transparent;
-  white-space: pre-wrap;
-  min-width: 10em;
-}
-
-#detail-fulldesc {
-  margin-top: 1em;
-}
-
-#detail-contributions {
-  border-radius: 5px;
-  border: 1px solid rgba(50, 65, 92, 0.3);
-  margin-bottom: 2em;
-  padding: 1em;
-  background-color: rgba(255, 255, 255, 0.35);
-}
-
-#detail-contrib-description {
-  font-style: italic;
-  margin-bottom: 1em;
-  color: #373D48;
-}
-
-#detail-contrib-suggested {
-  color: grey;
-  font-weight: bold;
-}
-
-#detail-contrib-btn {
-  -moz-appearance: none;
-  color: #FFF;
-  border: 1px solid #3A4EEE;
-  border-radius: 3px;
-  list-style-image: url("chrome://mozapps/skin/extensions/heart.png");
-  background-color: #2F73EF;
-  background-image: linear-gradient(rgba(251, 252, 253, 0.70), rgba(246, 247, 248, 0.27) 49%, 
-                                    rgba(231, 232, 233, 0.25) 51%, rgba(225, 226, 229, 0.1));
-}
-
-#detail-contrib-btn .button-box {
-  padding: 0 6px 1px 6px;
-}
-
-#detail-contrib-btn .button-icon {
-  -moz-margin-end: 3px;
-}
-
-#detail-contrib-btn:not(:active):hover {
-  border-color: #4271FF;
-  background-color: #0459F7;
-  box-shadow: 0 1px 0 rgba(0, 0, 0, 0.1),
-              0 0 3.5px hsl(190, 90%, 80%);
-  transition: background-color .4s ease-in,
-              border-color .3s ease-in,
-              box-shadow .3s ease-in;
-}
-
-#detail-contrib-btn:active:hover {
-  background-color: #8FA1C1;
-  border-color: rgba(0, 0, 0, 0.65) rgba(0, 0, 0, 0.55) rgba(0, 0, 0, 0.5);
-  box-shadow: 0 0 6.5px rgba(0, 0, 0, 0.4) inset,
-              0 0 2px rgba(0, 0, 0, 0.4) inset;
-}
-
-#detail-grid {
-  margin-bottom: 2em;
-}
-
-#detail-grid > columns > column:first-child {
-  min-width: 15em;
-  max-width: 25em;
-}
-
-.detail-row[first-row="true"],
-.detail-row-complex[first-row="true"],
-setting[first-row="true"] {
-  border-top: none;
-}
-
-.detail-row,
-.detail-row-complex,
-setting {
-  border-top: 2px solid;
-  -moz-border-top-colors: rgba(28, 31, 37, 0.2) rgba(255, 255, 255, 0.2);
-  -moz-box-align: center;
-  min-height: 30px;
-}
-
-#detail-controls {
-  margin-bottom: 1em;
-}
-
-#detail-view[active="false"]:not([pending]):not([notification]) {
-  background-image: linear-gradient(rgba(135, 135, 135, 0.1),
-                                    rgba(135, 135, 135, 0));
-}
-
-setting[first-row="true"] {
-  margin-top: 2em;
-}
-
-setting {
-  -moz-box-align: start;
-}
-
-.preferences-alignment {
-  min-height: 30px;
-  -moz-box-align: center;
-}
-
-.preferences-description {
-  font-size: 90.9%;
-  color: graytext;
-  margin-top: -2px;
-  -moz-margin-start: 2em;
-  white-space: pre-wrap;
-}
-
-.preferences-description:empty {
-  display: none;
-}
-
-setting[type="radio"] > radiogroup {
-  -moz-box-orient: horizontal;
-}
-
-
-/*** creator ***/
-
-.creator > label {
-  -moz-margin-start: 0;
-  -moz-margin-end: 0;
-}
-
-.creator > .text-link {
-  margin-top: 1px;
-  margin-bottom: 1px;
-}
-
-
-/*** rating ***/
-
-.meta-rating {
-  -moz-margin-end: 0;
-  margin-top: 2px;
+.download-progress {
+  margin-top: 3px;
+  margin-bottom: 3px;
 }
 
 .meta-rating > .star {
@@ -971,229 +70,3 @@ setting[type="radio"] > radiogroup {
 .meta-rating > .star[on="true"] {
   list-style-image: url("chrome://mozapps/skin/extensions/rating-won.png");
 }
-
-
-/*** download progress ***/
-
-.download-progress {
-  background-image: linear-gradient(#DCDEE3, #CBCED6);
-  border: 1px solid #858898;
-  border-radius: 3px;
-  box-shadow: inset #E3E8EC 0 1px 1px, @loweredShadow@;
-  width: 200px;
-  height: 21px;
-  margin: 0 8px;
-}
-
-.download-progress[mode="undetermined"] .progress {
-  -moz-binding: url("chrome://global/content/bindings/progressmeter.xml#progressmeter-undetermined");
-}
-
-.download-progress[mode="undetermined"] {
-  border-color: #2E773A;
-}
-
-.download-progress[mode="undetermined"] .status-container {
-  padding: 0 2px;
-}
-
-.download-progress .start-cap,
-.download-progress[complete] .end-cap,
-.download-progress[mode="undetermined"] .end-cap,
-.download-progress .progress .progress-bar {
-  -moz-appearance: none;
-  background-image: linear-gradient(#6AC47E, #4FAC6A);
-  margin-top: -1px;
-  margin-bottom: -1px;
-  border: 1px solid #2E773A;
-}
-
-.download-progress .start-cap {
-  -moz-margin-start: -1px;
-  -moz-border-end-width: 0;
-}
-
-.download-progress .end-cap {
-  -moz-margin-end: -1px;
-  -moz-border-start-width: 0px !important;
-}
-
-.download-progress .progress .progress-bar  {
-  border-left-width: 0;
-  border-right-width: 0;
-  min-height: 21px;
-}
-
-.download-progress .progress {
-  -moz-appearance: none;
-  background-color: transparent;
-  padding: 0;
-  margin: 0;
-  border: none;
-}
-
-.download-progress .start-cap,
-.download-progress .end-cap {
-  width: 4px;
-}
-
-.download-progress .start-cap:-moz-locale-dir(ltr),
-.download-progress .end-cap:-moz-locale-dir(rtl) {
-  border-radius: 3px 0 0 3px;
-}
-
-.download-progress .end-cap:-moz-locale-dir(ltr),
-.download-progress .start-cap:-moz-locale-dir(rtl) {
-  border-radius: 0 3px 3px 0;
-}
-
-.download-progress .cancel {
-  -moz-appearance: none;
-  background-color: rgba(255, 255, 255, 0.15);
-  border: 1px solid rgba(0, 0, 0, 0.4);
-  padding: 3px;
-  border-radius: 3px;
-  min-width: 0;
-  margin: 3px;
-}
-
-.download-progress .cancel .button-text {
-  display: none;
-}
-
-.download-progress .cancel .button-icon {
-  -moz-margin-start: 0;
-}
-
-.download-progress .cancel {
-  list-style-image: url('chrome://mozapps/skin/extensions/cancel.png');
-}
-
-.download-progress .status-container {
-  -moz-box-align: center;
-}
-
-.download-progress .status {
-  text-shadow: @loweredShadow@;
-}
-
-
-/*** install status ***/
-
-.install-status {
-  -moz-box-align: center;
-}
-
-
-/*** check for updates ***/
-
-#updates-container {
-  -moz-box-align: center;
-}
-
-#updates-installed,
-#updates-downloaded {
-  color: #3C735C;
-  font-weight: bold;
-}
-
-#update-selected {
-  margin: 12px;
-}
-
-
-/*** buttons ***/
-
-.addon-control[disabled="true"]:not(.no-auto-hide) {
-  display: none;
-}
-
-.no-auto-hide .addon-control {
-  display: block !important;
-}
-
-.no-auto-hide > .menulist-dropmarker {
-  -moz-padding-start: 0px !important;
-}
-
-button.button-link {
-  -moz-appearance: none;
-  background: transparent;
-  border: none;
-  box-shadow: none;
-  text-decoration: underline;
-  color: #0066CC;
-  cursor: pointer;
-  min-width: 0;
-  margin: 0 6px;
-}
-
-.text-link {
-  color: #3386D5;
-}
-
-.button-link:hover,
-.text-link:hover {
-  color: #3DA1FF;
-}
-
-/* Needed to override normal button style from inContent.css */
-button.button-link:not([disabled="true"]):active:hover {
-  background: transparent;
-  border: none;
-  box-shadow: none;
-}
-
-.header-button {
-  -moz-appearance: none;
-  padding: 0 4px;
-  margin: 0;
-  height: 22px;
-  border: 1px solid rgba(60,73,97,0.5);
-  border-radius: @toolbarbuttonCornerRadius@;
-  box-shadow: inset 0 1px rgba(255,255,255,0.25), 0 1px rgba(255,255,255,0.25);
-  background: linear-gradient(rgba(255,255,255,0.45), transparent);
-  background-clip: padding-box;
-}
-
-.header-button .toolbarbutton-text {
-  display: none;
-}
-
-.header-button[disabled="true"] .toolbarbutton-icon {
-  opacity: 0.4;
-}
-
-.header-button:not([disabled="true"]):active:hover,
-.header-button[open="true"] {
-  border-color: rgba(45,54,71,0.7);
-  box-shadow: inset 0 0 4px rgb(45,54,71), 0 1px rgba(255,255,255,0.25);
-  background-image: linear-gradient(rgba(45,54,71,0.6), transparent);
-}
-
-/*** telemetry experiments ***/
-
-#detail-experiment-container {
-  font-size: 80%;
-  margin-bottom: 1em;
-}
-
-#detail-experiment-bullet-container,
-#detail-experiment-state,
-#detail-experiment-time,
-.experiment-bullet-container,
-.experiment-state,
-.experiment-time {
-  vertical-align: middle;
-  display: inline-block;
-}
-
-.addon .experiment-bullet,
-#detail-experiment-bullet {
-  fill: rgb(158, 158, 158);
-}
-
-.addon[active="true"] .experiment-bullet,
-#detail-view[active="true"] #detail-experiment-bullet {
-  fill: rgb(106, 201, 20);
-}
diff --git a/toolkit/themes/osx/mozapps/jar.mn b/toolkit/themes/osx/mozapps/jar.mn
index 974776a0bca..9b1f5d14e6d 100644
--- a/toolkit/themes/osx/mozapps/jar.mn
+++ b/toolkit/themes/osx/mozapps/jar.mn
@@ -32,7 +32,7 @@ toolkit.jar:
   skin/classic/mozapps/extensions/utilities.svg                   (../../shared/extensions/utilities.svg)
   skin/classic/mozapps/extensions/toolbarbutton-dropmarker.png    (extensions/toolbarbutton-dropmarker.png)
   skin/classic/mozapps/extensions/heart.png                       (extensions/heart.png)
-  skin/classic/mozapps/extensions/navigation.png                  (extensions/navigation.png)
+  skin/classic/mozapps/extensions/navigation.png                  (../../shared/extensions/navigation.png)
   skin/classic/mozapps/extensions/stripes-warning.png             (extensions/stripes-warning.png)
   skin/classic/mozapps/extensions/stripes-error.png               (extensions/stripes-error.png)
   skin/classic/mozapps/extensions/stripes-info-positive.png       (extensions/stripes-info-positive.png)
diff --git a/toolkit/themes/shared/extensions/extensions.inc.css b/toolkit/themes/shared/extensions/extensions.inc.css
new file mode 100644
index 00000000000..440d04ee070
--- /dev/null
+++ b/toolkit/themes/shared/extensions/extensions.inc.css
@@ -0,0 +1,1023 @@
+%if 0
+/* 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/. */
+%endif
+@import url("chrome://global/skin/in-content/common.css");
+
+.main-content {
+  padding-top: 0;
+  -moz-padding-end: 0;
+}
+
+#nav-header {
+  min-height: 39px;
+  background-color: #424f5a;
+}
+
+.view-pane > .list > scrollbox {
+  -moz-padding-end: 48px;
+}
+
+
+/*** global warnings ***/
+
+.global-warning-container {
+  overflow-x: hidden;
+}
+
+.global-warning {
+  -moz-box-align: center;
+  padding: 0 8px;
+  color: #916D15;
+  font-weight: bold;
+}
+
+#addons-page[warning] .global-warning-container {
+  background-color: rgba(255, 255, 0, 0.1);
+  background-image: url("chrome://mozapps/skin/extensions/stripes-warning.png");
+  background-repeat: repeat-x;
+}
+
+#detail-view .global-warning {
+  padding: 4px 12px;
+  border-bottom: 1px solid #c1c1c1;
+}
+
+@media (max-width: 600px) {
+  .global-warning-text {
+    display: none;
+  }
+
+  .global-warning .warning-icon {
+    background-color: #fff;
+    box-shadow: 0 0 2px 5px #fff;
+    border-radius: 10px;
+  }
+}
+
+/*** global informations ***/
+#addons-page .global-info-container {
+  background-color: #f3f7fb;
+  border-top-right-radius: 2px;
+  border-top-left-radius: 2px;
+}
+
+/* Plugins aren't yet disabled by safemode (bug 342333),
+   so don't show that warning when viewing plugins. */
+#addons-page[warning="safemode"] .view-pane[type="plugin"] .global-warning-container,
+#addons-page[warning="safemode"] #detail-view[loading="true"] .global-warning-container {
+  background-color: inherit;
+  background-image: none;
+}
+
+
+/*** notification icons ***/
+
+.warning-icon,
+.error-icon,
+.pending-icon,
+.info-icon {
+  width: 16px;
+  margin: 3px 0;
+}
+
+
+/*** view alert boxes ***/
+
+.alert-container {
+  -moz-box-align: center;
+  -moz-margin-end: 48px;
+}
+
+.alert-spacer-before {
+  -moz-box-flex: 1;
+}
+
+.alert-spacer-after {
+  -moz-box-flex: 3;
+}
+
+.alert {
+  -moz-box-align: center;
+  padding: 10px;
+  color: #333;
+  border: 1px solid #c1c1c1;
+  border-radius: 2px;
+  background-color: #ebebeb;
+}
+
+.alert .alert-title {
+  font-weight: bold;
+  font-size: 200%;
+  margin-bottom: 15px;
+}
+
+.alert button {
+  margin: 1em 2em;
+}
+
+.loading {
+  list-style-image: url("chrome://global/skin/icons/loading_16.png");
+  padding-left: 20px;
+  padding-right: 20px;
+}
+
+
+/*** category selector ***/
+
+#categories {
+  padding-top: 0;
+}
+
+.category[disabled] {
+  overflow: hidden;
+  height: 0;
+  min-height: 0;
+  opacity: 0;
+  transition-property: min-height, opacity;
+  transition-duration: 1s, 0.8s;
+}
+
+.category:not([disabled]) {
+  min-height: 40px;
+  transition-property: min-height, opacity;
+  transition-duration: 1s, 0.8s;
+}
+
+/* Maximize the size of the viewport when the window is small */
+@media (max-width: 800px) {
+  .category-name {
+    display: none;
+  }
+}
+
+.category-badge {
+  background-color: #55D4FF;
+  padding: 2px 8px;
+  margin: 6px 0;
+  -moz-margin-start: 6px;
+  border-radius: 100%;
+  color: #FFF;
+  font-weight: bold;
+  text-align: center;
+}
+
+.category-badge[value="0"] {
+  display: none;
+}
+
+#category-search > .category-icon {
+  list-style-image: url("chrome://mozapps/skin/extensions/category-search.png");
+}
+#category-discover > .category-icon {
+  list-style-image: url("chrome://mozapps/skin/extensions/category-discover.png");
+}
+#category-locale > .category-icon {
+  list-style-image: url("chrome://mozapps/skin/extensions/category-languages.png");
+}
+#category-searchengine > .category-icon {
+  list-style-image: url("chrome://mozapps/skin/extensions/category-searchengines.png");
+}
+#category-extension > .category-icon {
+  list-style-image: url("chrome://mozapps/skin/extensions/category-extensions.png");
+}
+#category-service > .category-icon {
+  list-style-image: url("chrome://mozapps/skin/extensions/category-service.png");
+}
+#category-theme > .category-icon {
+  list-style-image: url("chrome://mozapps/skin/extensions/category-themes.png");
+}
+#category-plugin > .category-icon {
+  list-style-image: url("chrome://mozapps/skin/extensions/category-plugins.png");
+}
+#category-dictionary > .category-icon {
+  list-style-image: url("chrome://mozapps/skin/extensions/category-dictionaries.png");
+}
+#category-experiment > .category-icon {
+  list-style-image: url("chrome://mozapps/skin/extensions/category-experiments.png");
+}
+#category-availableUpdates > .category-icon {
+  list-style-image: url("chrome://mozapps/skin/extensions/category-available.png");
+}
+#category-recentUpdates > .category-icon {
+  list-style-image: url("chrome://mozapps/skin/extensions/category-recent.png");
+}
+
+
+/*** header ***/
+
+#header {
+  margin-top: 20px;
+  margin-bottom: 20px;
+  -moz-margin-end: 48px;
+}
+
+@media (max-width: 600px) {
+  #header-search {
+    width: 12em;
+  }
+}
+
+.view-header {
+  margin: 0;
+  -moz-margin-end: 48px;
+  border-bottom: 1px solid #c1c1c1;
+}
+
+#header-utils-btn {
+  height: 30px;
+  line-height: 20px;
+  border-color: #c1c1c1;
+  background-color: #fbfbfb;
+  padding-right: 10px;
+  padding-left: 10px;
+}
+
+#header-utils-btn:not([disabled="true"]):active:hover,
+#header-utils-btn[open="true"] {
+  background-color: #dadada;
+}
+
+.header-button {
+  -moz-appearance: none;
+  border: 1px solid;
+  border-radius: 2px;
+}
+
+.header-button[disabled="true"] > .toolbarbutton-icon {
+  opacity: 0.4;
+}
+
+.header-button:not([disabled="true"]):hover,
+#header-utils-btn:not([disabled="true"]):hover {
+  background-color: #ebebeb;
+  cursor: pointer;
+}
+
+.header-button > .toolbarbutton-text {
+  display: none;
+}
+
+.nav-button {
+  list-style-image: url(chrome://mozapps/skin/extensions/navigation.png);
+  margin-top: 15px;
+  margin-bottom: 15px;
+  border-color: transparent;
+}
+
+.nav-button:not([disabled="true"]):hover {
+  border-color: #ebebeb;
+}
+
+#back-btn:-moz-locale-dir(ltr),
+#forward-btn:-moz-locale-dir(rtl) {
+  -moz-image-region: rect(0, 18px, 18px, 0);
+}
+
+#back-btn:-moz-locale-dir(rtl),
+#forward-btn:-moz-locale-dir(ltr) {
+  -moz-image-region: rect(0, 36px, 18px, 18px);
+}
+
+
+/*** sorters ***/
+
+.sort-controls {
+  -moz-appearance: none;
+}
+
+.sorter {
+  height: 35px;
+  border: none;
+  border-radius: 0;
+  background-color: transparent;
+  color: #536680;
+  margin: 0;
+  min-width: 12px !important;
+  -moz-box-direction: reverse;
+}
+
+.sorter .button-box {
+  padding-top: 0;
+  padding-bottom: 0;
+}
+
+.sorter[checkState="1"],
+.sorter[checkState="2"] {
+  background-color: #ebebeb;
+  box-shadow: 0 -4px 0 0 #ff9500 inset;
+}
+
+.sorter .button-icon {
+  -moz-margin-start: 6px;
+}
+
+
+/*** discover view ***/
+
+.discover-spacer-before,
+.discover-spacer-after {
+  -moz-box-flex: 1;
+}
+
+#discover-error .alert {
+  max-width: 45em;
+  -moz-box-flex: 1;
+}
+
+.discover-logo {
+  list-style-image: url("chrome://mozapps/skin/extensions/discover-logo.png");
+  -moz-margin-end: 15px;
+}
+
+.discover-title {
+  font-weight: bold;
+  font-size: 24px;
+  font-family: MetaWebPro-Book, "Trebuchet MS", sans-serif;
+  margin: 0 0 15px 0;
+}
+
+.discover-description {
+  text-align: justify;
+  margin: 0 0 15px 0;
+}
+
+.discover-footer {
+  text-align: justify;
+}
+
+
+/*** list ***/
+
+.list {
+  -moz-appearance: none;
+  margin: 0;
+  border-color: transparent;
+  background-color: transparent;
+}
+
+.addon {
+  color: #444;
+  border-bottom: 1px solid #c1c1c1;
+  padding: 5px;
+  background-origin: border-box;
+}
+
+.addon:not(:only-child):last-child {
+  border-bottom-width: 0;
+}
+
+.details {
+  cursor: pointer;
+  margin: 0;
+  -moz-margin-start: 10px;
+}
+
+.icon-container {
+  width: 48px;
+  height: 48px;
+  margin: 3px 7px;
+  -moz-box-align: center;
+  -moz-box-pack: center;
+}
+
+.icon {
+  list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png");
+  max-width: 48px;
+  max-height: 48px;
+}
+
+.content-inner-container {
+  -moz-margin-end: 5px;
+}
+
+.addon[active="false"] .icon {
+  filter: grayscale(1);
+}
+
+.addon-view[type="theme"] .icon {
+  list-style-image: url("chrome://mozapps/skin/extensions/themeGeneric.png");
+}
+
+.addon-view[type="locale"] .icon {
+  list-style-image: url("chrome://mozapps/skin/extensions/localeGeneric.png");
+}
+
+.addon-view[type="plugin"] .icon {
+  list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric.png");
+}
+
+.addon-view[type="dictionary"] .icon {
+  list-style-image: url("chrome://mozapps/skin/extensions/dictionaryGeneric.png");
+}
+
+.addon-view[type="experiment"] .icon {
+  list-style-image: url("chrome://mozapps/skin/extensions/experimentGeneric.png");
+}
+
+.name-container {
+  font-size: 150%;
+  font-weight: bold;
+  -moz-box-align: end;
+  -moz-box-flex: 1;
+}
+
+.creator {
+  font-weight: bold;
+}
+
+.description-container {
+  -moz-margin-start: 6px;
+  -moz-box-align: center;
+}
+
+.description {
+  margin: 0;
+}
+
+.warning,
+.pending,
+.error {
+  -moz-margin-start: 48px;
+  font-weight: bold;
+  -moz-box-align: center;
+}
+
+.content-container,
+.basicinfo-container {
+  -moz-box-align: start;
+}
+
+.addon[status="installing"] > .content-container {
+  -moz-box-align: stretch;
+}
+
+.update-info-container {
+  -moz-box-align: center;
+}
+
+.update-available {
+  -moz-box-align: end;
+}
+
+.install-status-container {
+  -moz-box-pack: end;
+  -moz-box-align: end;
+}
+
+.name-outer-container {
+  -moz-box-pack: center;
+}
+
+.relnotes-toggle-container,
+.icon-outer-container {
+  -moz-box-pack: start;
+}
+
+.status-container,
+.control-container {
+  -moz-box-pack: end;
+}
+
+.addon-view .warning {
+  color: #916d15;
+}
+
+.addon-view .error {
+  color: #d74345;
+}
+
+.addon-view .pending {
+  color: #1b7123;
+}
+
+.addon-view[pending="disable"] .pending,
+.addon-view[pending="uninstall"] .pending {
+  color: #62666e;
+}
+
+.addon .relnotes-container {
+  -moz-box-align: start;
+  -moz-margin-start: 6px;
+  height: 0;
+  overflow: hidden;
+  opacity: 0;
+  transition-property: height, opacity;
+  transition-duration: 0.5s, 0.5s;
+}
+
+.addon[show-relnotes] .relnotes-container {
+  opacity: 1;
+  transition-property: height, opacity;
+  transition-duration: 0.5s, 0.5s;
+}
+
+.addon .relnotes-header {
+  font-weight: bold;
+  margin: 10px 0;
+}
+
+.addon .relnotes-toggle {
+  -moz-appearance: none;
+  border: none;
+  background: transparent;
+  font-weight: bold;
+  cursor: pointer;
+}
+
+.addon .relnotes-toggle > .button-box > .button-icon {
+  -moz-padding-start: 4px;
+}
+
+.addon-view[notification="warning"] {
+  background-image: url("chrome://mozapps/skin/extensions/stripes-warning.png"),
+                    linear-gradient(rgba(255, 255, 0, 0.04),
+                                    rgba(255, 255, 0, 0));
+  background-repeat: repeat-x;
+}
+
+.addon-view[notification="error"] {
+  background-image: url("chrome://mozapps/skin/extensions/stripes-error.png"),
+                    linear-gradient(rgba(255, 0, 0, 0.04),
+                                    rgba(255, 0, 0, 0));
+  background-repeat: repeat-x;
+}
+
+.addon-view[pending="enable"],
+.addon-view[pending="upgrade"],
+.addon-view[pending="install"] {
+  background-image: url("chrome://mozapps/skin/extensions/stripes-info-positive.png"),
+                    linear-gradient(rgba(0, 255, 0, 0.04),
+                                    rgba(0, 255, 0, 0));
+  background-repeat: repeat-x;
+}
+
+.addon-view[pending="disable"],
+.addon-view[pending="uninstall"] {
+  background-image: url("chrome://mozapps/skin/extensions/stripes-info-negative.png"),
+                    linear-gradient(rgba(128, 128, 128, 0.04),
+                                    rgba(128, 128, 128, 0));
+  background-repeat: repeat-x;
+}
+
+.addon[selected] {
+  background-color: #fafafa;
+  color: #333;
+  -moz-padding-start: 1px; /* compensate the 4px border */
+  -moz-border-start: solid 4px #ff9500;
+}
+
+.addon[active="false"] {
+  opacity: 0.5;
+}
+
+.addon[active="false"][selected] {
+  opacity: 0.7;
+}
+
+
+/*** item - uninstalled ***/
+
+.addon[status="uninstalled"] {
+  border: none;
+}
+
+.addon[status="uninstalled"] > .container {
+  -moz-box-align: center;
+  padding: 4px 20px;
+  background-color: #FDFFA8;
+  border-radius: 8px;
+  font-size: 120%;
+}
+
+.addon[status="uninstalled"][selected] {
+  background-color: transparent;
+}
+
+
+/*** search view ***/
+
+#search-filter {
+  padding: 5px 20px;
+  -moz-margin-end: 48px;
+  font-size: 120%;
+  border-bottom: 1px solid #c1c1c1;
+  overflow-x: hidden;
+}
+
+#search-filter-label {
+  font-weight: bold;
+  color: grey;
+  -moz-margin-end: 10px;
+}
+
+#search-allresults-link {
+  margin-top: 1em;
+  margin-bottom: 2em;
+}
+
+
+/*** detail view ***/
+
+#detail-view {
+  -moz-margin-end: 48px;
+}
+
+#detail-view .loading {
+  opacity: 0;
+}
+
+#detail-view[loading-extended] .loading {
+  opacity: 1;
+  transition-property: opacity;
+  transition-duration: 1s;
+}
+
+.detail-view-container {
+  -moz-padding-end: 2em;
+  padding-bottom: 2em;
+  font-size: 110%;
+  color: #333;
+}
+
+#detail-notifications {
+  margin-top: 1em;
+  margin-bottom: 2em;
+}
+
+#detail-notifications .warning,
+#detail-notifications .pending,
+#detail-notifications .error {
+  -moz-margin-start: 0;
+}
+
+#detail-icon-container {
+  width: 64px;
+  -moz-margin-end: 10px;
+  margin-top: 6px;
+}
+
+#detail-icon {
+  max-width: 64px;
+  max-height: 64px;
+}
+
+#detail-summary {
+  margin-bottom: 2em;
+}
+
+#detail-name-container {
+  font-size: 200%;
+}
+
+#detail-screenshot-box {
+  -moz-margin-end: 2em;
+  padding: 10px;
+  background-color: white;
+  box-shadow: 0 1px 2px #666;
+}
+
+#detail-screenshot {
+  max-width: 300px;
+  max-height: 300px;
+}
+
+#detail-screenshot[loading] {
+  background-image: url("chrome://global/skin/icons/loading_16.png"),
+                    linear-gradient(rgba(255, 255, 255, 0.5), transparent);
+  background-position: 50% 50%;
+  background-repeat: no-repeat;
+  border-radius: 2px;
+}
+
+#detail-screenshot[loading="error"] {
+  background-image: url("chrome://global/skin/media/error.png"),
+                    linear-gradient(rgba(255, 255, 255, 0.5), transparent);
+}
+
+#detail-desc-container {
+  margin-bottom: 2em;
+}
+
+#detail-desc, #detail-fulldesc {
+  -moz-margin-start: 6px;
+  /* This is necessary to fix layout issues with multi-line descriptions, see
+     bug 592712*/
+  outline: solid transparent;
+  white-space: pre-wrap;
+  min-width: 10em;
+}
+
+#detail-fulldesc {
+  margin-top: 1em;
+}
+
+#detail-contributions {
+  border-radius: 2px;
+  border: 1px solid #D2DBE8;
+  margin-bottom: 2em;
+  padding: 1em;
+  background-color: #F3F7FB;
+}
+
+#detail-contrib-description {
+  font-style: italic;
+  margin-bottom: 1em;
+  color: #373D48;
+}
+
+#detail-contrib-suggested {
+  color: grey;
+  font-weight: bold;
+}
+
+#detail-contrib-btn {
+  color: #FFF;
+  text-shadow: none;
+  border: 1px solid #0095dd;
+  list-style-image: url("chrome://mozapps/skin/extensions/heart.png");
+  background-color: #0095dd;
+}
+
+#detail-contrib-btn .button-icon {
+  -moz-margin-end: 5px;
+}
+
+#detail-contrib-btn:not(:active):hover {
+  border-color: #008acb;
+  background-color: #008acb;
+}
+
+#detail-contrib-btn:active:hover {
+  background-color: #006b9d;
+  border-color: #006b9d;
+}
+
+#detail-grid {
+  margin-bottom: 2em;
+}
+
+#detail-grid > columns > column:first-child {
+  min-width: 15em;
+  max-width: 25em;
+}
+
+.detail-row[first-row="true"],
+.detail-row-complex[first-row="true"],
+setting[first-row="true"] {
+  border-top: none;
+}
+
+.detail-row,
+.detail-row-complex,
+setting {
+  border-top: 1px solid #c1c1c1;
+  -moz-box-align: center;
+  min-height: 35px;
+  font-size: 1.25rem;
+  line-height: 20px;
+  text-shadow: 0 1px 1px #fefffe;
+}
+
+#detail-controls {
+  margin-bottom: 1em;
+}
+
+setting[first-row="true"] {
+  margin-top: 2em;
+}
+
+setting {
+  -moz-box-align: start;
+}
+
+.preferences-alignment {
+  min-height: 30px;
+  -moz-box-align: center;
+}
+
+.preferences-description {
+  font-size: 90.9%;
+  color: graytext;
+  margin-top: -2px;
+  -moz-margin-start: 2em;
+  white-space: pre-wrap;
+}
+
+.preferences-description:empty {
+  display: none;
+}
+
+setting[type="radio"] > radiogroup {
+  -moz-box-orient: horizontal;
+}
+
+
+/*** creator ***/
+
+.creator > label {
+  -moz-margin-start: 0;
+  -moz-margin-end: 0;
+}
+
+.creator > .text-link {
+  margin-top: 1px;
+  margin-bottom: 1px;
+}
+
+
+/*** rating ***/
+
+.meta-rating {
+  -moz-margin-end: 0;
+  padding-top: 2px;
+}
+
+
+/*** download progress ***/
+
+.download-progress {
+  border: 1px solid #c1c1c1;
+  border-radius: 2px;
+  background-color: #fbfbfb;
+  width: 200px;
+  height: 30px;
+  margin: 2px 4px;
+}
+
+.download-progress[mode="undetermined"] {
+  border-color: #0095dd;
+}
+
+.download-progress .start-cap,
+.download-progress[complete] .end-cap,
+.download-progress[mode="undetermined"] .end-cap,
+.download-progress .progress .progress-bar {
+  -moz-appearance: none;
+  background-color: #0095dd;
+}
+
+.download-progress .progress .progress-bar  {
+  min-height: 28px;
+}
+
+.download-progress .progress {
+  -moz-appearance: none;
+  background-color: transparent;
+  padding: 0;
+  margin: 0;
+  border: none;
+}
+
+.download-progress .start-cap,
+.download-progress .end-cap {
+  width: 4px;
+}
+
+.download-progress .start-cap:-moz-locale-dir(ltr),
+.download-progress .end-cap:-moz-locale-dir(rtl) {
+  border-radius: 1px 0 0 1px;
+}
+
+.download-progress .end-cap:-moz-locale-dir(ltr),
+.download-progress .start-cap:-moz-locale-dir(rtl) {
+  border-radius: 0 1px 1px 0;
+}
+
+.download-progress .cancel {
+  -moz-appearance: none;
+  padding: 3px;
+  min-width: 0;
+  width: 20px;
+  height: 20px;
+  margin: 3px;
+}
+
+.download-progress .cancel .button-box {
+  /* override in-content/common.css !important rule */
+  padding: 0 !important;
+  border: none;
+}
+
+.download-progress .cancel .button-text {
+  display: none;
+}
+
+.download-progress .cancel .button-icon {
+  margin: 0;
+}
+
+.download-progress .cancel {
+  list-style-image: url('chrome://mozapps/skin/extensions/cancel.png');
+}
+
+.download-progress .status-container {
+  -moz-box-align: center;
+}
+
+.download-progress .status {
+  color: #333;
+  text-shadow: #fff 0 0 2px;
+}
+
+
+/*** install status ***/
+
+.install-status {
+  -moz-box-align: center;
+}
+
+
+/*** check for updates ***/
+
+#updates-container {
+  -moz-box-align: center;
+}
+
+#updates-container .button-link {
+  font-weight: bold;
+}
+
+#updates-installed,
+#updates-downloaded {
+  color: #00BB00;
+  font-weight: bold;
+}
+
+#update-selected {
+  margin: 12px;
+}
+
+
+/*** buttons ***/
+
+.addon-control[disabled="true"]:not(.no-auto-hide) {
+  display: none;
+}
+
+.no-auto-hide .addon-control {
+  display: block !important;
+}
+
+button.button-link {
+  -moz-appearance: none;
+  background: transparent;
+  border: none;
+  box-shadow: none;
+  text-decoration: underline;
+  color: #0095dd;
+  cursor: pointer;
+  min-width: 0;
+  height: 20px;
+  margin: 0 6px;
+}
+
+button.button-link:not(:-moz-focusring) > .button-box {
+  border-width: 0;
+  margin: 1px;
+}
+
+.text-link {
+  color: #0095dd;
+  font-size: inherit;
+}
+
+button.button-link:hover,
+.text-link:hover {
+  color: #4cb1ff;
+  background-color: transparent;
+}
+
+/* Needed to override normal button style from inContent.css */
+button.button-link:not([disabled="true"]):active:hover {
+  background-color: transparent;
+}
+
+
+/*** telemetry experiments ***/
+
+#detail-experiment-container {
+  font-size: 80%;
+  margin-bottom: 1em;
+}
+
+#detail-experiment-bullet-container,
+#detail-experiment-state,
+#detail-experiment-time,
+.experiment-bullet-container,
+.experiment-state,
+.experiment-time {
+  vertical-align: middle;
+  display: inline-block;
+}
+
+.addon .experiment-bullet,
+#detail-experiment-bullet {
+  fill: rgb(158, 158, 158);
+}
+
+.addon[active="true"] .experiment-bullet,
+#detail-view[active="true"] #detail-experiment-bullet {
+  fill: rgb(106, 201, 20);
+}
diff --git a/toolkit/themes/shared/extensions/navigation.png b/toolkit/themes/shared/extensions/navigation.png
new file mode 100644
index 0000000000000000000000000000000000000000..67ff3d9a76f123e8e54dfa586a02ed9b3d1ff6e1
GIT binary patch
literal 663
zcmV;I0%-k-P)<h;3K|Lk000e1NJLTq001Na000sQ1^@s6Gb4N`0007BNkl<Zc-muN
z7;1o5Sc(^jOMzIQ0yFG^I2VZ7DRoS=ysCEVl4UD*hDF6s1M(ZlFry(WuV~(^xeK<6
zN+~u0`Of4zCLH9Ld-oqa{0{_Qfxy|rcLGpcnFKRT<C4;5{`~ptH^_|h7cO2EmXvP<
zg&3)h2?jal_MN*A{v(0X%G%XHIbRaY$(=T1_8w$2&YV4e8R{rYVh!<^Rn}~|dF%FF
zWP`Tv-2H-IRAv%To*9IRFbAZLTUt?l-q~~K-y@rK{KTmXP)C^(bc}?YYV)=0H|`)C
zuxIc7S3(kUt3c@i4f|tDcW7#wq!iRQUATDZ1G1S%jvYS_^dLyy9A|t3ebaLN#?9OR
zi2xvV*b+HN?EV8tx+4UR9Y1*<8d9QIa|6)T=l&B3zJ2@l3*AA`XlnRR0$9Cv{XU?c
zdaMrGyYIk#VhsXjy5H1r(6SY)FJdiDfP&U?Dq3rRas8ecgHE10^9EOxUA%nd12JZR
z(k3v<76J9h;z~!czy!GY-1!SAj@q<k+jBk<=>tG{WV{YfqTYzC7FZx2JaO{$TVykL
z?cV!RP+SgFj5ra>X;C<G#aU>sASK)LLUZjcWV3)t1D0zYi7ks_fMwAZ^q_C+>;)MT
zPC~(04y<-|A)B%9z#&jHfkMWG)Y3X$K}~1tm8;i3f(-ig>-WEygw!>lv_^s%p=DKd
zd;k6W2X@TC!$)6>Nh_@dio20ppCtnm`qp_17e7qP%DV*Q_mN@7l!}`A>r<x9x({>=
xDBXEdTH~t%F(@ZwQD8<r5YGc*i6Phi0ssZm*sGNPi%9?g002ovPDHLkV1g8rFMt35

literal 0
HcmV?d00001

diff --git a/toolkit/themes/windows/mozapps/extensions/extensions.css b/toolkit/themes/windows/mozapps/extensions/extensions.css
index b1e0e942f7e..04dd4a7d7f5 100644
--- a/toolkit/themes/windows/mozapps/extensions/extensions.css
+++ b/toolkit/themes/windows/mozapps/extensions/extensions.css
@@ -2,336 +2,7 @@
  * 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/. */
 
-@import url("chrome://global/skin/inContentUI.css");
-
-
-.nav-button {
-  list-style-image: url(chrome://mozapps/skin/extensions/navigation.png);
-}
-
-#forward-btn {
-  -moz-border-start: none;
-}
-
-#back-btn:-moz-locale-dir(ltr),
-#forward-btn:-moz-locale-dir(rtl) {
-  -moz-image-region: rect(0, 18px, 18px, 0);
-  border-top-right-radius: 0;
-  border-bottom-right-radius: 0;
-}
-
-#back-btn:-moz-locale-dir(rtl),
-#forward-btn:-moz-locale-dir(ltr) {
-  -moz-image-region: rect(0, 36px, 18px, 18px);
-  border-top-left-radius: 0;
-  border-bottom-left-radius: 0;
-}
-
-
-/*** global warnings ***/
-
-.global-warning-container {
-  overflow-x: hidden;
-}
-
-.global-warning {
-  -moz-box-align: center;
-  padding: 0 8px;
-  color: #916D15;
-  font-weight: bold;
-}
-
-#addons-page[warning] .global-warning-container {
-  background-color: rgba(255, 255, 0, 0.1);
-  background-image: url("chrome://mozapps/skin/extensions/stripes-warning.png");
-  background-repeat: repeat-x;
-}
-
-#detail-view .global-warning {
-  padding: 4px 12px;
-  border-bottom: 1px solid #CAD4E0;  
-}
-
-@media (max-width: 600px) {
-  .global-warning-text {
-    display: none;
-  }
-
-  .global-warning .warning-icon {
-    background-color: #FFF;
-    box-shadow: 0px 0px 2px 5px #FFF;
-    border-radius: 10px;
-  }
-}
-
-/*** global informations ***/
-#addons-page .global-info-container {
-  background-color: #f3f7fb;
-  border-top-right-radius: 5px;
-  border-top-left-radius: 5px;
-}
-
-/* Plugins aren't yet disabled by safemode (bug 342333),
-   so don't show that warning when viewing plugins. */
-#addons-page[warning="safemode"] .view-pane[type="plugin"] .global-warning-container,
-#addons-page[warning="safemode"] #detail-view[loading="true"] .global-warning-container {
-  background-color: inherit;
-  background-image: none;
-}
-
-
-/*** notification icons ***/
-
-.warning-icon {
-  list-style-image: url("chrome://mozapps/skin/extensions/alerticon-warning.png");
-  width: 16px;
-  height: 15px;
-  margin: 3px 0;
-}
-
-.error-icon {
-  list-style-image: url("chrome://mozapps/skin/extensions/alerticon-error.png");
-  width: 16px;
-  height: 15px;
-  margin: 3px 0;
-}
-
-.pending-icon,
-.info-icon {
-  list-style-image: url("chrome://mozapps/skin/extensions/alerticon-info-positive.png");
-  width: 16px;
-  height: 15px;
-  margin: 3px 0;
-}
-
-.addon-view[pending="disable"] .pending-icon,
-.addon-view[pending="uninstall"] .pending-icon {
-  list-style-image: url("chrome://mozapps/skin/extensions/alerticon-info-negative.png");
-  width: 16px;
-  height: 15px;
-  margin: 3px 0;
-}
-
-
-/*** view alert boxes ***/
-
-.alert-container {
-  -moz-box-align: center;
-}
-
-.alert-spacer-before {
-  -moz-box-flex: 1;
-}
-
-.alert-spacer-after {
-  -moz-box-flex: 3;
-}
-
-.alert {
-  -moz-box-align: center;
-  padding: 10px;
-  color: #373D48;
-  border: 1px solid #A8B8D1;
-  border-radius: 8px;
-  background-image: linear-gradient(#FFF, #ECF1F7);
-  background-clip: padding-box;
-  box-shadow: 2px 2px 4px #999; 
-}
-
-.alert .alert-title {
-  font-weight: bold;
-  font-size: 200%;
-  margin-bottom: 15px;
-}
-
-.alert button {
-  margin: 1em 2em;
-}
-
-.loading {
-  list-style-image: url("chrome://global/skin/icons/loading_16.png");
-  padding-left: 20px;
-  padding-right: 20px;
-}
-
-
-/*** category selector ***/
-
-#categories {
-  -moz-appearance: none;
-  border: none;
-  -moz-margin-end: -1px;
-  background-color: transparent;
-  position: relative;
-  margin-top: 31px;
-}
-
-.category {
-  -moz-appearance: none;
-  background-color: transparent;
-  color: #252F3B;
-  min-height: 0;
-  padding: 10px 4px;
-  border-width: 1px;
-  border-style: solid;
-  border-color: transparent;
-  -moz-box-align: center;
-  overflow: hidden;
-}
-
-%ifdef XP_WIN
-@media (-moz-os-version: windows-xp),
-       (-moz-os-version: windows-vista),
-       (-moz-os-version: windows-win7) {
-%endif
-  .category:-moz-locale-dir(ltr) {
-    border-top-left-radius: 5px;
-    border-bottom-left-radius: 5px;
-  }
-
-  .category:-moz-locale-dir(rtl) {
-    border-top-right-radius: 5px;
-    border-bottom-right-radius: 5px;
-  }
-%ifdef XP_WIN
-}
-%endif
-
-.category[disabled] {
-  border-top: 0;
-  border-bottom: 0;
-  height: 0;
-  opacity: 0;
-  transition-property: height, opacity;
-  transition-duration: 1s, 0.8s;
-}
-
-.category:not([disabled]) {
-  height: 52px;
-  transition-property: height, opacity;
-  transition-duration: 1s, 0.8s;
-}
-
-.category[selected] {
-  background-color: rgba(255, 255, 255, 0.4);
-  color: #252F3B;
-  border-color: #C3CEDF;
-  -moz-border-end-color: #E2E9F2;
-}
-
-.category-name {
-  font-size: 150%;
-}
-
-/* Maximize the size of the viewport when the window is small */
-@media (max-width: 800px) {
-  .category-name {
-    display: none;
-  }
-}
-
-.category-badge {
-  background-color: #55D4FF;
-  padding: 2px 8px;
-  margin: 6px 0;
-  border-radius: 10000px;
-  color: #FFF;
-  font-weight: bold;
-  text-align: center;
-}
-
-.category-badge[value="0"] {
-  visibility: hidden;
-}
-
-.category-icon {
-  width: 32px;
-  height: 32px;
-  -moz-margin-start: 6px;
-}
-
-#category-search > .category-icon {
-  list-style-image: url("chrome://mozapps/skin/extensions/category-search.png");
-}
-#category-discover > .category-icon {
-  list-style-image: url("chrome://mozapps/skin/extensions/category-discover.png");
-}
-#category-locale > .category-icon {
-  list-style-image: url("chrome://mozapps/skin/extensions/category-languages.png");
-}
-#category-searchengine > .category-icon {
-  list-style-image: url("chrome://mozapps/skin/extensions/category-searchengines.png");
-}
-#category-extension > .category-icon {
-  list-style-image: url("chrome://mozapps/skin/extensions/category-extensions.png");
-}
-#category-service > .category-icon {
-  list-style-image: url("chrome://mozapps/skin/extensions/category-service.png");
-}
-#category-theme > .category-icon {
-  list-style-image: url("chrome://mozapps/skin/extensions/category-themes.png");
-}
-#category-plugin > .category-icon {
-  list-style-image: url("chrome://mozapps/skin/extensions/category-plugins.png");
-}
-#category-dictionary > .category-icon {
-  list-style-image: url("chrome://mozapps/skin/extensions/category-dictionaries.png");
-}
-#category-experiment > .category-icon {
-  list-style-image: url("chrome://mozapps/skin/extensions/category-experiments.png");
-}
-#category-availableUpdates > .category-icon {
-  list-style-image: url("chrome://mozapps/skin/extensions/category-available.png");
-}
-#category-recentUpdates > .category-icon {
-  list-style-image: url("chrome://mozapps/skin/extensions/category-recent.png");
-}
-
-
-/*** header ***/
-
-#header {
-  margin-bottom: 18px;
-}
-
-#header-search {
-  margin: 0;
-}
-
-@media (max-width: 600px) {
-  #header-search {
-    width: 12em;
-  }
-}
-
-@media (-moz-windows-default-theme) {
-  #header-search {
-    -moz-appearance: none;
-    border: 1px solid rgba(0, 0, 0, 0.32);
-    padding-bottom: 2px;
-    background-color: rgba(255, 255, 255, 0.4);
-  }
-
-%ifdef XP_WIN
-@media (-moz-os-version: windows-xp),
-       (-moz-os-version: windows-vista),
-       (-moz-os-version: windows-win7) {
-%endif
-  #header-search {
-    border-radius: 2.5px;
-  }
-%ifdef XP_WIN
-}
-%endif
-
-  #header-search:hover {
-    background-color: rgba(255, 255, 255, .75);
-  }
-
-  #header-search[focused] {
-    background-color: white;
-  }
-}
+%include ../../../shared/extensions/extensions.inc.css
 
 #header-utils-btn {
   list-style-image: url("chrome://mozapps/skin/extensions/utilities.svg#utilities");
@@ -344,42 +15,25 @@
   }
 }
 
-.view-header {
-  background-color: rgba(251, 252, 253, 0.25);
-  padding: 4px;
-  margin: 0;
-  min-height: 31px;
-  border-bottom: 1px solid #CAD4E0;
+.warning-icon {
+  list-style-image: url("chrome://mozapps/skin/extensions/alerticon-warning.png");
+  height: 15px;
 }
 
-
-/*** sorters ***/
-
-.sort-controls {
-  -moz-appearance: none;
+.error-icon {
+  list-style-image: url("chrome://mozapps/skin/extensions/alerticon-error.png");
+  height: 15px;
 }
 
-.sorter {
-  -moz-appearance: none;
-  border: none;
-  background-color: transparent;
-  color: #536680;
-  border-radius: 10000px;
-  padding: 0 6px;
-  margin: 0 6px;
-  min-width: 12px !important;
-  -moz-box-direction: reverse;
+.pending-icon,
+.info-icon {
+  list-style-image: url("chrome://mozapps/skin/extensions/alerticon-info-positive.png");
+  height: 15px;
 }
 
-.sorter .button-box {
-  padding-top: 0;
-  padding-bottom: 0;
-}
-
-.sorter[checkState="1"],
-.sorter[checkState="2"] {
-  background-color: rgba(194, 200, 206, 0.4);
-  box-shadow: 1px 1px 2px #B6BBC4 inset;
+.addon-view[pending="disable"] .pending-icon,
+.addon-view[pending="uninstall"] .pending-icon {
+  list-style-image: url("chrome://mozapps/skin/extensions/alerticon-info-negative.png");
 }
 
 .sorter[checkState="1"] {
@@ -390,584 +44,15 @@
   list-style-image: url("chrome://global/skin/arrow/arrow-up.gif");
 }
 
-.sorter .button-icon {
-  -moz-margin-start: 4px;
-}
-
-
-/*** discover view ***/
-
-.discover-spacer-before,
-.discover-spacer-after {
-  -moz-box-flex: 1;
-}
-
-#discover-error .alert {
-  max-width: 45em;
-  -moz-box-flex: 1;
-}
-
-.discover-logo {
-  list-style-image: url("chrome://mozapps/skin/extensions/discover-logo.png");
-  -moz-margin-end: 15px;
-}
-
-.discover-title {
-  font-weight: bold;
-  font-size: 24px;
-  font-family: MetaWebPro-Book, "Trebuchet MS", sans-serif;
-  margin: 0 0 15px 0;
-}
-
-.discover-description {
-  text-align: justify;
-  margin: 0 0 15px 0;
-}
-
-.discover-footer {
-  text-align: justify;
-}
-
-
-/*** list ***/
-
-.list {
-  -moz-appearance: none;
-  margin: 0;
-  border: none;
-  background-color: transparent;
-}
-
-.addon {
-  color: black;
-  border-top: 2px solid;
-  -moz-border-top-colors: rgba(0, 0, 0, 0.1) rgba(255, 255, 255, 0.1);
-  border-bottom: 1px solid;
-  -moz-border-bottom-colors: rgba(255, 255, 255, 0.1);
-  padding: 5px;
-  background-origin: border-box;
-}
-
-.view-pane:not(#search-view) .addon:first-of-type,
-#search-view .addon[first] {
-  border-top-width: 1px;
-  -moz-border-top-colors: rgba(255, 255, 255, 0.1);
-}
-
-.view-pane:not(#search-view) .addon:last-of-type,
-#search-view .addon[last] {
-  border-bottom-width: 2px;
-  -moz-border-bottom-colors: rgba(0, 0, 0, 0.1) rgba(255, 255, 255, 0.1);
-}
-
-.details {
-  cursor: pointer;
-  margin: 0;
-  -moz-margin-start: 10px;
-}
-
-.icon-container {
-  width: 48px;
-  height: 48px;
-  margin: 3px 7px;
-  -moz-box-align: center;
-  -moz-box-pack: center;
-}
-
-.icon {
-  list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png");
-  max-width: 48px;
-  max-height: 48px;
-}
-
-.addon[active="false"] .icon {
-  filter: grayscale(1);
-}
-
-
-.addon-view[type="theme"] .icon {
-  list-style-image: url("chrome://mozapps/skin/extensions/themeGeneric.png");
-}
-
-.addon-view[type="locale"] .icon {
-  list-style-image: url("chrome://mozapps/skin/extensions/localeGeneric.png");
-}
-
-.addon-view[type="plugin"] .icon {
-  list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric.png");
-}
-
-.addon-view[type="dictionary"] .icon {
-  list-style-image: url("chrome://mozapps/skin/extensions/dictionaryGeneric.png");
-}
-
-.addon-view[type="experiment"] .icon {
-  list-style-image: url("chrome://mozapps/skin/extensions/experimentGeneric.png");
-}
-
-.name-container {
-  font-size: 150%;
-  font-weight: bold;
-  color: #3F3F3F;
-  margin-bottom: 0;
-  -moz-box-align: end;
-  -moz-box-flex: 1;
-}
-
-.creator {
-  font-weight: bold;
-}
-
-.creator .text-link {
-  color: #0066CC;
-}
-
-.description-container {
-  -moz-margin-start: 6px;
-  -moz-box-align: center;
-}
-
-.description {
-  margin: 0;
-}
-
-.warning,
-.pending,
-.error {
-  -moz-margin-start: 48px;
-  font-weight: bold;
-  -moz-box-align: center;
-}
-
-.content-container,
-.basicinfo-container {
-  -moz-box-align: start;
-}
-
-.addon[status="installing"] > .content-container {
-  -moz-box-align: stretch;
-}
-
-.advancedinfo-container,
-.update-info-container {
-  -moz-box-align: center;
-}
-
-.update-available {
-  -moz-box-align: end;
-}
-
-.install-status-container {
-  -moz-box-pack: end;
-  -moz-box-align: end;
-}
-
-.name-outer-container {
-  -moz-box-pack: center;
-}
-
-.relnotes-toggle-container,
-.icon-outer-container {
-  -moz-box-pack: start;
-}
-
-.status-container,
-.control-container {
-  -moz-box-pack: end;
-}
-
-.addon-view .warning {
-  color: #916D15;
-}
-
-.addon-view .error {
-  color: #864441;
-}
-
-.addon-view .pending {
-  color: #1B7123;
-}
-
-.addon-view[pending="disable"] .pending,
-.addon-view[pending="uninstall"] .pending {
-  color: #62666E;
-}
-
-.addon .relnotes-container {
-  -moz-box-align: start;
-  -moz-margin-start: 6px;
-  height: 0;
-  overflow: hidden;
-  opacity: 0;
-  transition-property: height, opacity;
-  transition-duration: 0.5s, 0.5s;
-}
-
-.addon[show-relnotes] .relnotes-container {
-  opacity: 1;
-  transition-property: height, opacity;
-  transition-duration: 0.5s, 0.5s;
-}
-
-.addon .relnotes-header {
-  font-weight: bold;
-  margin: 10px 0;
-}
-
 .addon .relnotes-toggle {
-  -moz-appearance: none;
-  border: none;
-  background: transparent;
-  font-weight: bold;
   -moz-box-direction: reverse;
-  cursor: pointer;
   list-style-image: url("chrome://global/skin/arrow/arrow-dn.gif");
 }
 
-.addon .relnotes-toggle > .button-box > .button-icon {
-  -moz-padding-start: 4px;
-}
-
 .addon[show-relnotes] .relnotes-toggle {
   list-style-image: url("chrome://global/skin/arrow/arrow-up.gif");
 }
 
-.addon[active="false"] {
-  background-color: rgba(135, 135, 135, 0.1);
-  background-image: linear-gradient(rgba(135, 135, 135, 0),
-                                    rgba(135, 135, 135, 0.1));
-}
-
-.addon-view[active="false"],
-.addon-view[active="false"] .name-container {
-  color: #888A8B;
-}
-
-.addon-view[notification="warning"] {
-  background-image: url("chrome://mozapps/skin/extensions/stripes-warning.png"),
-                    linear-gradient(rgba(255, 255, 0, 0.04),
-                                    rgba(255, 255, 0, 0));
-  background-repeat: repeat-x;
-}
-
-.addon-view[notification="error"] {
-  background-image: url("chrome://mozapps/skin/extensions/stripes-error.png"),
-                    linear-gradient(rgba(255, 0, 0, 0.04),
-                                    rgba(255, 0, 0, 0));
-  background-repeat: repeat-x;
-}
-
-.addon-view[pending="enable"],
-.addon-view[pending="upgrade"],
-.addon-view[pending="install"] {
-  background-image: url("chrome://mozapps/skin/extensions/stripes-info-positive.png"),
-                    linear-gradient(rgba(0, 255, 0, 0.04),
-                                    rgba(0, 255, 0, 0));
-  background-repeat: repeat-x;
-}
-
-.addon-view[pending="disable"],
-.addon-view[pending="uninstall"] {
-  background-image: url("chrome://mozapps/skin/extensions/stripes-info-negative.png"),
-                    linear-gradient(rgba(128, 128, 128, 0.04),
-                                    rgba(128, 128, 128, 0));
-  background-repeat: repeat-x;
-}
-
-.addon[selected] {
-  background-color: rgba(148, 172, 204, 0.39);
-  color: black;
-}
-
-.addon[active="false"][selected] .name-container {
-  color: #3F3F3F;
-}
-
-
-/*** item - uninstalled ***/
-
-.addon[status="uninstalled"] {
-  border: none;
-}
-
-.addon[status="uninstalled"] > .container {
-  -moz-box-align: center;
-  padding: 4px 20px;
-  background-color: #FDFFA8;
-  border-radius: 8px;
-  font-size: 120%;
-}
-
-.addon[status="uninstalled"][selected] {
-  background-color: transparent;
-}
-
-
-
-/*** search view ***/
-
-#search-filter {
-  padding: 5px 20px;
-  font-size: 120%;
-  border-bottom: 1px solid #CAD4E0;
-  overflow-x: hidden;
-}
-
-#search-filter-label {
-  font-weight: bold;
-  color: grey;
-}
-
-.search-filter-radio {
-  -moz-appearance: none;
-  padding: 0 6px;
-  margin: 0 3px;
-  border-radius: 10000px;
-}
-
-.search-filter-radio[selected] {
-  background-color: grey;
-  color: white;
-}
-
-.search-filter-radio .radio-check-box1 {
-  display: none;
-}
-
-.search-filter-radio .radio-icon {
-  display: none;
-}
-
-#search-allresults-link {
-  margin-top: 1em;
-  margin-bottom: 2em;
-}
-
-/*** detail view ***/
-
-#detail-view .loading {
-  opacity: 0;
-}
-
-#detail-view[loading-extended] .loading {
-  opacity: 1;
-  transition-property: opacity;
-  transition-duration: 1s;
-}
-
-.detail-view-container {
-  padding: 0 2em 2em 2em;
-  font-size: 110%;
-}
-
-#detail-notifications {
-  margin-top: 1em;
-  margin-bottom: 2em;
-}
-
-#detail-notifications .warning,
-#detail-notifications .pending,
-#detail-notifications .error {
-  -moz-margin-start: 0;
-}
-
-#detail-icon-container {
-  width: 64px;
-  -moz-margin-end: 10px;
-  margin-top: 6px;
-}
-
-#detail-icon {
-  max-width: 64px;
-  max-height: 64px;
-}
-
-#detail-summary {
-  margin-bottom: 2em;
-}
-
-#detail-name-container {
-  font-size: 200%;
-}
-
-#detail-screenshot {
-  -moz-margin-end: 2em;
-  max-width: 300px;
-  max-height: 300px;
-}
-
-#detail-screenshot[loading] {
-  background-image: url("chrome://global/skin/icons/loading_16.png"),
-                    linear-gradient(rgba(255, 255, 255, 0.5), transparent);
-  background-position: 50% 50%;
-  background-repeat: no-repeat;
-  border-radius: 3px;
-}
-
-#detail-screenshot[loading="error"] {
-  background-image: url("chrome://global/skin/media/error.png"),
-                    linear-gradient(rgba(255, 255, 255, 0.5), transparent);
-}
-
-#detail-desc-container {
-  margin-bottom: 2em;
-}
-
-#detail-desc, #detail-fulldesc {
-  -moz-margin-start: 6px;
-  /* This is necessary to fix layout issues with multi-line descriptions, see
-     bug 592712*/
-  outline: solid transparent;
-  white-space: pre-wrap;
-  min-width: 10em;
-}
-
-#detail-fulldesc {
-  margin-top: 1em;
-}
-
-#detail-contributions {
-  border-radius: 5px;
-  border: 1px solid #D2DBE8;
-  margin-bottom: 2em;
-  padding: 1em;
-  background-color: #F3F7FB;
-}
-
-#detail-contrib-description {
-  font-style: italic;
-  margin-bottom: 1em;
-  color: #373D48;
-}
-
-#detail-contrib-suggested {
-  color: grey;
-  font-weight: bold;
-}
-
-#detail-contrib-btn {
-  -moz-appearance: none;
-  color: #FFF;
-  border: 1px solid #3A4EEE;
-  border-radius: 3px;
-  list-style-image: url("chrome://mozapps/skin/extensions/heart.png");
-  background-color: #2F73EF;
-  background-image: linear-gradient(rgba(251, 252, 253, 0.70), rgba(246, 247, 248, 0.27) 49%, 
-                                    rgba(231, 232, 233, 0.25) 51%, rgba(225, 226, 229, 0.1));
-}
-
-#detail-contrib-btn .button-box {
-  padding: 0 6px 1px 6px;
-}
-
-#detail-contrib-btn .button-icon {
-  -moz-margin-end: 3px;
-}
-
-#detail-contrib-btn:not(:active):hover {
-  border-color: #4271FF;
-  background-color: #0459F7;
-  box-shadow: 0 1px 0 rgba(0, 0, 0, 0.1),
-              0 0 3.5px hsl(190, 90%, 80%);
-  transition: background-color .4s ease-in,
-              border-color .3s ease-in,
-              box-shadow .3s ease-in;
-}
-
-#detail-contrib-btn:active:hover {
-  background-color: #8FA1C1;
-  border-color: rgba(0, 0, 0, 0.65) rgba(0, 0, 0, 0.55) rgba(0, 0, 0, 0.5);
-  box-shadow: 0 0 6.5px rgba(0, 0, 0, 0.4) inset,
-              0 0 2px rgba(0, 0, 0, 0.4) inset,
-              0 1px 0 rgba(255, 255, 255, 0.4);
-}
-
-#detail-grid {
-  margin-bottom: 2em;
-}
-
-#detail-grid > columns > column:first-child {
-  min-width: 15em;
-  max-width: 25em;
-}
-
-.detail-row[first-row="true"],
-.detail-row-complex[first-row="true"],
-setting[first-row="true"] {
-  border-top: none;
-}
-
-.detail-row,
-.detail-row-complex,
-setting {
-  border-top: 2px solid;
-  -moz-border-top-colors: rgba(28, 31, 37, 0.1) rgba(255, 255, 255, 0.1);
-  -moz-box-align: center;
-  min-height: 30px;
-}
-
-#detail-controls {
-  margin-bottom: 1em;
-}
-
-#detail-view[active="false"]:not([pending]):not([notification]) {
-  background-image: linear-gradient(rgba(135, 135, 135, 0.1),
-                                    rgba(135, 135, 135, 0));
-}
-
-setting[first-row="true"] {
-  margin-top: 2em;
-}
-
-setting {
-  -moz-box-align: start;
-}
-
-.preferences-alignment {
-  min-height: 30px;
-  -moz-box-align: center;
-}
-
-.preferences-description {
-  font-size: 90.9%;
-  color: graytext;
-  margin-top: -2px;
-  -moz-margin-start: 2em;
-  white-space: pre-wrap;
-}
-
-.preferences-description:empty {
-  display: none;
-}
-
-setting[type="radio"] > radiogroup {
-  -moz-box-orient: horizontal;
-}
-
-menulist { /* Fixes some styling inconsistencies */
-  margin: 1px 5px 2px 5px;
-}
-
-/*** creator ***/
-
-.creator > label {
-  -moz-margin-start: 0;
-  -moz-margin-end: 0;
-}
-
-.creator > .text-link {
-  margin-top: 1px;
-  margin-bottom: 1px;
-}
-
-
-/*** rating ***/
-
-.meta-rating {
-  -moz-margin-end: 0;
-  padding-top: 2px;
-}
-
 .meta-rating > .star {
   list-style-image: url("chrome://mozapps/skin/extensions/rating-not-won.png");
   padding: 0 1px;
@@ -976,262 +61,3 @@ menulist { /* Fixes some styling inconsistencies */
 .meta-rating > .star[on="true"] {
   list-style-image: url("chrome://mozapps/skin/extensions/rating-won.png");
 }
-
-
-/*** download progress ***/
-
-.download-progress {
-  background-color: rgba(151,152,153,.05);
-  background-image: linear-gradient(rgba(251, 252, 253, 0.95), rgba(246, 247, 248, 0.47) 49%, 
-                                    rgba(231, 232, 233, 0.45) 51%, rgba(225, 226, 229, 0.3));
-  background-clip: padding-box;
-  border-radius: 3px;
-  border: 1px solid;
-  border-color: rgba(0, 0, 0, 0.12) rgba(0, 0, 0, 0.19) rgba(0, 0, 0, 0.38);
-  box-shadow: 0 0 0 1px rgba(255, 255, 255, 0.3) inset,
-              0 0 0 2px rgba(255, 255, 255, 0.1) inset;
-  width: 200px;
-  height: 21px;
-  margin: 0 8px;
-}
-
-.download-progress[mode="undetermined"] {
-  border-color: #358942 #317F3D #2E773A;
-}
-
-.download-progress[mode="undetermined"] .status-container {
-  padding: 0 2px;
-}
-
-.download-progress .start-cap,
-.download-progress[complete] .end-cap,
-.download-progress[mode="undetermined"] .end-cap,
-.download-progress .progress .progress-bar {
-  -moz-appearance: none;
-  background-image: linear-gradient(#92DDA0, #6FC483 49%, #5EB272 51%, #80CE91);
-  margin-top: -1px;
-  margin-bottom: -1px;
-  border: 1px solid;
-  border-color: #358942 #317F3D #2E773A;
-}
-
-.download-progress .start-cap {
-  -moz-margin-start: -1px;
-  -moz-border-end-width: 0;
-}
-
-.download-progress .end-cap {
-  -moz-margin-end: -1px;
-  -moz-border-start-width: 0px !important;
-}
-
-.download-progress .progress .progress-bar  {
-  border-left-width: 0;
-  border-right-width: 0;
-  min-height: 21px;
-}
-
-.download-progress .progress {
-  -moz-appearance: none;
-  background-color: transparent;
-  padding: 0;
-  margin: 0;
-  border: none;
-}
-
-.download-progress .start-cap,
-.download-progress .end-cap {
-  width: 4px;
-}
-
-.download-progress .start-cap:-moz-locale-dir(ltr),
-.download-progress .end-cap:-moz-locale-dir(rtl) {
-  border-radius: 3px 0 0 3px;
-}
-
-.download-progress .end-cap:-moz-locale-dir(ltr),
-.download-progress .start-cap:-moz-locale-dir(rtl) {
-  border-radius: 0 3px 3px 0;
-}
-
-.download-progress .cancel {
-  -moz-appearance: none;
-  background-color: rgba(255, 255, 255, 0.4);
-  border: 1px solid rgba(0, 0, 0, 0.4);
-  padding: 3px;
-  border-radius: 3px;
-  min-width: 0;
-  margin: 3px;
-}
-
-.download-progress .cancel:hover {
-  background-color: rgba(255, 255, 255, 0.6);
-  border: 1px solid rgba(0, 0, 0, 0.8);
-}
-
-.download-progress .cancel:active:hover {
-  box-shadow: inset rgba(0, 0, 0, 0.5) 1px 1px 2px;
-}
-
-.download-progress .cancel .button-box {
-  padding: 0;
-  border: none;
-}
-
-.download-progress .cancel .button-text {
-  display: none;
-}
-
-.download-progress .cancel .button-icon {
-  -moz-margin-start: 0;
-}
-
-.download-progress .cancel {
-  list-style-image: url('chrome://mozapps/skin/extensions/cancel.png');
-}
-
-.download-progress .status-container {
-  -moz-box-align: center;
-}
-
-.download-progress .status {
-  text-shadow: #FFF 0 0 2px;
-}
-
-/*** install status ***/
-
-.install-status {
-  -moz-box-align: center;
-}
-
-
-/*** check for updates ***/
-
-#updates-container {
-  -moz-box-align: center;
-}
-
-#updates-container .button-link {
-  font-weight: bold;
-}
-
-#updates-installed,
-#updates-downloaded {
-  color: #00BB00;
-  font-weight: bold;
-}
-
-#update-selected {
-  margin: 12px;
-}
-
-
-/*** buttons ***/
-
-.addon-control[disabled="true"]:not(.no-auto-hide) {
-  display: none;
-}
-
-.no-auto-hide .addon-control {
-  display: block !important;
-}
-
-button.button-link {
-  -moz-appearance: none;
-  background: transparent;
-  border: none;
-  box-shadow: none;
-  text-decoration: underline;
-  color: #0066CC;
-  cursor: pointer;
-  min-width: 0;
-  margin: 0 6px;
-}
-
-.text-link {
-  color: #3386D5;
-}
-
-.button-link:hover,
-.text-link:hover {
-  color: #3DA1FF;
-}
-
-/* Needed to override normal button style from inContent.css */
-button.button-link:not([disabled="true"]):active:hover {
-  background: transparent;
-  border: none;
-  box-shadow: none;
-}
-
-.header-button {
-  -moz-appearance: none;
-  padding: 1px 3px;
-  color: #444;
-  text-shadow: 0 0 3px white;
-  background: linear-gradient(rgba(251, 252, 253, 0.95), transparent 49%, 
-                              rgba(211, 212, 213, 0.45) 51%, rgba(225, 226, 229, 0.3));
-  background-clip: padding-box;
-  border: 1px solid rgba(31, 64, 100, 0.4);
-  border-top-color: rgba(31, 64, 100, 0.3);
-  box-shadow: 0 0 0 1px rgba(255, 255, 255, 0.25) inset,
-              0 0 2px 1px rgba(255, 255, 255, 0.25) inset;
-}
-
-%ifdef XP_WIN
-@media (-moz-os-version: windows-xp),
-       (-moz-os-version: windows-vista),
-       (-moz-os-version: windows-win7) {
-%endif
-  .header-button {
-    border-radius: 2.5px;
-  }
-%ifdef XP_WIN
-}
-%endif
-
-.header-button[disabled="true"] {
-  opacity: 0.8;
-}
-
-.header-button[disabled="true"] > .toolbarbutton-icon {
-  opacity: 0.4;
-}
-
-.header-button:not([disabled="true"]):active:hover,
-.header-button[open="true"] {
-  background-color: rgba(61, 76, 92, 0.2);
-  border-color: rgba(39, 53, 68, 0.5);
-  box-shadow: 0 0 3px 1px rgba(39, 53, 68, 0.2) inset;
-}
-
-.header-button > .toolbarbutton-text {
-  display: none;
-}
-
-/*** telemetry experiments ***/
-
-#detail-experiment-container {
-  font-size: 80%;
-  margin-bottom: 1em;
-}
-
-#detail-experiment-bullet-container,
-#detail-experiment-state,
-#detail-experiment-time,
-.experiment-bullet-container,
-.experiment-state,
-.experiment-time {
-  vertical-align: middle;
-  display: inline-block;
-}
-
-.addon .experiment-bullet,
-#detail-experiment-bullet {
-  fill: rgb(158, 158, 158);
-}
-
-.addon[active="true"] .experiment-bullet,
-#detail-view[active="true"] #detail-experiment-bullet {
-  fill: rgb(106, 201, 20);
-}
diff --git a/toolkit/themes/windows/mozapps/extensions/navigation.png b/toolkit/themes/windows/mozapps/extensions/navigation.png
deleted file mode 100644
index 8ff639127ab3cd167c789a7e4d5f0a395ad46b0f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1411
zcmV-}1$_F6P)<h;3K|Lk000e1NJLTq001Na000sQ1^@s6Gb4N`00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2igc4
z7Ahm90t-t300jd{L_t(Y$DNj6Xj69-$G^Xu`zN`%No>+IX$dxMQ)AGF4%<E{C>BeH
zj;>WZ@j(!_J&oa<f2fQx_A>u4kqNa6_*Rj<?4imYbPm~CP&+1wT3KovYzxM=X_A|J
zbMNiFcQ3z;*tMGZgA146@7!}f=lssO=a8qfi+Ia&0AT660l>olTMPh>zOMi<-z3bw
z;fzp4J^(coWD!9AZAw=;;{_0)U|9e;>X^MA{dzD0fI0vhyLWUP?eE!r06>%)V5*Fa
z7eKVXXZL~b9UVsjY@|8`YNINkGE6Oi(6)HXU?#7hN~Pxq2lnmhq6+ycfOr6P1N-)L
zrPA|*nY?~#TfAiuK#1yI6N*^_hNmG8wI|}Io#9AdbW;MshKMvXm+1oFqE}JPb-8Bd
zGF`!jh!owFfHNHFYfr>aQ>Xy7Mb-l<!_)!@w{J-tcZcftH#Igx<Q)jscpr_Ak6opP
zeDqoEWjVU#bI17j*wtW-_mRju(A3xrcc^}U`<BFU0AXtDHK<A;j#7s^w<eBxLXkt!
z=2l2<5k8;q@%3vXXIYo@oXXY%hyiGz5i2hj-HTBfurBHO^=l(%eLmk~$t@z<+zL-9
za;S4_;uwVrR8%1dEqexlA3$U0md(e+P~>n+tOXvg7q)3Zk&Cm_GtcGhtBh?K8cd@E
z);6ZEUjO;Kwrw5H0KB65f)D?E5I_3Sho@Hv*W}=wU^oFa!8+0uZI(pI9U%?|g?t`U
zsVOKgXGiWop1cSk4PXg?#a1MsfA6mC9|#))hhwoAd_Es|K>)D<p5r5%oCz4st<ZH1
zidw|<v&lqBRWGbcaK5CfEF%TqkH<Gdbh*Lv0yv(9+a-eIIM@Vm5C*YW49_(6@ZMe9
zr*8cA#|Qu!K&kRSL_GewAfp>_OA-V@fFKAU3<JS-LJ*y>3<J8ZLn*qD_iq40*#A}u
zVM)Nh0YQH)M7Ik(&x7GOa4ZKx2yDv&0pOM-)cE~y^IUMP95Mhbjo!R5+8C+7t;u<?
zEDMfzf@4{5gv_m|a=Mtyrqx0&t*guFV8DORDT*cly@E$~ilP||`0wfJa#}6q(#2dh
zy`su#j*vNy>SS3Knw&>tr2h8k%^Rcix{S&kDqmZz$0c-p`pL(inGCx-)DQu~aL^R_
z;WuBMyyTTUD`jEJvP*@M{?N4Sc>oIC799*}@HqK4h9S<fY+f#~Uw?b<b3v5aEX%;l
z`B^xum0yQ{O#V<%wFdwe%8pf5nE_z2plTDzWb!h{Sa<W;EEtx7W}0oieFI0Hq-Ih}
za_Q-kT)MNYXtzwuegQzO(4m@^{bE_sZY{~BJ4<ru>66q<s<&_8h-R8?49g&&&4OdB
zyUAqoazWK5Xgf02Dtnt!F6I<%Vt8oylBpGc&n;x&5k2tNg?Aq8?>$5NSdKp0s-9%i
zz4Ezvu)p_=zb?GfBYKcq$iUQ!zYh-$U&<-}!swMcR{yEX3Kw#UHgRQW=%Oa)#^z?H
zVQH$;)7?EuBT`LsH36tS-QAOxrYdu@)6nGH*p;E7ixg&I4ToOKq17$K2_WDTh0gQm
z&h=QfZGQ3PiJuhB_=|dPRnc61qQJfP{e|-f8A2Q<PM-WFr)c+SWJ+sweDa2Qs62jn
zJuaaIfL&0vzu#s2@VJCl0HmO5Q}p|F#}87)fL0!`Y&u}Q%YepG2j4p2{R0A=@V(iP
Rme2qI002ovPDHLkV1nBOm6-ql

diff --git a/toolkit/themes/windows/mozapps/jar.mn b/toolkit/themes/windows/mozapps/jar.mn
index 6a6c8d94725..31f067e640a 100644
--- a/toolkit/themes/windows/mozapps/jar.mn
+++ b/toolkit/themes/windows/mozapps/jar.mn
@@ -34,7 +34,7 @@ toolkit.jar:
         skin/classic/mozapps/extensions/cancel.png                 (extensions/cancel.png)
         skin/classic/mozapps/extensions/utilities.svg              (../../shared/extensions/utilities.svg)
         skin/classic/mozapps/extensions/heart.png                  (extensions/heart.png)
-        skin/classic/mozapps/extensions/navigation.png             (extensions/navigation.png)
+        skin/classic/mozapps/extensions/navigation.png             (../../shared/extensions/navigation.png)
         skin/classic/mozapps/extensions/stripes-warning.png        (extensions/stripes-warning.png)
         skin/classic/mozapps/extensions/stripes-error.png          (extensions/stripes-error.png)
         skin/classic/mozapps/extensions/stripes-info-positive.png  (extensions/stripes-info-positive.png)

From 016c47751e6fce177ceba3b3b7edabbbec21be4e Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Thu, 30 Apr 2015 11:00:17 -0700
Subject: [PATCH 60/88] Bumping gaia.json for 4 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/c2e68e12cf54
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #29820 from KevinGrandon/bug_1160069_fix_app_modal_dialog

Bug 1159136 - Use textContent for app modal dialog

========

https://hg.mozilla.org/integration/gaia-central/rev/edf148d9fd00
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1159136 - Cherry pick bug 1159136, use textContent for app modal dialog

========

https://hg.mozilla.org/integration/gaia-central/rev/3651a6c9aa56
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #29819 from KevinGrandon/bug_1160069_fix_value_picker

Bug 1159137 - use textContent for pickerUnit

========

https://hg.mozilla.org/integration/gaia-central/rev/cb0cee880d05
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1159137 - Cherry pick bug 1159137, use textContent for pickerUnit
---
 b2g/config/gaia.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 749728efdb0..848a357a928 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,9 +1,9 @@
 {
     "git": {
-        "git_revision": "759a1f935a6a81c32ad66e39a6353b334dfa4f91", 
+        "git_revision": "92b2e038cbbe9c9ab1e5783c48da1442fb5b4537", 
         "remote": "https://git.mozilla.org/releases/gaia.git", 
         "branch": ""
     }, 
-    "revision": "d88d79f407d14635451063c4397724d836efcbaa", 
+    "revision": "c2e68e12cf547e5aef9b47e19c79649e2e8a8401", 
     "repo_path": "integration/gaia-central"
 }

From 143cb85fb3ee535faf336916bfd0113a9a1fb476 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Thu, 30 Apr 2015 11:02:28 -0700
Subject: [PATCH 61/88] Bumping manifests a=b2g-bump

---
 b2g/config/dolphin/sources.xml      | 2 +-
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator-l/sources.xml   | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame-kk/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/nexus-5-l/sources.xml    | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml
index 900034af7fd..5d9fe276657 100644
--- a/b2g/config/dolphin/sources.xml
+++ b/b2g/config/dolphin/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="2eda36a4795012a5d1275b77ebb20ac377c8cd26">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="759a1f935a6a81c32ad66e39a6353b334dfa4f91"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="92b2e038cbbe9c9ab1e5783c48da1442fb5b4537"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index 41c0a0850fc..f7ad278d1d0 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="759a1f935a6a81c32ad66e39a6353b334dfa4f91"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="92b2e038cbbe9c9ab1e5783c48da1442fb5b4537"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="9a9797062c6001d6346504161c51187a2968466b"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 557eb4d528c..19a219c5fe1 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="759a1f935a6a81c32ad66e39a6353b334dfa4f91"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="92b2e038cbbe9c9ab1e5783c48da1442fb5b4537"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="adb24954bf8068f21705b570450475d183336b2d"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="0627790166dccd8dd370fa7d9f434ed9fc027fb4"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index 7589c93f018..5908ed75eac 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="2eda36a4795012a5d1275b77ebb20ac377c8cd26">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="759a1f935a6a81c32ad66e39a6353b334dfa4f91"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="92b2e038cbbe9c9ab1e5783c48da1442fb5b4537"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml
index f04685b6249..20fff1a9a98 100644
--- a/b2g/config/emulator-l/sources.xml
+++ b/b2g/config/emulator-l/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="61e82f99bb8bc78d52b5717e9a2481ec7267fa33">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="759a1f935a6a81c32ad66e39a6353b334dfa4f91"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="92b2e038cbbe9c9ab1e5783c48da1442fb5b4537"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 41c0a0850fc..f7ad278d1d0 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="759a1f935a6a81c32ad66e39a6353b334dfa4f91"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="92b2e038cbbe9c9ab1e5783c48da1442fb5b4537"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="9a9797062c6001d6346504161c51187a2968466b"/>
diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml
index 5f28de2a099..59e73885a3e 100644
--- a/b2g/config/flame-kk/sources.xml
+++ b/b2g/config/flame-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="2eda36a4795012a5d1275b77ebb20ac377c8cd26">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="759a1f935a6a81c32ad66e39a6353b334dfa4f91"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="92b2e038cbbe9c9ab1e5783c48da1442fb5b4537"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index f7233357e16..126c08be37d 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="759a1f935a6a81c32ad66e39a6353b334dfa4f91"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="92b2e038cbbe9c9ab1e5783c48da1442fb5b4537"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="adb24954bf8068f21705b570450475d183336b2d"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="0627790166dccd8dd370fa7d9f434ed9fc027fb4"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index e7cd1574ce1..58f68d65f84 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="759a1f935a6a81c32ad66e39a6353b334dfa4f91"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="92b2e038cbbe9c9ab1e5783c48da1442fb5b4537"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="adb24954bf8068f21705b570450475d183336b2d"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="0627790166dccd8dd370fa7d9f434ed9fc027fb4"/>
diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml
index 6d527e9f227..c78ede1ced2 100644
--- a/b2g/config/nexus-5-l/sources.xml
+++ b/b2g/config/nexus-5-l/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="61e82f99bb8bc78d52b5717e9a2481ec7267fa33">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="759a1f935a6a81c32ad66e39a6353b334dfa4f91"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="92b2e038cbbe9c9ab1e5783c48da1442fb5b4537"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>

From e96e14c6fac97bb3032c046a420b75e67565a8c6 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Thu, 30 Apr 2015 11:50:10 -0700
Subject: [PATCH 62/88] Bumping gaia.json for 6 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/284a417c898e
Author: autolander <bug.autolander@gmail.com>
Desc: Bug 1135233 - merge pull request #29129 from FunkTron:Bug1135233 to mozilla-b2g:master

========

https://hg.mozilla.org/integration/gaia-central/rev/781f1d51a43d
Author: Ross <bugzilla@imross.com>
Desc: Bug 1135233 - Made sure #statusbar-tray icons are accessible when utility tray is open

========

https://hg.mozilla.org/integration/gaia-central/rev/ea54ea169526
Author: autolander <bug.autolander@gmail.com>
Desc: Bug 1152683 - merge pull request #29778 from mcav:replyto to mozilla-b2g:master

========

https://hg.mozilla.org/integration/gaia-central/rev/0fa0e9985249
Author: Marcus Cavanaugh <m@mcav.com>
Desc: Bug 1152683 - [email] reply-to header ignored. r=asuth

========

https://hg.mozilla.org/integration/gaia-central/rev/dee998f7ce82
Author: autolander <bug.autolander@gmail.com>
Desc: Bug 1156089 - merge pull request #29583 from KevinGrandon:bug_1156089_fl_jshint to mozilla-b2g:master

========

https://hg.mozilla.org/integration/gaia-central/rev/180b19c07b96
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1156089 - Fix remaining fl jshint issues
---
 b2g/config/gaia.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 848a357a928..4c62eea1b29 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,9 +1,9 @@
 {
     "git": {
-        "git_revision": "92b2e038cbbe9c9ab1e5783c48da1442fb5b4537", 
+        "git_revision": "d0bf656cdfa9d69721608c30bb5a79886b5e64d3", 
         "remote": "https://git.mozilla.org/releases/gaia.git", 
         "branch": ""
     }, 
-    "revision": "c2e68e12cf547e5aef9b47e19c79649e2e8a8401", 
+    "revision": "284a417c898e037c4ea21d52af81e7c6adabbaab", 
     "repo_path": "integration/gaia-central"
 }

From 87d9baea79086b0854efc1a3a1e416be96f8c5dc Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Thu, 30 Apr 2015 11:52:22 -0700
Subject: [PATCH 63/88] Bumping manifests a=b2g-bump

---
 b2g/config/dolphin/sources.xml      | 2 +-
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator-l/sources.xml   | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame-kk/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/nexus-5-l/sources.xml    | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml
index 5d9fe276657..84390e226fe 100644
--- a/b2g/config/dolphin/sources.xml
+++ b/b2g/config/dolphin/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="2eda36a4795012a5d1275b77ebb20ac377c8cd26">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="92b2e038cbbe9c9ab1e5783c48da1442fb5b4537"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="d0bf656cdfa9d69721608c30bb5a79886b5e64d3"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index f7ad278d1d0..3395dc33425 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="92b2e038cbbe9c9ab1e5783c48da1442fb5b4537"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="d0bf656cdfa9d69721608c30bb5a79886b5e64d3"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="9a9797062c6001d6346504161c51187a2968466b"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 19a219c5fe1..33ab410ee5f 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="92b2e038cbbe9c9ab1e5783c48da1442fb5b4537"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="d0bf656cdfa9d69721608c30bb5a79886b5e64d3"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="adb24954bf8068f21705b570450475d183336b2d"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="0627790166dccd8dd370fa7d9f434ed9fc027fb4"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index 5908ed75eac..22ea2461b14 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="2eda36a4795012a5d1275b77ebb20ac377c8cd26">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="92b2e038cbbe9c9ab1e5783c48da1442fb5b4537"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="d0bf656cdfa9d69721608c30bb5a79886b5e64d3"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml
index 20fff1a9a98..23fc4aaccb4 100644
--- a/b2g/config/emulator-l/sources.xml
+++ b/b2g/config/emulator-l/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="61e82f99bb8bc78d52b5717e9a2481ec7267fa33">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="92b2e038cbbe9c9ab1e5783c48da1442fb5b4537"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="d0bf656cdfa9d69721608c30bb5a79886b5e64d3"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index f7ad278d1d0..3395dc33425 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="92b2e038cbbe9c9ab1e5783c48da1442fb5b4537"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="d0bf656cdfa9d69721608c30bb5a79886b5e64d3"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="9a9797062c6001d6346504161c51187a2968466b"/>
diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml
index 59e73885a3e..3356145129d 100644
--- a/b2g/config/flame-kk/sources.xml
+++ b/b2g/config/flame-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="2eda36a4795012a5d1275b77ebb20ac377c8cd26">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="92b2e038cbbe9c9ab1e5783c48da1442fb5b4537"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="d0bf656cdfa9d69721608c30bb5a79886b5e64d3"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index 126c08be37d..ab90d9f18ba 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="92b2e038cbbe9c9ab1e5783c48da1442fb5b4537"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="d0bf656cdfa9d69721608c30bb5a79886b5e64d3"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="adb24954bf8068f21705b570450475d183336b2d"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="0627790166dccd8dd370fa7d9f434ed9fc027fb4"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index 58f68d65f84..ea4242baab1 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="92b2e038cbbe9c9ab1e5783c48da1442fb5b4537"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="d0bf656cdfa9d69721608c30bb5a79886b5e64d3"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="adb24954bf8068f21705b570450475d183336b2d"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="0627790166dccd8dd370fa7d9f434ed9fc027fb4"/>
diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml
index c78ede1ced2..f947ed75619 100644
--- a/b2g/config/nexus-5-l/sources.xml
+++ b/b2g/config/nexus-5-l/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="61e82f99bb8bc78d52b5717e9a2481ec7267fa33">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="92b2e038cbbe9c9ab1e5783c48da1442fb5b4537"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="d0bf656cdfa9d69721608c30bb5a79886b5e64d3"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>

From 80c0338abbcfce7f9c3c15a597078e06d216e1d2 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Thu, 30 Apr 2015 12:10:22 -0700
Subject: [PATCH 64/88] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/0db33b0413bc
Author: Gareth Aye <gaye@mozilla.com>
Desc: Merge pull request #29818 from gaye/bug-1155708-marionette-client-1.7.5

Bug 1155708 - Make Marionette.Element#size and #location use element rect r=gaye

========

https://hg.mozilla.org/integration/gaia-central/rev/285edfffef89
Author: gaye <gaye@mozilla.com>
Desc: Bug 1155708 - Make Marionette.Element#size and #location use element rect
---
 b2g/config/gaia.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 4c62eea1b29..ee6b6910fc4 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,9 +1,9 @@
 {
     "git": {
-        "git_revision": "d0bf656cdfa9d69721608c30bb5a79886b5e64d3", 
+        "git_revision": "d0ac1f67e1b62e4d6dd5028fb09f2439170df54e", 
         "remote": "https://git.mozilla.org/releases/gaia.git", 
         "branch": ""
     }, 
-    "revision": "284a417c898e037c4ea21d52af81e7c6adabbaab", 
+    "revision": "0db33b0413bc989d19d9978ac035c7b58187e85e", 
     "repo_path": "integration/gaia-central"
 }

From 4194f1335280298657da6509bced89f358fdf9fe Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Thu, 30 Apr 2015 12:13:06 -0700
Subject: [PATCH 65/88] Bumping manifests a=b2g-bump

---
 b2g/config/dolphin/sources.xml      | 2 +-
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator-l/sources.xml   | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame-kk/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/nexus-5-l/sources.xml    | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml
index 84390e226fe..fe40faeefe0 100644
--- a/b2g/config/dolphin/sources.xml
+++ b/b2g/config/dolphin/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="2eda36a4795012a5d1275b77ebb20ac377c8cd26">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="d0bf656cdfa9d69721608c30bb5a79886b5e64d3"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="d0ac1f67e1b62e4d6dd5028fb09f2439170df54e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index 3395dc33425..8fcb4742059 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="d0bf656cdfa9d69721608c30bb5a79886b5e64d3"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="d0ac1f67e1b62e4d6dd5028fb09f2439170df54e"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="9a9797062c6001d6346504161c51187a2968466b"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 33ab410ee5f..769bf708651 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="d0bf656cdfa9d69721608c30bb5a79886b5e64d3"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="d0ac1f67e1b62e4d6dd5028fb09f2439170df54e"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="adb24954bf8068f21705b570450475d183336b2d"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="0627790166dccd8dd370fa7d9f434ed9fc027fb4"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index 22ea2461b14..66d67bf8a8a 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="2eda36a4795012a5d1275b77ebb20ac377c8cd26">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="d0bf656cdfa9d69721608c30bb5a79886b5e64d3"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="d0ac1f67e1b62e4d6dd5028fb09f2439170df54e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml
index 23fc4aaccb4..15587e684ee 100644
--- a/b2g/config/emulator-l/sources.xml
+++ b/b2g/config/emulator-l/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="61e82f99bb8bc78d52b5717e9a2481ec7267fa33">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="d0bf656cdfa9d69721608c30bb5a79886b5e64d3"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="d0ac1f67e1b62e4d6dd5028fb09f2439170df54e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 3395dc33425..8fcb4742059 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="d0bf656cdfa9d69721608c30bb5a79886b5e64d3"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="d0ac1f67e1b62e4d6dd5028fb09f2439170df54e"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="9a9797062c6001d6346504161c51187a2968466b"/>
diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml
index 3356145129d..b5e5829c627 100644
--- a/b2g/config/flame-kk/sources.xml
+++ b/b2g/config/flame-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="2eda36a4795012a5d1275b77ebb20ac377c8cd26">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="d0bf656cdfa9d69721608c30bb5a79886b5e64d3"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="d0ac1f67e1b62e4d6dd5028fb09f2439170df54e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index ab90d9f18ba..f0db64f2aaa 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="d0bf656cdfa9d69721608c30bb5a79886b5e64d3"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="d0ac1f67e1b62e4d6dd5028fb09f2439170df54e"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="adb24954bf8068f21705b570450475d183336b2d"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="0627790166dccd8dd370fa7d9f434ed9fc027fb4"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index ea4242baab1..500b50c5ae0 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="d0bf656cdfa9d69721608c30bb5a79886b5e64d3"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="d0ac1f67e1b62e4d6dd5028fb09f2439170df54e"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="adb24954bf8068f21705b570450475d183336b2d"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="0627790166dccd8dd370fa7d9f434ed9fc027fb4"/>
diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml
index f947ed75619..d851bd7bc38 100644
--- a/b2g/config/nexus-5-l/sources.xml
+++ b/b2g/config/nexus-5-l/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="61e82f99bb8bc78d52b5717e9a2481ec7267fa33">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="d0bf656cdfa9d69721608c30bb5a79886b5e64d3"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="d0ac1f67e1b62e4d6dd5028fb09f2439170df54e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>

From b427a7b53e9e537b26c9458fd50ae563f604d56b Mon Sep 17 00:00:00 2001
From: Jordan Santell <jsantell@gmail.com>
Date: Thu, 30 Apr 2015 15:13:49 -0700
Subject: [PATCH 66/88] Bug 1156499 - Disable all non-profiler/fps components
 in the performance tools when in aurora, for 40.0 release. r=vp

---
 browser/app/profile/firefox.js                |  9 ++++
 .../devtools/performance/modules/graphs.js    | 25 +++++++++-
 .../performance/performance-controller.js     | 11 +++--
 browser/devtools/performance/test/browser.ini |  2 +
 .../performance/test/browser_retro-test.js    | 49 +++++++++++++++++++
 browser/devtools/performance/test/head.js     |  5 ++
 browser/devtools/performance/views/details.js |  7 ++-
 browser/devtools/performance/views/toolbar.js | 13 +++++
 8 files changed, 115 insertions(+), 6 deletions(-)
 create mode 100644 browser/devtools/performance/test/browser_retro-test.js

diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index 65186d8769e..56619a7f424 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -1443,6 +1443,15 @@ pref("devtools.performance.ui.show-idle-blocks", true);
 pref("devtools.performance.ui.enable-memory", false);
 pref("devtools.performance.ui.enable-framerate", true);
 pref("devtools.performance.ui.show-jit-optimizations", false);
+// If in aurora (40.0, will revert for 40.1), set default
+// to retro mode.
+// TODO bug 1160313
+#if MOZ_UPDATE_CHANNEL == aurora
+  pref("devtools.performance.ui.retro-mode", true);
+#else
+  pref("devtools.performance.ui.retro-mode", false);
+#endif
+
 
 // The default cache UI setting
 pref("devtools.cache.disabled", false);
diff --git a/browser/devtools/performance/modules/graphs.js b/browser/devtools/performance/modules/graphs.js
index fa23b22c206..a71b2f13f59 100644
--- a/browser/devtools/performance/modules/graphs.js
+++ b/browser/devtools/performance/modules/graphs.js
@@ -26,6 +26,9 @@ loader.lazyRequireGetter(this, "MarkersOverview",
 loader.lazyRequireGetter(this, "EventEmitter",
   "devtools/toolkit/event-emitter");
 
+// TODO get rid of retro mode in bug 1160313
+loader.lazyRequireGetter(this, "Services");
+
 /**
  * For line graphs
  */
@@ -165,6 +168,24 @@ const GRAPH_DEFINITIONS = {
   }
 };
 
+// TODO get rid of retro mode in bug 1160313
+const GRAPH_DEFINITIONS_RETRO = {
+  memory: {
+    constructor: MemoryGraph,
+    selector: "#memory-overview",
+  },
+  framerate: {
+    constructor: FramerateGraph,
+    selector: "#time-framerate",
+    needsBlueprints: true,
+    primaryLink: true
+  },
+  timeline: {
+    constructor: TimelineGraph,
+    selector: "#markers-overview",
+  }
+};
+
 /**
  * A controller for orchestrating the performance's tool overview graphs. Constructs,
  * syncs, toggles displays and defines the memory, framerate and timeline view.
@@ -177,7 +198,9 @@ const GRAPH_DEFINITIONS = {
 function GraphsController ({ definition, root, getBlueprint, getTheme }) {
   this._graphs = {};
   this._enabled = new Set();
-  this._definition = definition || GRAPH_DEFINITIONS;
+  // TODO get rid of retro mode in bug 1160313
+  let RETRO_MODE = Services.prefs.getBoolPref("devtools.performance.ui.retro-mode");
+  this._definition = definition || (RETRO_MODE ? GRAPH_DEFINITIONS_RETRO : GRAPH_DEFINITIONS);
   this._root = root;
   this._getBlueprint = getBlueprint;
   this._getTheme = getTheme;
diff --git a/browser/devtools/performance/performance-controller.js b/browser/devtools/performance/performance-controller.js
index b3a6629e661..3a5e8864e57 100644
--- a/browser/devtools/performance/performance-controller.js
+++ b/browser/devtools/performance/performance-controller.js
@@ -284,11 +284,16 @@ let PerformanceController = {
    * when the front has started to record.
    */
   startRecording: Task.async(function *() {
+    // Store retro-mode here so we can easily list true/false
+    // values for reverting.
+    // TODO bug 1160313
+    let superMode = !this.getOption("retro-mode");
+
     let options = {
-      withMarkers: true,
-      withMemory: this.getOption("enable-memory"),
+      withMarkers: superMode ? true : false,
+      withMemory: superMode ? this.getOption("enable-memory") : false,
       withTicks: this.getOption("enable-framerate"),
-      withAllocations: this.getOption("enable-memory"),
+      withAllocations: superMode ? this.getOption("enable-memory") : false,
       allocationsSampleProbability: this.getPref("memory-sample-probability"),
       allocationsMaxLogLength: this.getPref("memory-max-log-length"),
       bufferSize: this.getPref("profiler-buffer-size"),
diff --git a/browser/devtools/performance/test/browser.ini b/browser/devtools/performance/test/browser.ini
index e090b38a27e..a4dcae35010 100644
--- a/browser/devtools/performance/test/browser.ini
+++ b/browser/devtools/performance/test/browser.ini
@@ -124,3 +124,5 @@ support-files =
 [browser_profiler_tree-view-08.js]
 [browser_timeline_blueprint.js]
 [browser_timeline_filters.js]
+# remove in bug 1160313
+[browser_retro-test.js]
diff --git a/browser/devtools/performance/test/browser_retro-test.js b/browser/devtools/performance/test/browser_retro-test.js
new file mode 100644
index 00000000000..ad8265eca4f
--- /dev/null
+++ b/browser/devtools/performance/test/browser_retro-test.js
@@ -0,0 +1,49 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/**
+ * Tests that only js-calltree view is on, default, and many things are hidden
+ * when in retro mode.
+ */
+const HIDDEN_OPTIONS = ["option-enable-memory", "option-invert-flame-graph", "option-show-jit-optimizations", "option-flatten-tree-recursion"];
+
+Services.prefs.setBoolPref("devtools.performance.ui.retro-mode", true);
+
+function spawnTest () {
+  let { panel } = yield initPerformance(SIMPLE_URL);
+  let { EVENTS, DetailsView, PerformanceController, $, $$, JsCallTreeView } = panel.panelWin;
+
+  yield startRecording(panel);
+  yield stopRecording(panel);
+
+  let model = PerformanceController.getCurrentRecording();
+
+  ok(model.getMemory().length === 0, "model did not record memory.");
+  ok(model.getTicks().length !== 0, "model did get ticks.");
+  ok(model.getAllocations().sites.length === 0, "model did get allocation data.");
+  ok(model.getAllocations().timestamps.length === 0, "model did get allocation data.");
+  ok(model.getAllocations().frames.length === 0, "model did get allocation data.");
+  ok(model.getAllocations().counts.length === 0, "model did get allocation data.");
+
+  ok(DetailsView.isViewSelected(JsCallTreeView),
+    "The jscalltree view is selected by default");
+
+  for (let option of $$("#performance-options-menupopup > menuitem")) {
+    if (HIDDEN_OPTIONS.indexOf(option.id) !== -1) {
+      ok(option.hidden === true, `${option.id} should be hidden.`);
+    } else {
+      ok(option.hidden === false, `${option.id} should be visible.`);
+    }
+  }
+
+  for (let viewbutton of $$("#performance-toolbar-controls-detail-views > toolbarbutton")) {
+    ok (viewbutton.hidden === true, `${viewbutton.id} should be hidden.`);
+  }
+
+  ok($("#markers-overview").hidden, "markers overview should be hidden.");
+  ok($("#memory-overview").hidden, "memory overview should be hidden.");
+  ok(!$("#time-framerate").hidden, "framerate should be shown.");
+
+  yield teardown(panel);
+  finish();
+}
diff --git a/browser/devtools/performance/test/head.js b/browser/devtools/performance/test/head.js
index b255c6a6238..871d2b126b8 100644
--- a/browser/devtools/performance/test/head.js
+++ b/browser/devtools/performance/test/head.js
@@ -56,6 +56,7 @@ let DEFAULT_PREFS = [
   "devtools.performance.memory.max-log-length",
   "devtools.performance.profiler.buffer-size",
   "devtools.performance.profiler.sample-frequency-khz",
+  "devtools.performance.ui.retro-mode",
 ].reduce((prefs, pref) => {
   prefs[pref] = Preferences.get(pref);
   return prefs;
@@ -67,6 +68,10 @@ Services.prefs.setBoolPref("devtools.performance.enabled", true);
 // be affected by this pref.
 Services.prefs.setBoolPref("devtools.debugger.log", false);
 
+// Disable retro mode.
+// TODO bug 1160313
+Services.prefs.setBoolPref("devtools.performance.ui.retro-mode", false);
+
 /**
  * Call manually in tests that use frame script utils after initializing
  * the tool. Must be called after initializing so we can detect
diff --git a/browser/devtools/performance/views/details.js b/browser/devtools/performance/views/details.js
index 0ce182594a5..35c13534031 100644
--- a/browser/devtools/performance/views/details.js
+++ b/browser/devtools/performance/views/details.js
@@ -94,9 +94,12 @@ let DetailsView = {
     let invalidCurrentView = false;
 
     for (let [name, { view }] of Iterator(this.components)) {
-      let isSupported = this._isViewSupported(name, false);
+      // TODO bug 1160313 get rid of retro mode checks.
+      let isRetro = PerformanceController.getOption("retro-mode");
+      let isSupported = isRetro ? name === "js-calltree" : this._isViewSupported(name, false);
 
-      $(`toolbarbutton[data-view=${name}]`).hidden = !isSupported;
+      // TODO bug 1160313 hide all view buttons, but let js-calltree still be "supported"
+      $(`toolbarbutton[data-view=${name}]`).hidden = isRetro ? true : !isSupported;
 
       // If the view is currently selected and not supported, go back to the
       // default view.
diff --git a/browser/devtools/performance/views/toolbar.js b/browser/devtools/performance/views/toolbar.js
index 4df132297bb..05770b89d5d 100644
--- a/browser/devtools/performance/views/toolbar.js
+++ b/browser/devtools/performance/views/toolbar.js
@@ -21,6 +21,19 @@ let ToolbarView = {
       menupopup: $("#performance-options-menupopup")
     });
 
+    // TODO bug 1160313 get rid of retro mode checks
+    // hide option buttons here, and any other buttons in the toolbar
+    // (details.js takes care of view buttons)
+    if (PerformanceController.getOption("retro-mode")) {
+      let RETRO_ELEMENTS = [
+        "#option-flatten-tree-recursion", "#option-enable-memory", "#option-invert-flame-graph",
+        "#option-show-jit-optimizations", "#filter-button"
+      ];
+      for (let selector of RETRO_ELEMENTS) {
+        $(selector).hidden = true;
+      }
+    }
+
     yield this.optionsView.initialize();
     this.optionsView.on("pref-changed", this._onPrefChanged);
 

From e7eb1369531dfec24c491473abdaab5983ea3fb5 Mon Sep 17 00:00:00 2001
From: Jordan Santell <jsantell@gmail.com>
Date: Thu, 30 Apr 2015 16:03:43 -0700
Subject: [PATCH 67/88] Bug 1157523 - Fix intermittent where markers are
 selected in the waterfall views when there is no recording selected. r=vp

---
 browser/devtools/performance/views/details-waterfall.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/browser/devtools/performance/views/details-waterfall.js b/browser/devtools/performance/views/details-waterfall.js
index 296e81fed5f..07a3163439b 100644
--- a/browser/devtools/performance/views/details-waterfall.js
+++ b/browser/devtools/performance/views/details-waterfall.js
@@ -74,6 +74,11 @@ let WaterfallView = Heritage.extend(DetailsSubview, {
    */
   _onMarkerSelected: function (event, marker) {
     let recording = PerformanceController.getCurrentRecording();
+    // Race condition in tests due to lazy rendering of markers in the
+    // waterfall? intermittent bug 1157523
+    if (!recording) {
+      return;
+    }
     let frames = recording.getFrames();
 
     if (event === "selected") {

From 5ba93f14af2045df68158f0a2e192e99bb0e03d3 Mon Sep 17 00:00:00 2001
From: Jordan Santell <jsantell@gmail.com>
Date: Thu, 30 Apr 2015 12:23:11 -0700
Subject: [PATCH 68/88] Bug 1150696 - Move all timeline tests that are still
 relevent into the performance tools tests. r=vp

---
 browser/devtools/performance/test/browser.ini |   7 +-
 ...print.js => browser_timeline-blueprint.js} |   0
 ...filters.js => browser_timeline-filters.js} |   0
 .../browser_timeline-waterfall-background.js  |  53 +++++++
 .../browser_timeline-waterfall-generic.js}    |  18 ++-
 .../browser_timeline-waterfall-sidebar.js}    |  27 ++--
 browser/devtools/timeline/test/browser.ini    |  19 ---
 ...browser_timeline_aaa_run_first_leaktest.js |  18 ---
 ..._timeline_overview-initial-selection-01.js |  44 ------
 ..._timeline_overview-initial-selection-02.js |  35 -----
 .../test/browser_timeline_overview-theme.js   |  84 ----------
 .../test/browser_timeline_overview-update.js  |  74 ---------
 .../timeline/test/browser_timeline_panels.js  |  39 -----
 ...owser_timeline_recording-without-memory.js |  33 ----
 .../test/browser_timeline_recording.js        |  45 ------
 .../browser_timeline_waterfall-background.js  |  44 ------
 .../test/browser_timeline_waterfall-styles.js |  88 -----------
 .../timeline/test/doc_simple-test.html        |  25 ---
 browser/devtools/timeline/test/head.js        | 148 ------------------
 19 files changed, 82 insertions(+), 719 deletions(-)
 rename browser/devtools/performance/test/{browser_timeline_blueprint.js => browser_timeline-blueprint.js} (100%)
 rename browser/devtools/performance/test/{browser_timeline_filters.js => browser_timeline-filters.js} (100%)
 create mode 100644 browser/devtools/performance/test/browser_timeline-waterfall-background.js
 rename browser/devtools/{timeline/test/browser_timeline_waterfall-generic.js => performance/test/browser_timeline-waterfall-generic.js} (82%)
 rename browser/devtools/{timeline/test/browser_timeline_waterfall-sidebar.js => performance/test/browser_timeline-waterfall-sidebar.js} (67%)
 delete mode 100644 browser/devtools/timeline/test/browser.ini
 delete mode 100644 browser/devtools/timeline/test/browser_timeline_aaa_run_first_leaktest.js
 delete mode 100644 browser/devtools/timeline/test/browser_timeline_overview-initial-selection-01.js
 delete mode 100644 browser/devtools/timeline/test/browser_timeline_overview-initial-selection-02.js
 delete mode 100644 browser/devtools/timeline/test/browser_timeline_overview-theme.js
 delete mode 100644 browser/devtools/timeline/test/browser_timeline_overview-update.js
 delete mode 100644 browser/devtools/timeline/test/browser_timeline_panels.js
 delete mode 100644 browser/devtools/timeline/test/browser_timeline_recording-without-memory.js
 delete mode 100644 browser/devtools/timeline/test/browser_timeline_recording.js
 delete mode 100644 browser/devtools/timeline/test/browser_timeline_waterfall-background.js
 delete mode 100644 browser/devtools/timeline/test/browser_timeline_waterfall-styles.js
 delete mode 100644 browser/devtools/timeline/test/doc_simple-test.html
 delete mode 100644 browser/devtools/timeline/test/head.js

diff --git a/browser/devtools/performance/test/browser.ini b/browser/devtools/performance/test/browser.ini
index a4dcae35010..b9b27f2c0fc 100644
--- a/browser/devtools/performance/test/browser.ini
+++ b/browser/devtools/performance/test/browser.ini
@@ -122,7 +122,10 @@ support-files =
 [browser_profiler_tree-view-06.js]
 [browser_profiler_tree-view-07.js]
 [browser_profiler_tree-view-08.js]
-[browser_timeline_blueprint.js]
-[browser_timeline_filters.js]
+[browser_timeline-blueprint.js]
+[browser_timeline-filters.js]
+[browser_timeline-waterfall-background.js]
+[browser_timeline-waterfall-generic.js]
+[browser_timeline-waterfall-sidebar.js]
 # remove in bug 1160313
 [browser_retro-test.js]
diff --git a/browser/devtools/performance/test/browser_timeline_blueprint.js b/browser/devtools/performance/test/browser_timeline-blueprint.js
similarity index 100%
rename from browser/devtools/performance/test/browser_timeline_blueprint.js
rename to browser/devtools/performance/test/browser_timeline-blueprint.js
diff --git a/browser/devtools/performance/test/browser_timeline_filters.js b/browser/devtools/performance/test/browser_timeline-filters.js
similarity index 100%
rename from browser/devtools/performance/test/browser_timeline_filters.js
rename to browser/devtools/performance/test/browser_timeline-filters.js
diff --git a/browser/devtools/performance/test/browser_timeline-waterfall-background.js b/browser/devtools/performance/test/browser_timeline-waterfall-background.js
new file mode 100644
index 00000000000..f0f29b2c686
--- /dev/null
+++ b/browser/devtools/performance/test/browser_timeline-waterfall-background.js
@@ -0,0 +1,53 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/**
+ * Tests if the waterfall background is a 1px high canvas stretching across
+ * the container bounds.
+ */
+
+function spawnTest () {
+  let { target, panel } = yield initPerformance(SIMPLE_URL);
+  let { $, EVENTS, PerformanceController, OverviewView, DetailsView, WaterfallView } = panel.panelWin;
+
+  yield startRecording(panel);
+  ok(true, "Recording has started.");
+
+  let updated = 0;
+  OverviewView.on(EVENTS.OVERVIEW_RENDERED, () => updated++);
+
+  ok((yield waitUntil(() => updated > 0)),
+    "The overview graphs were updated a bunch of times.");
+  ok((yield waitUntil(() => PerformanceController.getCurrentRecording().getMarkers().length > 0)),
+    "There are some markers available.");
+
+  let rendered = Promise.all([
+    DetailsView.selectView("waterfall"),
+    once(WaterfallView, EVENTS.WATERFALL_RENDERED)
+  ]);
+  yield stopRecording(panel);
+  ok(true, "Recording has ended.");
+  yield rendered;
+
+  // Test the waterfall background.
+
+  let parentWidth = $("#waterfall-view").getBoundingClientRect().width;
+  let sidebarWidth = $(".waterfall-sidebar").getBoundingClientRect().width;
+  let detailsWidth = $("#waterfall-details").getBoundingClientRect().width;
+  let waterfallWidth = WaterfallView.waterfall._waterfallWidth;
+  is(waterfallWidth, parentWidth - sidebarWidth - detailsWidth,
+    "The waterfall width is correct.")
+
+  ok(WaterfallView.waterfall._canvas,
+    "A canvas should be created after the recording ended.");
+  ok(WaterfallView.waterfall._ctx,
+    "A 2d context should be created after the recording ended.");
+
+  is(WaterfallView.waterfall._canvas.width, waterfallWidth,
+    "The canvas width is correct.");
+  is(WaterfallView.waterfall._canvas.height, 1,
+    "The canvas height is correct.");
+
+  yield teardown(panel);
+  finish();
+}
diff --git a/browser/devtools/timeline/test/browser_timeline_waterfall-generic.js b/browser/devtools/performance/test/browser_timeline-waterfall-generic.js
similarity index 82%
rename from browser/devtools/timeline/test/browser_timeline_waterfall-generic.js
rename to browser/devtools/performance/test/browser_timeline-waterfall-generic.js
index ceff2bd1f42..c279be915e0 100644
--- a/browser/devtools/timeline/test/browser_timeline_waterfall-generic.js
+++ b/browser/devtools/performance/test/browser_timeline-waterfall-generic.js
@@ -5,22 +5,22 @@
  * Tests if the waterfall is properly built after finishing a recording.
  */
 
-add_task(function*() {
-  let { target, panel } = yield initTimelinePanel(SIMPLE_URL);
-  let { $, $$, EVENTS, TimelineController } = panel.panelWin;
+function spawnTest () {
+  let { target, panel } = yield initPerformance(SIMPLE_URL);
+  let { $, $$, EVENTS, PerformanceController, OverviewView, WaterfallView } = panel.panelWin;
 
-  yield TimelineController.toggleRecording();
+  yield startRecording(panel);
   ok(true, "Recording has started.");
 
   let updated = 0;
-  panel.panelWin.on(EVENTS.OVERVIEW_UPDATED, () => updated++);
+  OverviewView.on(EVENTS.OVERVIEW_RENDERED, () => updated++);
 
   ok((yield waitUntil(() => updated > 0)),
     "The overview graphs were updated a bunch of times.");
-  ok((yield waitUntil(() => TimelineController.getMarkers().length > 0)),
+  ok((yield waitUntil(() => PerformanceController.getCurrentRecording().getMarkers().length > 0)),
     "There are some markers available.");
 
-  yield TimelineController.toggleRecording();
+  yield stopRecording(panel);
   ok(true, "Recording has ended.");
 
   // Test the header container.
@@ -62,4 +62,6 @@ add_task(function*() {
     "Some marker waterfall nodes should have been created.");
   ok($$(".waterfall-marker-item:not(spacer) > .waterfall-marker-bar").length,
     "Some marker color bars should have been created inside the waterfall.");
-});
+  yield teardown(panel);
+  finish();
+}
diff --git a/browser/devtools/timeline/test/browser_timeline_waterfall-sidebar.js b/browser/devtools/performance/test/browser_timeline-waterfall-sidebar.js
similarity index 67%
rename from browser/devtools/timeline/test/browser_timeline_waterfall-sidebar.js
rename to browser/devtools/performance/test/browser_timeline-waterfall-sidebar.js
index 0c556498291..ee608b17953 100644
--- a/browser/devtools/timeline/test/browser_timeline_waterfall-sidebar.js
+++ b/browser/devtools/performance/test/browser_timeline-waterfall-sidebar.js
@@ -5,35 +5,34 @@
  * Tests if the sidebar is properly updated when a marker is selected.
  */
 
-add_task(function*() {
-  let { target, panel } = yield initTimelinePanel(SIMPLE_URL);
-  let { $, $$, EVENTS, TimelineController, TimelineView, TIMELINE_BLUEPRINT} = panel.panelWin;
-  let { L10N } = devtools.require("devtools/shared/timeline/global");
+function spawnTest () {
+  let { target, panel } = yield initPerformance(SIMPLE_URL);
+  let { $, $$, EVENTS, PerformanceController, OverviewView } = panel.panelWin;
+  let { L10N, TIMELINE_BLUEPRINT } = devtools.require("devtools/shared/timeline/global");
 
-  yield TimelineController.toggleRecording();
+  yield startRecording(panel);
   ok(true, "Recording has started.");
 
   yield waitUntil(() => {
     // Wait until we get 3 different markers.
-    let markers = TimelineController.getMarkers();
+    let markers = PerformanceController.getCurrentRecording().getMarkers();
     return markers.some(m => m.name == "Styles") &&
            markers.some(m => m.name == "Reflow") &&
            markers.some(m => m.name == "Paint");
   });
 
-  yield TimelineController.toggleRecording();
+  yield stopRecording(panel);
   ok(true, "Recording has ended.");
 
   // Select everything
-  TimelineView.markersOverview.setSelection({ start: 0, end: TimelineView.markersOverview.width })
-
+  OverviewView.graphs.get("timeline").setSelection({ start: 0, end: OverviewView.graphs.get("timeline").width })
 
   let bars = $$(".waterfall-marker-item:not(spacer) > .waterfall-marker-bar");
-  let markers = TimelineController.getMarkers();
+  let markers = PerformanceController.getCurrentRecording().getMarkers();
 
   ok(bars.length > 2, "got at least 3 markers");
 
-  let sidebar = $("#timeline-waterfall-details");
+  let sidebar = $("#waterfall-details");
   for (let i = 0; i < bars.length; i++) {
     let bar = bars[i];
     bar.click();
@@ -41,7 +40,7 @@ add_task(function*() {
 
     let name = TIMELINE_BLUEPRINT[m.name].label;
 
-    is($("#timeline-waterfall-details .marker-details-type").getAttribute("value"), name,
+    is($("#waterfall-details .marker-details-type").getAttribute("value"), name,
       "sidebar title matches markers name");
 
     let printedStartTime = $(".marker-details-start .marker-details-labelvalue").getAttribute("value");
@@ -55,4 +54,6 @@ add_task(function*() {
     is(toMs(m.end), printedEndTime, "sidebar end time is valid");
     is(toMs(m.end - m.start), printedDuration, "sidebar duration is valid");
   }
-});
+  yield teardown(panel);
+  finish();
+}
diff --git a/browser/devtools/timeline/test/browser.ini b/browser/devtools/timeline/test/browser.ini
deleted file mode 100644
index 58197c04db7..00000000000
--- a/browser/devtools/timeline/test/browser.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-[DEFAULT]
-tags = devtools
-subsuite = devtools
-support-files =
-  doc_simple-test.html
-  head.js
-
-[browser_timeline_aaa_run_first_leaktest.js]
-[browser_timeline_overview-initial-selection-01.js]
-[browser_timeline_overview-initial-selection-02.js]
-[browser_timeline_overview-update.js]
-[browser_timeline_overview-theme.js]
-[browser_timeline_panels.js]
-[browser_timeline_recording-without-memory.js]
-[browser_timeline_recording.js]
-[browser_timeline_waterfall-background.js]
-[browser_timeline_waterfall-generic.js]
-[browser_timeline_waterfall-styles.js]
-[browser_timeline_waterfall-sidebar.js]
diff --git a/browser/devtools/timeline/test/browser_timeline_aaa_run_first_leaktest.js b/browser/devtools/timeline/test/browser_timeline_aaa_run_first_leaktest.js
deleted file mode 100644
index 33ecca92027..00000000000
--- a/browser/devtools/timeline/test/browser_timeline_aaa_run_first_leaktest.js
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-/**
- * Tests if the timeline leaks on initialization and sudden destruction.
- * You can also use this initialization format as a template for other tests.
- */
-
-add_task(function*() {
-  let { target, panel } = yield initTimelinePanel(SIMPLE_URL);
-
-  ok(target, "Should have a target available.");
-  ok(panel, "Should have a panel available.");
-
-  ok(panel.panelWin.gToolbox, "Should have a toolbox reference on the panel window.");
-  ok(panel.panelWin.gTarget, "Should have a target reference on the panel window.");
-  ok(panel.panelWin.gFront, "Should have a front reference on the panel window.");
-});
diff --git a/browser/devtools/timeline/test/browser_timeline_overview-initial-selection-01.js b/browser/devtools/timeline/test/browser_timeline_overview-initial-selection-01.js
deleted file mode 100644
index c29c056985a..00000000000
--- a/browser/devtools/timeline/test/browser_timeline_overview-initial-selection-01.js
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-/**
- * Tests if the overview has an initial selection when recording has finished
- * and there is data available.
- */
-
-add_task(function*() {
-  let { target, panel } = yield initTimelinePanel(SIMPLE_URL);
-  let { $, EVENTS, TimelineView, TimelineController } = panel.panelWin;
-  let { OVERVIEW_INITIAL_SELECTION_RATIO: selectionRatio } = panel.panelWin;
-
-  $("#memory-checkbox").checked = true;
-  yield TimelineController.updateMemoryRecording();
-
-  yield TimelineController.toggleRecording();
-  ok(true, "Recording has started.");
-
-  let updated = 0;
-  panel.panelWin.on(EVENTS.OVERVIEW_UPDATED, () => updated++);
-
-  ok((yield waitUntil(() => updated > 10)),
-    "The overview graph was updated a bunch of times.");
-  ok((yield waitUntil(() => TimelineController.getMarkers().length > 0)),
-    "There are some markers available.");
-  ok((yield waitUntil(() => TimelineController.getMemory().length > 0)),
-    "There are some memory measurements available now.");
-
-  yield TimelineController.toggleRecording();
-  ok(true, "Recording has ended.");
-
-  let interval = TimelineController.getInterval();
-  let markers = TimelineController.getMarkers();
-  let selection = TimelineView.markersOverview.getSelection();
-
-  is((selection.start) | 0,
-     (markers[0].start * TimelineView.markersOverview.dataScaleX) | 0,
-    "The initial selection start is correct.");
-
-  is((selection.end - selection.start) | 0,
-     (selectionRatio * TimelineView.markersOverview.width) | 0,
-    "The initial selection end is correct.");
-});
diff --git a/browser/devtools/timeline/test/browser_timeline_overview-initial-selection-02.js b/browser/devtools/timeline/test/browser_timeline_overview-initial-selection-02.js
deleted file mode 100644
index 8a7675c0f49..00000000000
--- a/browser/devtools/timeline/test/browser_timeline_overview-initial-selection-02.js
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-/**
- * Tests if the overview has no initial selection when recording has finished
- * and there is no data available.
- */
-
-add_task(function*() {
-  let { target, panel } = yield initTimelinePanel(SIMPLE_URL);
-  let { $, EVENTS, TimelineView, TimelineController } = panel.panelWin;
-  let { OVERVIEW_INITIAL_SELECTION_RATIO: selectionRatio } = panel.panelWin;
-
-  $("#memory-checkbox").checked = true;
-  yield TimelineController.updateMemoryRecording();
-
-  yield TimelineController.toggleRecording();
-  ok(true, "Recording has started.");
-
-  yield TimelineController._stopRecordingAndDiscardData();
-  ok(true, "Recording has ended.");
-
-  let markers = TimelineController.getMarkers();
-  let memory = TimelineController.getMemory();
-  let selection = TimelineView.markersOverview.getSelection();
-
-  is(markers.length, 0,
-    "There are no markers available.");
-  is(memory.length, 0,
-    "There are no memory measurements available.");
-  is(selection.start, null,
-    "The initial selection start is correct.");
-  is(selection.end, null,
-    "The initial selection end is correct.");
-});
diff --git a/browser/devtools/timeline/test/browser_timeline_overview-theme.js b/browser/devtools/timeline/test/browser_timeline_overview-theme.js
deleted file mode 100644
index 4a45bef6a59..00000000000
--- a/browser/devtools/timeline/test/browser_timeline_overview-theme.js
+++ /dev/null
@@ -1,84 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-/**
- * Tests if the markers and memory overviews render with the correct
- * theme on load, and rerenders when changed.
- */
-
-const LIGHT_BG = "#fcfcfc";
-const DARK_BG = "#14171a";
-
-add_task(function*() {
-  let { target, panel } = yield initTimelinePanel("about:blank");
-  let { $, EVENTS, TimelineView, TimelineController } = panel.panelWin;
-
-  $("#memory-checkbox").checked = true;
-
-  setTheme("dark");
-
-  yield TimelineController.updateMemoryRecording();
-  is(TimelineView.markersOverview.backgroundColor, DARK_BG,
-    "correct theme on load for markers.");
-  is(TimelineView.memoryOverview.backgroundColor, DARK_BG,
-    "correct theme on load for memory.");
-
-  yield TimelineController.toggleRecording();
-  ok(true, "Recording has started.");
-
-  yield TimelineController.toggleRecording();
-  ok(true, "Recording has ended.");
-
-  let refreshed = Promise.all([
-    once(TimelineView.markersOverview, "refresh"),
-    once(TimelineView.memoryOverview, "refresh"),
-  ]);
-
-  setTheme("light");
-  yield refreshed;
-
-  ok(true, "Both memory and markers were rerendered after theme change.");
-  is(TimelineView.markersOverview.backgroundColor, LIGHT_BG,
-    "correct theme on after toggle for markers.");
-  is(TimelineView.memoryOverview.backgroundColor, LIGHT_BG,
-    "correct theme on after toggle for memory.");
-
-  refreshed = Promise.all([
-    once(TimelineView.markersOverview, "refresh"),
-    once(TimelineView.memoryOverview, "refresh"),
-  ]);
-
-  setTheme("dark");
-  yield refreshed;
-
-  ok(true, "Both memory and markers were rerendered after theme change.");
-  is(TimelineView.markersOverview.backgroundColor, DARK_BG,
-    "correct theme on after toggle for markers once more.");
-  is(TimelineView.memoryOverview.backgroundColor, DARK_BG,
-    "correct theme on after toggle for memory once more.");
-
-  refreshed = Promise.all([
-    once(TimelineView.markersOverview, "refresh"),
-    once(TimelineView.memoryOverview, "refresh"),
-  ]);
-
-  // Set theme back to light
-  setTheme("light");
-  yield refreshed;
-});
-
-/**
- * Mimics selecting the theme selector in the toolbox;
- * sets the preference and emits an event on gDevTools to trigger
- * the themeing.
- */
-function setTheme (newTheme) {
-  let oldTheme = Services.prefs.getCharPref("devtools.theme");
-  info("Setting `devtools.theme` to \"" + newTheme + "\"");
-  Services.prefs.setCharPref("devtools.theme", newTheme);
-  gDevTools.emit("pref-changed", {
-    pref: "devtools.theme",
-    newValue: newTheme,
-    oldValue: oldTheme
-  });
-}
diff --git a/browser/devtools/timeline/test/browser_timeline_overview-update.js b/browser/devtools/timeline/test/browser_timeline_overview-update.js
deleted file mode 100644
index 130f7db11c6..00000000000
--- a/browser/devtools/timeline/test/browser_timeline_overview-update.js
+++ /dev/null
@@ -1,74 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-/**
- * Tests if the markers and memory overviews are continuously updated.
- */
-
-add_task(function*() {
-  let { target, panel } = yield initTimelinePanel("about:blank");
-  let { $, EVENTS, TimelineView, TimelineController } = panel.panelWin;
-
-  $("#memory-checkbox").checked = true;
-  yield TimelineController.updateMemoryRecording();
-
-  yield TimelineController.toggleRecording();
-  ok(true, "Recording has started.");
-
-  ok("selectionEnabled" in TimelineView.markersOverview,
-    "The selection should not be enabled for the markers overview (1).");
-  is(TimelineView.markersOverview.selectionEnabled, false,
-    "The selection should not be enabled for the markers overview (2).");
-  is(TimelineView.markersOverview.hasSelection(), false,
-    "The markers overview shouldn't have a selection before recording.");
-
-  ok("selectionEnabled" in TimelineView.memoryOverview,
-    "The selection should not be enabled for the memory overview (1).");
-  is(TimelineView.memoryOverview.selectionEnabled, false,
-    "The selection should not be enabled for the memory overview (2).");
-  is(TimelineView.memoryOverview.hasSelection(), false,
-    "The memory overview shouldn't have a selection before recording.");
-
-  let updated = 0;
-  panel.panelWin.on(EVENTS.OVERVIEW_UPDATED, () => updated++);
-
-  ok((yield waitUntil(() => updated > 10)),
-    "The overviews were updated a bunch of times.");
-  ok((yield waitUntil(() => TimelineController.getMemory().length > 10)),
-    "There are some memory measurements available now.");
-
-  ok("selectionEnabled" in TimelineView.markersOverview,
-    "The selection should still not be enabled for the markers overview (3).");
-  is(TimelineView.markersOverview.selectionEnabled, false,
-    "The selection should still not be enabled for the markers overview (4).");
-  is(TimelineView.markersOverview.hasSelection(), false,
-    "The markers overview should not have a selection while recording.");
-
-  ok("selectionEnabled" in TimelineView.memoryOverview,
-    "The selection should still not be enabled for the memory overview (3).");
-  is(TimelineView.memoryOverview.selectionEnabled, false,
-    "The selection should still not be enabled for the memory overview (4).");
-  is(TimelineView.memoryOverview.hasSelection(), false,
-    "The memory overview should not have a selection while recording.");
-
-  yield TimelineController.toggleRecording();
-  ok(true, "Recording has ended.");
-
-  // TODO: Re-enable this assertion as part of bug 1120830
-  // is(TimelineController.getMarkers().length, 0,
-  //  "There are no markers available.");
-  isnot(TimelineController.getMemory().length, 0,
-    "There are some memory measurements available.");
-
-  is(TimelineView.markersOverview.selectionEnabled, true,
-    "The selection should now be enabled for the markers overview.");
-  // TODO: Re-enable this assertion as part of bug 1120830
-  // is(TimelineView.markersOverview.hasSelection(), false,
-  //  "The markers overview should not have a selection after recording.");
-
-  is(TimelineView.memoryOverview.selectionEnabled, true,
-    "The selection should now be enabled for the memory overview.");
-  // TODO: Re-enable this assertion as part of bug 1120830
-  // is(TimelineView.memoryOverview.hasSelection(), false,
-  //  "The memory overview should not have a selection after recording.");
-});
diff --git a/browser/devtools/timeline/test/browser_timeline_panels.js b/browser/devtools/timeline/test/browser_timeline_panels.js
deleted file mode 100644
index f7f0de0865c..00000000000
--- a/browser/devtools/timeline/test/browser_timeline_panels.js
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-/**
- * Tests if the timeline panels are correctly shown and hidden when
- * recording starts and stops.
- */
-
-add_task(function*() {
-  let { target, panel } = yield initTimelinePanel(SIMPLE_URL);
-  let { $, EVENTS } = panel.panelWin;
-
-  is($("#record-button").hasAttribute("checked"), false,
-    "The record button should not be checked yet.");
-  is($("#timeline-pane").selectedPanel, $("#empty-notice"),
-    "An empty notice is initially displayed instead of the waterfall view.");
-
-  let whenRecStarted = panel.panelWin.once(EVENTS.RECORDING_STARTED);
-  EventUtils.synthesizeMouseAtCenter($("#record-button"), {}, panel.panelWin);
-  yield whenRecStarted;
-
-  ok(true, "Recording has started.");
-
-  is($("#record-button").getAttribute("checked"), "true",
-    "The record button should be checked now.");
-  is($("#timeline-pane").selectedPanel, $("#recording-notice"),
-    "A recording notice is now displayed instead of the waterfall view.");
-
-  let whenRecEnded = panel.panelWin.once(EVENTS.RECORDING_ENDED);
-  EventUtils.synthesizeMouseAtCenter($("#record-button"), {}, panel.panelWin);
-  yield whenRecEnded;
-
-  ok(true, "Recording has ended.");
-
-  is($("#record-button").hasAttribute("checked"), false,
-    "The record button should be unchecked again.");
-  is($("#timeline-pane").selectedPanel, $("#timeline-waterfall-container"),
-    "A waterfall view is now displayed.");
-});
diff --git a/browser/devtools/timeline/test/browser_timeline_recording-without-memory.js b/browser/devtools/timeline/test/browser_timeline_recording-without-memory.js
deleted file mode 100644
index 5b8b0e0ea26..00000000000
--- a/browser/devtools/timeline/test/browser_timeline_recording-without-memory.js
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-/**
- * Tests if the timeline actor isn't unnecessarily asked to record memory.
- */
-
-add_task(function*() {
-  let { target, panel } = yield initTimelinePanel(SIMPLE_URL);
-  let { $, EVENTS, TimelineView, TimelineController } = panel.panelWin;
-
-  yield TimelineController.toggleRecording();
-  ok(true, "Recording has started.");
-
-  let updated = 0;
-  panel.panelWin.on(EVENTS.OVERVIEW_UPDATED, () => updated++);
-
-  ok((yield waitUntil(() => updated > 10)),
-    "The overview graph was updated a bunch of times.");
-  ok((yield waitUntil(() => TimelineController.getMarkers().length > 0)),
-    "There are some markers available.");
-
-  yield TimelineController.toggleRecording();
-  ok(true, "Recording has ended.");
-
-  let markers = TimelineController.getMarkers();
-  let memory = TimelineController.getMemory();
-
-  isnot(markers.length, 0,
-    "There are some markers available.");
-  is(memory.length, 0,
-    "There are no memory measurements available.");
-});
diff --git a/browser/devtools/timeline/test/browser_timeline_recording.js b/browser/devtools/timeline/test/browser_timeline_recording.js
deleted file mode 100644
index 3cc977ff8f2..00000000000
--- a/browser/devtools/timeline/test/browser_timeline_recording.js
+++ /dev/null
@@ -1,45 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-/**
- * Tests if the timeline can properly start and stop a recording.
- */
-
-add_task(function*() {
-  let { target, panel } = yield initTimelinePanel(SIMPLE_URL);
-  let { $, gFront, TimelineController } = panel.panelWin;
-
-  $("#memory-checkbox").checked = true;
-  yield TimelineController.updateMemoryRecording();
-
-  is((yield gFront.isRecording()), false,
-    "The timeline actor should not be recording when the tool starts.");
-  is(TimelineController.getMarkers().length, 0,
-    "There should be no markers available when the tool starts.");
-  is(TimelineController.getMemory().length, 0,
-    "There should be no memory measurements available when the tool starts.");
-
-  yield TimelineController.toggleRecording();
-
-  is((yield gFront.isRecording()), true,
-    "The timeline actor should be recording now.");
-  ok((yield waitUntil(() => TimelineController.getMarkers().length > 0)),
-    "There are some markers available now.");
-  ok((yield waitUntil(() => TimelineController.getMemory().length > 0)),
-    "There are some memory measurements available now.");
-
-  info("Interval: " + TimelineController.getInterval().toSource());
-  info("Markers: " + TimelineController.getMarkers().toSource());
-  info("Memory: " + TimelineController.getMemory().toSource());
-
-  ok("startTime" in TimelineController.getInterval(),
-    "A `startTime` field was set on the recording data.");
-  ok("endTime" in TimelineController.getInterval(),
-    "An `endTime` field was set on the recording data.");
-
-  ok(TimelineController.getInterval().endTime >
-     TimelineController.getInterval().startTime,
-    "Some time has passed since the recording started.");
-
-  yield TimelineController.toggleRecording();
-});
diff --git a/browser/devtools/timeline/test/browser_timeline_waterfall-background.js b/browser/devtools/timeline/test/browser_timeline_waterfall-background.js
deleted file mode 100644
index 47c1cfba170..00000000000
--- a/browser/devtools/timeline/test/browser_timeline_waterfall-background.js
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-/**
- * Tests if the waterfall background is a 1px high canvas stretching across
- * the container bounds.
- */
-
-add_task(function*() {
-  let { target, panel } = yield initTimelinePanel(SIMPLE_URL);
-  let { $, EVENTS, TimelineView, TimelineController } = panel.panelWin;
-
-  yield TimelineController.toggleRecording();
-  ok(true, "Recording has started.");
-
-  let updated = 0;
-  panel.panelWin.on(EVENTS.OVERVIEW_UPDATED, () => updated++);
-
-  ok((yield waitUntil(() => updated > 0)),
-    "The overview graphs were updated a bunch of times.");
-  ok((yield waitUntil(() => TimelineController.getMarkers().length > 0)),
-    "There are some markers available.");
-
-  yield TimelineController.toggleRecording();
-  ok(true, "Recording has ended.");
-
-  // Test the waterfall background.
-
-  let parentWidth = $("#timeline-waterfall").getBoundingClientRect().width;
-  let waterfallWidth = TimelineView.waterfall._waterfallWidth;
-  let sidebarWidth = 150; // px
-  is(waterfallWidth, parentWidth - sidebarWidth,
-    "The waterfall width is correct.")
-
-  ok(TimelineView.waterfall._canvas,
-    "A canvas should be created after the recording ended.");
-  ok(TimelineView.waterfall._ctx,
-    "A 2d context should be created after the recording ended.");
-
-  is(TimelineView.waterfall._canvas.width, waterfallWidth,
-    "The canvas width is correct.");
-  is(TimelineView.waterfall._canvas.height, 1,
-    "The canvas height is correct.");
-});
diff --git a/browser/devtools/timeline/test/browser_timeline_waterfall-styles.js b/browser/devtools/timeline/test/browser_timeline_waterfall-styles.js
deleted file mode 100644
index 35ab9ae7f6a..00000000000
--- a/browser/devtools/timeline/test/browser_timeline_waterfall-styles.js
+++ /dev/null
@@ -1,88 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-/**
- * Tests if the waterfall is properly built after making a selection
- * and the child nodes are styled correctly.
- */
-
-var gRGB_TO_HSL = {
- "rgb(193, 132, 214)": "hsl(285,50%,68%)",
- "rgb(152, 61, 183)": "hsl(285,50%,48%)",
- "rgb(161, 223, 138)": "hsl(104,57%,71%)",
- "rgb(96, 201, 58)": "hsl(104,57%,51%)",
- "rgb(240, 195, 111)": "hsl(39,82%,69%)",
- "rgb(227, 155, 22)": "hsl(39,82%,49%)",
- "rgb(204, 204, 204)": "hsl(0,0%,80%)",
- "rgb(153, 153, 153)": "hsl(0,0%,60%)",
-};
-
-add_task(function*() {
-  let { target, panel } = yield initTimelinePanel(SIMPLE_URL);
-  let { TIMELINE_BLUEPRINT } = devtools.require("devtools/shared/timeline/global");
-  let { $, $$, EVENTS, TimelineController } = panel.panelWin;
-
-  yield TimelineController.toggleRecording();
-  ok(true, "Recording has started.");
-
-  let updated = 0;
-  panel.panelWin.on(EVENTS.OVERVIEW_UPDATED, () => updated++);
-
-  ok((yield waitUntil(() => updated > 0)),
-    "The overview graphs were updated a bunch of times.");
-  ok((yield waitUntil(() => TimelineController.getMarkers().length > 0)),
-    "There are some markers available.");
-
-  yield TimelineController.toggleRecording();
-  ok(true, "Recording has ended.");
-
-  // Test the table sidebars.
-
-  for (let sidebar of [
-    ...$$(".timeline-header-sidebar"),
-    ...$$(".timeline-marker-sidebar")
-  ]) {
-    is(sidebar.getAttribute("width"), "150",
-      "The table's sidebar width is correct.");
-  }
-
-  // Test the table ticks.
-
-  for (let tick of $$(".timeline-header-tick")) {
-    ok(tick.getAttribute("value").match(/^\d+ ms$/),
-      "The table's timeline ticks appear to have correct labels.");
-    ok(tick.style.transform.match(/^translateX\(.*px\)$/),
-      "The table's timeline ticks appear to have proper translations.");
-  }
-
-  // Test the marker bullets.
-
-  for (let bullet of $$(".timeline-marker-bullet")) {
-    let type = bullet.getAttribute("type");
-
-    ok(type in TIMELINE_BLUEPRINT,
-      "The bullet type is present in the timeline blueprint.");
-    is(gRGB_TO_HSL[bullet.style.backgroundColor], TIMELINE_BLUEPRINT[type].fill,
-      "The bullet's background color is correct.");
-    is(gRGB_TO_HSL[bullet.style.borderColor], TIMELINE_BLUEPRINT[type].stroke,
-      "The bullet's border color is correct.");
-  }
-
-  // Test the marker bars.
-
-  for (let bar of $$(".timeline-marker-bar")) {
-    let type = bar.getAttribute("type");
-
-    ok(type in TIMELINE_BLUEPRINT,
-      "The bar type is present in the timeline blueprint.");
-    is(gRGB_TO_HSL[bar.style.backgroundColor], TIMELINE_BLUEPRINT[type].fill,
-      "The bar's background color is correct.");
-    is(gRGB_TO_HSL[bar.style.borderColor], TIMELINE_BLUEPRINT[type].stroke,
-      "The bar's border color is correct.");
-
-    ok(bar.getAttribute("width") > 0,
-      "The bar appears to have a proper width.");
-    ok(bar.style.transform.match(/^translateX\(.*px\)$/),
-      "The bar appears to have proper translations.");
-  }
-});
diff --git a/browser/devtools/timeline/test/doc_simple-test.html b/browser/devtools/timeline/test/doc_simple-test.html
deleted file mode 100644
index d038c46a7b5..00000000000
--- a/browser/devtools/timeline/test/doc_simple-test.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!-- Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/ -->
-<!doctype html>
-
-<html>
-  <head>
-    <meta charset="utf-8"/>
-    <title>Timeline test page</title>
-  </head>
-
-  <body>
-    <script type="text/javascript">
-      var x = 1;
-      function test() {
-        document.body.style.borderTop = x + "px solid red";
-        x = 1^x;
-        document.body.innerHeight; // flush pending reflows
-      }
-
-      // Prevent this script from being garbage collected.
-      window.setInterval(test, 1);
-    </script>
-  </body>
-
-</html>
diff --git a/browser/devtools/timeline/test/head.js b/browser/devtools/timeline/test/head.js
deleted file mode 100644
index 74b185aa361..00000000000
--- a/browser/devtools/timeline/test/head.js
+++ /dev/null
@@ -1,148 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-"use strict";
-
-const { classes: Cc, interfaces: Ci, utils: Cu, results: Cr } = Components;
-
-let { Services } = Cu.import("resource://gre/modules/Services.jsm", {});
-
-// Disable logging for all the tests. Both the debugger server and frontend will
-// be affected by this pref.
-let gEnableLogging = Services.prefs.getBoolPref("devtools.debugger.log");
-Services.prefs.setBoolPref("devtools.debugger.log", false);
-
-// Enable the tool while testing.
-let gToolEnabled = Services.prefs.getBoolPref("devtools.timeline.enabled");
-Services.prefs.setBoolPref("devtools.timeline.enabled", true);
-
-let { Task } = Cu.import("resource://gre/modules/Task.jsm", {});
-let { Promise: promise } = Cu.import("resource://gre/modules/Promise.jsm", {});
-let { DevToolsUtils } = Cu.import("resource://gre/modules/devtools/DevToolsUtils.jsm", {});
-let { gDevTools } = Cu.import("resource:///modules/devtools/gDevTools.jsm", {});
-let { devtools } = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
-
-let TargetFactory = devtools.TargetFactory;
-let Toolbox = devtools.Toolbox;
-
-const EXAMPLE_URL = "http://example.com/browser/browser/devtools/timeline/test/";
-const SIMPLE_URL = EXAMPLE_URL + "doc_simple-test.html";
-
-// All tests are asynchronous.
-waitForExplicitFinish();
-
-registerCleanupFunction(() => {
-  info("finish() was called, cleaning up...");
-  Services.prefs.setBoolPref("devtools.debugger.log", gEnableLogging);
-  Services.prefs.setBoolPref("devtools.timeline.enabled", gToolEnabled);
-});
-
-// Close the toolbox and all opened tabs automatically.
-registerCleanupFunction(function*() {
-  let target = TargetFactory.forTab(gBrowser.selectedTab);
-  yield gDevTools.closeToolbox(target);
-
-  while (gBrowser.tabs.length > 1) {
-    gBrowser.removeCurrentTab();
-  }
-});
-
-function addTab(url) {
-  info("Adding tab: " + url);
-
-  let deferred = promise.defer();
-  let tab = gBrowser.selectedTab = gBrowser.addTab(url);
-  let linkedBrowser = tab.linkedBrowser;
-
-  linkedBrowser.addEventListener("load", function onLoad() {
-    linkedBrowser.removeEventListener("load", onLoad, true);
-    info("Tab added and finished loading: " + url);
-    deferred.resolve(tab);
-  }, true);
-
-  return deferred.promise;
-}
-
-/**
- * Spawns a new tab and starts up a toolbox with the timeline panel
- * automatically selected.
- *
- * Must be used within a task.
- *
- * @param string url
- *        The location of the new tab to spawn.
- * @return object
- *         A promise resolved once the timeline is initialized, with the
- *         {target, panel} instances.
- */
-function* initTimelinePanel(url) {
-  info("Initializing a timeline pane.");
-
-  let tab = yield addTab(url);
-  let target = TargetFactory.forTab(tab);
-
-  yield target.makeRemote();
-
-  let toolbox = yield gDevTools.showToolbox(target, "timeline");
-  let panel = toolbox.getCurrentPanel();
-  return { target, panel };
-}
-
-/**
- * Waits until a predicate returns true.
- *
- * @param function predicate
- *        Invoked once in a while until it returns true.
- * @param number interval [optional]
- *        How often the predicate is invoked, in milliseconds.
- */
-function waitUntil(predicate, interval = 10) {
-  if (predicate()) {
-    return promise.resolve(true);
-  }
-  let deferred = promise.defer();
-  setTimeout(function() {
-    waitUntil(predicate).then(() => deferred.resolve(true));
-  }, interval);
-  return deferred.promise;
-
-}
-
-/**
- * Wait until next tick.
- */
-function nextTick() {
-  let def = promise.defer();
-  executeSoon(() => def.resolve())
-  return def.promise;
-}
-
-/**
- * Wait for eventName on target.
- * @param {Object} target An observable object that either supports on/off or
- * addEventListener/removeEventListener
- * @param {String} eventName
- * @param {Boolean} useCapture Optional, for addEventListener/removeEventListener
- * @return A promise that resolves when the event has been handled
- */
-function once(target, eventName, useCapture=false) {
-  info("Waiting for event: '" + eventName + "' on " + target + ".");
-
-  let deferred = promise.defer();
-
-  for (let [add, remove] of [
-    ["addEventListener", "removeEventListener"],
-    ["addListener", "removeListener"],
-    ["on", "off"]
-  ]) {
-    if ((add in target) && (remove in target)) {
-      target[add](eventName, function onEvent(...aArgs) {
-        info("Got event: '" + eventName + "' on " + target + ".");
-        target[remove](eventName, onEvent, useCapture);
-        deferred.resolve.apply(deferred, aArgs);
-      }, useCapture);
-      break;
-    }
-  }
-
-  return deferred.promise;
-}

From d2304ca17d8d29fd06cc559a4253a50d7cf11d90 Mon Sep 17 00:00:00 2001
From: Wander Lairson Costa <wcosta@mozilla.com>
Date: Thu, 30 Apr 2015 16:26:38 -0300
Subject: [PATCH 69/88] Bug 1154947 part 1: Add routes scopes to taskcluster
 graph.

---
 testing/taskcluster/mach_commands.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/testing/taskcluster/mach_commands.py b/testing/taskcluster/mach_commands.py
index 43de912d2ff..ae336746de4 100644
--- a/testing/taskcluster/mach_commands.py
+++ b/testing/taskcluster/mach_commands.py
@@ -327,6 +327,8 @@ class Graph(object):
 
             graph['scopes'].append(define_task)
             graph['scopes'].extend(build_task['task'].get('scopes', []))
+            route_scopes = map(lambda route: 'queue:route:' + route, build_task['task'].get('routes', []))
+            graph['scopes'].extend(route_scopes)
 
             # Treeherder symbol configuration for the graph required for each
             # build so tests know which platform they belong to.

From ce140d4933631d0cab9d9b1267eb4ba5a653f103 Mon Sep 17 00:00:00 2001
From: Wander Lairson Costa <wcosta@mozilla.com>
Date: Thu, 30 Apr 2015 16:26:38 -0300
Subject: [PATCH 70/88] Bug 1154947 part 2: Use variant in the URL update.

We need a different update URL for each device variant. This allows us
to provide updates for both user and userdebug device variants.

The solution we came with is appending the variant (build type) in the
product device string. To avoid breaking existing phones, we do only
for non-user build types.
---
 toolkit/mozapps/update/nsUpdateService.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/toolkit/mozapps/update/nsUpdateService.js b/toolkit/mozapps/update/nsUpdateService.js
index 3f579ab5778..f3d39f9f6de 100644
--- a/toolkit/mozapps/update/nsUpdateService.js
+++ b/toolkit/mozapps/update/nsUpdateService.js
@@ -3496,10 +3496,15 @@ Checker.prototype = {
     if (AppConstants.platform == "gonk") {
       let sysLibs = {};
       Cu.import("resource://gre/modules/systemlibs.js", sysLibs);
+      let productDevice = sysLibs.libcutils.property_get("ro.product.device");
+      let buildType = sysLibs.libcutils.property_get("ro.build.type");
       url = url.replace(/%PRODUCT_MODEL%/g,
                         sysLibs.libcutils.property_get("ro.product.model"));
-      url = url.replace(/%PRODUCT_DEVICE%/g,
-                        sysLibs.libcutils.property_get("ro.product.device"));
+      if (buildType == "user") {
+        url = url.replace(/%PRODUCT_DEVICE%/g, productDevice);
+      } else {
+        url = url.replace(/%PRODUCT_DEVICE%/g, productDevice + "-" + buildType);
+      }
       url = url.replace(/%B2G_VERSION%/g,
                         getPref("getCharPref", PREF_APP_B2G_VERSION, null));
     }

From b894b01f110127dfb6d769de65dbbf46c1ebee80 Mon Sep 17 00:00:00 2001
From: Wander Lairson Costa <wcosta@mozilla.com>
Date: Thu, 30 Apr 2015 16:26:38 -0300
Subject: [PATCH 71/88] Bug 1154947 part 3: Add aries nightly user, userdebug
 and eng builds.

---
 .../phone-builder/build-lightsaber-nightly.sh | 11 ++++-
 .../scripts/phone-builder/build-lightsaber.sh | 40 +++++++++++++++++++
 .../tasks/branches/base_job_flags.yml         |  1 +
 .../tasks/branches/cypress/job_flags.yml      | 10 ++++-
 .../tasks/builds/b2g_aries_lightsaber_eng.yml | 35 ++++++++++++++++
 ... => b2g_aries_lightsaber_nightly_base.yml} |  9 -----
 .../b2g_aries_lightsaber_nightly_debug.yml    | 18 +++++++++
 .../b2g_aries_lightsaber_nightly_opt.yml      | 17 ++++++++
 8 files changed, 130 insertions(+), 11 deletions(-)
 create mode 100755 testing/taskcluster/scripts/phone-builder/build-lightsaber.sh
 create mode 100644 testing/taskcluster/tasks/builds/b2g_aries_lightsaber_eng.yml
 rename testing/taskcluster/tasks/builds/{b2g_aries_lightsaber_nightly.yml => b2g_aries_lightsaber_nightly_base.yml} (70%)
 create mode 100644 testing/taskcluster/tasks/builds/b2g_aries_lightsaber_nightly_debug.yml
 create mode 100644 testing/taskcluster/tasks/builds/b2g_aries_lightsaber_nightly_opt.yml

diff --git a/testing/taskcluster/scripts/phone-builder/build-lightsaber-nightly.sh b/testing/taskcluster/scripts/phone-builder/build-lightsaber-nightly.sh
index 57e25a99b9d..72f1deda793 100755
--- a/testing/taskcluster/scripts/phone-builder/build-lightsaber-nightly.sh
+++ b/testing/taskcluster/scripts/phone-builder/build-lightsaber-nightly.sh
@@ -15,6 +15,15 @@ fi
 aws s3 cp s3://b2g-nightly-credentials/balrog_credentials .
 mar_file=b2g-${TARGET%%-*}-gecko-update.mar
 
+# We need different platform names for each variant (user, userdebug and
+# eng). We do not append variant suffix for "user" to keep compability with
+# verions already installed in the phones.
+if [ $VARIANT == "user" ]; then
+  PLATFORM=$TARGET
+else
+  PLATFORM=$TARGET-$VARIANT
+fi
+
 ./mozharness/scripts/b2g_lightsaber.py \
   --config b2g/taskcluster-lightsaber-nightly.py \
   --config balrog/staging.py \
@@ -29,7 +38,7 @@ mar_file=b2g-${TARGET%%-*}-gecko-update.mar
   --checkout-revision=$GECKO_HEAD_REV \
   --base-repo=$GECKO_BASE_REPOSITORY \
   --repo=$GECKO_HEAD_REPOSITORY \
-  --platform $TARGET \
+  --platform $PLATFORM \
   --complete-mar-url https://queue.taskcluster.net/v1/task/$TASK_ID/runs/$RUN_ID/artifacts/public/build/$mar_file \
 
 # Don't cache backups
diff --git a/testing/taskcluster/scripts/phone-builder/build-lightsaber.sh b/testing/taskcluster/scripts/phone-builder/build-lightsaber.sh
new file mode 100755
index 00000000000..ec010778eae
--- /dev/null
+++ b/testing/taskcluster/scripts/phone-builder/build-lightsaber.sh
@@ -0,0 +1,40 @@
+#! /bin/bash -vex
+
+. pre-build.sh
+
+# We need different platform names for each variant (user, userdebug and
+# eng). We do not append variant suffix for "user" to keep compability with
+# verions already installed in the phones.
+if [ $VARIANT == "user" ]; then
+  PLATFORM=$TARGET
+else
+  PLATFORM=$TARGET-$VARIANT
+fi
+
+./mozharness/scripts/b2g_lightsaber.py \
+  --config b2g/taskcluster-lightsaber.py \
+  "$debug_flag" \
+  --disable-mock \
+  --variant=$VARIANT \
+  --work-dir=$WORKSPACE/B2G \
+  --gaia-languages-file locales/languages_all.json \
+  --log-level=debug \
+  --target=$TARGET \
+  --b2g-config-dir=$TARGET \
+  --checkout-revision=$GECKO_HEAD_REV \
+  --base-repo=$GECKO_BASE_REPOSITORY \
+  --repo=$GECKO_HEAD_REPOSITORY
+
+# Don't cache backups
+rm -rf $WORKSPACE/B2G/backup-*
+
+# Move files into artifact locations!
+mkdir -p $HOME/artifacts
+
+mv $WORKSPACE/B2G/upload/sources.xml $HOME/artifacts/sources.xml
+mv $WORKSPACE/B2G/upload/b2g-*.crashreporter-symbols.zip $HOME/artifacts/b2g-crashreporter-symbols.zip
+mv $WORKSPACE/B2G/upload/b2g-*.android-arm.tar.gz $HOME/artifacts/b2g-android-arm.tar.gz
+mv $WORKSPACE/B2G/upload/${TARGET}.zip $HOME/artifacts/${TARGET}.zip
+mv $WORKSPACE/B2G/upload/gaia.zip $HOME/artifacts/gaia.zip
+
+ccache -s
diff --git a/testing/taskcluster/tasks/branches/base_job_flags.yml b/testing/taskcluster/tasks/branches/base_job_flags.yml
index 91b11673b85..3cdc533fc0a 100644
--- a/testing/taskcluster/tasks/branches/base_job_flags.yml
+++ b/testing/taskcluster/tasks/branches/base_job_flags.yml
@@ -23,6 +23,7 @@ flags:
     - dolphin-512
     - dolphin-512-eng
     - aries-nightly
+    - aries-eng
 
   tests:
     - cppunit
diff --git a/testing/taskcluster/tasks/branches/cypress/job_flags.yml b/testing/taskcluster/tasks/branches/cypress/job_flags.yml
index 1820ee53386..26bde745312 100644
--- a/testing/taskcluster/tasks/branches/cypress/job_flags.yml
+++ b/testing/taskcluster/tasks/branches/cypress/job_flags.yml
@@ -23,7 +23,15 @@ builds:
       - b2g
     types:
       opt:
-        task: tasks/builds/b2g_aries_lightsaber_nightly.yml
+        task: tasks/builds/b2g_aries_lightsaber_nightly_opt.yml
+      debug:
+        task: tasks/builds/b2g_aries_lightsaber_nightly_debug.yml
+  aries-eng:
+    platforms:
+      - b2g
+    types:
+      opt:
+        task: tasks/builds/b2g_aries_lightsaber_eng.yml
 
 tests:
   gaia-build:
diff --git a/testing/taskcluster/tasks/builds/b2g_aries_lightsaber_eng.yml b/testing/taskcluster/tasks/builds/b2g_aries_lightsaber_eng.yml
new file mode 100644
index 00000000000..1406b6a09c3
--- /dev/null
+++ b/testing/taskcluster/tasks/builds/b2g_aries_lightsaber_eng.yml
@@ -0,0 +1,35 @@
+$inherits:
+  from: 'tasks/builds/b2g_phone_base.yml'
+  variables:
+    build_name: 'aries-eng'
+    build_type: 'opt'
+task:
+  workerType: flame-kk
+  scopes:
+    - 'docker-worker:cache:build-aries-eng'
+  metadata:
+    name: '[TC] B2G Aries Eng'
+
+  payload:
+    cache:
+      build-aries-eng: /home/worker/workspace
+    env:
+      TARGET: 'aries'
+      DEBUG: 0
+      VARIANT: eng
+      GAIA_OPTIMIZE: '1'
+      B2G_SYSTEM_APPS: '1'
+    command:
+      - >
+        checkout-gecko workspace &&
+        cd ./workspace/gecko/testing/taskcluster/scripts/phone-builder &&
+        buildbot_step 'Build' ./build-lightsaber.sh $HOME/workspace
+  extra:
+    treeherder:
+      symbol: Be
+      groupSymbol: Aries
+      groupName: Aries Device Image
+      machine:
+        platform: b2g-device-image
+    locations:
+      img: 'private/build/aries.zip'
diff --git a/testing/taskcluster/tasks/builds/b2g_aries_lightsaber_nightly.yml b/testing/taskcluster/tasks/builds/b2g_aries_lightsaber_nightly_base.yml
similarity index 70%
rename from testing/taskcluster/tasks/builds/b2g_aries_lightsaber_nightly.yml
rename to testing/taskcluster/tasks/builds/b2g_aries_lightsaber_nightly_base.yml
index 345b9a097cb..f3ec44ca710 100644
--- a/testing/taskcluster/tasks/builds/b2g_aries_lightsaber_nightly.yml
+++ b/testing/taskcluster/tasks/builds/b2g_aries_lightsaber_nightly_base.yml
@@ -1,18 +1,9 @@
 $inherits:
   from: 'tasks/builds/b2g_phone_base.yml'
-  variables:
-    build_name: 'aries'
-    build_type: 'nightly'
 task:
   workerType: flame-kk
-  scopes:
-    - 'docker-worker:cache:build-aries-lightsaber-nightly'
-  metadata:
-    name: '[TC] B2G Aries Nightly'
 
   payload:
-    cache:
-      build-aries-lightsaber-nightly: /home/worker/workspace
     env:
       TARGET: 'aries'
       DEBUG: 0
diff --git a/testing/taskcluster/tasks/builds/b2g_aries_lightsaber_nightly_debug.yml b/testing/taskcluster/tasks/builds/b2g_aries_lightsaber_nightly_debug.yml
new file mode 100644
index 00000000000..a315aa5d820
--- /dev/null
+++ b/testing/taskcluster/tasks/builds/b2g_aries_lightsaber_nightly_debug.yml
@@ -0,0 +1,18 @@
+$inherits:
+  from: 'tasks/builds/b2g_aries_lightsaber_nightly_base.yml'
+  variables:
+    build_name: 'aries'
+    build_type: 'nightly-debug'
+task:
+  metadata:
+    name: '[TC] B2G Aries Nightly (userdebug)'
+  scopes:
+    - 'docker-worker:cache:build-aries-lightsaber-nightly-debug'
+
+  payload:
+    cache:
+      build-aries-lightsaber-nightly-debug: /home/worker/workspace
+    env:
+      VARIANT: userdebug
+      B2G_DEBUG: 1
+
diff --git a/testing/taskcluster/tasks/builds/b2g_aries_lightsaber_nightly_opt.yml b/testing/taskcluster/tasks/builds/b2g_aries_lightsaber_nightly_opt.yml
new file mode 100644
index 00000000000..64d5d152e8c
--- /dev/null
+++ b/testing/taskcluster/tasks/builds/b2g_aries_lightsaber_nightly_opt.yml
@@ -0,0 +1,17 @@
+$inherits:
+  from: 'tasks/builds/b2g_aries_lightsaber_nightly_base.yml'
+  variables:
+    build_name: 'aries'
+    build_type: 'nightly-user'
+task:
+  metadata:
+    name: '[TC] B2G Aries Nightly (user)'
+  scopes:
+    - 'docker-worker:cache:build-aries-lightsaber-nightly-user'
+
+  payload:
+    cache:
+      build-aries-lightsaber-nightly-user: /home/worker/workspace
+    env:
+      VARIANT: user
+

From b036ca08f391ffac0f6efd1911cf1871212de59f Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Thu, 30 Apr 2015 13:32:35 -0700
Subject: [PATCH 72/88] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/25d855df79ba
Author: gasolin <gasolin@gmail.com>
Desc: Merge pull request #29766 from gasolin/issue-1154209

Bug 1154209 - [l10n][Camera]Arabic:The checkboxes will be overlapped with the text in the Website Permission view, r=alive

========

https://hg.mozilla.org/integration/gaia-central/rev/76122f05b7a5
Author: gasolin <gasolin@gmail.com>
Desc: Bug 1154209 - [l10n][Camera]Arabic:The checkboxes will be overlapped with the text in the Website Permission view, r=alive
---
 b2g/config/gaia.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index ee6b6910fc4..2ccd1b72229 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,9 +1,9 @@
 {
     "git": {
-        "git_revision": "d0ac1f67e1b62e4d6dd5028fb09f2439170df54e", 
+        "git_revision": "b3fa9fbfa2265ac8944e76c2dced30e319699ba0", 
         "remote": "https://git.mozilla.org/releases/gaia.git", 
         "branch": ""
     }, 
-    "revision": "0db33b0413bc989d19d9978ac035c7b58187e85e", 
+    "revision": "25d855df79babe1794f40d9eb8c6b66e7ebf0f71", 
     "repo_path": "integration/gaia-central"
 }

From 799ddd72b95d5d209a08b9b543e993aa7680665d Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Thu, 30 Apr 2015 13:34:51 -0700
Subject: [PATCH 73/88] Bumping manifests a=b2g-bump

---
 b2g/config/dolphin/sources.xml      | 2 +-
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator-l/sources.xml   | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame-kk/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/nexus-5-l/sources.xml    | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml
index fe40faeefe0..6280eea39a9 100644
--- a/b2g/config/dolphin/sources.xml
+++ b/b2g/config/dolphin/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="2eda36a4795012a5d1275b77ebb20ac377c8cd26">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="d0ac1f67e1b62e4d6dd5028fb09f2439170df54e"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="b3fa9fbfa2265ac8944e76c2dced30e319699ba0"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index 8fcb4742059..27f28e2ba08 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="d0ac1f67e1b62e4d6dd5028fb09f2439170df54e"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="b3fa9fbfa2265ac8944e76c2dced30e319699ba0"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="9a9797062c6001d6346504161c51187a2968466b"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 769bf708651..409c3097125 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="d0ac1f67e1b62e4d6dd5028fb09f2439170df54e"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="b3fa9fbfa2265ac8944e76c2dced30e319699ba0"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="adb24954bf8068f21705b570450475d183336b2d"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="0627790166dccd8dd370fa7d9f434ed9fc027fb4"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index 66d67bf8a8a..7bef7006dd6 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="2eda36a4795012a5d1275b77ebb20ac377c8cd26">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="d0ac1f67e1b62e4d6dd5028fb09f2439170df54e"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="b3fa9fbfa2265ac8944e76c2dced30e319699ba0"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml
index 15587e684ee..5c593b0cc02 100644
--- a/b2g/config/emulator-l/sources.xml
+++ b/b2g/config/emulator-l/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="61e82f99bb8bc78d52b5717e9a2481ec7267fa33">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="d0ac1f67e1b62e4d6dd5028fb09f2439170df54e"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="b3fa9fbfa2265ac8944e76c2dced30e319699ba0"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 8fcb4742059..27f28e2ba08 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="d0ac1f67e1b62e4d6dd5028fb09f2439170df54e"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="b3fa9fbfa2265ac8944e76c2dced30e319699ba0"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="9a9797062c6001d6346504161c51187a2968466b"/>
diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml
index b5e5829c627..6be664416f7 100644
--- a/b2g/config/flame-kk/sources.xml
+++ b/b2g/config/flame-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="2eda36a4795012a5d1275b77ebb20ac377c8cd26">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="d0ac1f67e1b62e4d6dd5028fb09f2439170df54e"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="b3fa9fbfa2265ac8944e76c2dced30e319699ba0"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index f0db64f2aaa..dea804791cb 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="d0ac1f67e1b62e4d6dd5028fb09f2439170df54e"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="b3fa9fbfa2265ac8944e76c2dced30e319699ba0"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="adb24954bf8068f21705b570450475d183336b2d"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="0627790166dccd8dd370fa7d9f434ed9fc027fb4"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index 500b50c5ae0..b911462cda8 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="d0ac1f67e1b62e4d6dd5028fb09f2439170df54e"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="b3fa9fbfa2265ac8944e76c2dced30e319699ba0"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="adb24954bf8068f21705b570450475d183336b2d"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="0627790166dccd8dd370fa7d9f434ed9fc027fb4"/>
diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml
index d851bd7bc38..0d75ffc3022 100644
--- a/b2g/config/nexus-5-l/sources.xml
+++ b/b2g/config/nexus-5-l/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="61e82f99bb8bc78d52b5717e9a2481ec7267fa33">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="d0ac1f67e1b62e4d6dd5028fb09f2439170df54e"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="b3fa9fbfa2265ac8944e76c2dced30e319699ba0"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>

From 4c21ac591884b1b537adc38bf5d4b6686fa67ab6 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Thu, 30 Apr 2015 14:20:17 -0700
Subject: [PATCH 74/88] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/f8904d6b3b68
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Merge pull request #29782 from davidflanagan/bug1159092

Bug 1159092 - get ellipsis on the correct side for lockscreen and notifi... r=dkuo

========

https://hg.mozilla.org/integration/gaia-central/rev/f1563c82ea5d
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Bug 1159092 - get ellipsis on the correct side for lockscreen and notification screen playback controls.

fix the new tests
---
 b2g/config/gaia.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 2ccd1b72229..388bb5cd1d6 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,9 +1,9 @@
 {
     "git": {
-        "git_revision": "b3fa9fbfa2265ac8944e76c2dced30e319699ba0", 
+        "git_revision": "4e2ff35414a885831fdd8932a5ccb226b99eb030", 
         "remote": "https://git.mozilla.org/releases/gaia.git", 
         "branch": ""
     }, 
-    "revision": "25d855df79babe1794f40d9eb8c6b66e7ebf0f71", 
+    "revision": "f8904d6b3b6839469382681c9d9c8cfa096a90ff", 
     "repo_path": "integration/gaia-central"
 }

From 7f346a8820f299f9b5b4f2f24caafaa88352942e Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Thu, 30 Apr 2015 14:22:29 -0700
Subject: [PATCH 75/88] Bumping manifests a=b2g-bump

---
 b2g/config/dolphin/sources.xml      | 2 +-
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator-l/sources.xml   | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame-kk/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/nexus-5-l/sources.xml    | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml
index 6280eea39a9..73291c65d99 100644
--- a/b2g/config/dolphin/sources.xml
+++ b/b2g/config/dolphin/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="2eda36a4795012a5d1275b77ebb20ac377c8cd26">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="b3fa9fbfa2265ac8944e76c2dced30e319699ba0"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="4e2ff35414a885831fdd8932a5ccb226b99eb030"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index 27f28e2ba08..fad0eb1e3db 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="b3fa9fbfa2265ac8944e76c2dced30e319699ba0"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="4e2ff35414a885831fdd8932a5ccb226b99eb030"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="9a9797062c6001d6346504161c51187a2968466b"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 409c3097125..07a7e644b19 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="b3fa9fbfa2265ac8944e76c2dced30e319699ba0"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="4e2ff35414a885831fdd8932a5ccb226b99eb030"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="adb24954bf8068f21705b570450475d183336b2d"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="0627790166dccd8dd370fa7d9f434ed9fc027fb4"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index 7bef7006dd6..f0ad2cc595d 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="2eda36a4795012a5d1275b77ebb20ac377c8cd26">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="b3fa9fbfa2265ac8944e76c2dced30e319699ba0"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="4e2ff35414a885831fdd8932a5ccb226b99eb030"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml
index 5c593b0cc02..530f482b896 100644
--- a/b2g/config/emulator-l/sources.xml
+++ b/b2g/config/emulator-l/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="61e82f99bb8bc78d52b5717e9a2481ec7267fa33">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="b3fa9fbfa2265ac8944e76c2dced30e319699ba0"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="4e2ff35414a885831fdd8932a5ccb226b99eb030"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 27f28e2ba08..fad0eb1e3db 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="b3fa9fbfa2265ac8944e76c2dced30e319699ba0"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="4e2ff35414a885831fdd8932a5ccb226b99eb030"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="9a9797062c6001d6346504161c51187a2968466b"/>
diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml
index 6be664416f7..b13462786ca 100644
--- a/b2g/config/flame-kk/sources.xml
+++ b/b2g/config/flame-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="2eda36a4795012a5d1275b77ebb20ac377c8cd26">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="b3fa9fbfa2265ac8944e76c2dced30e319699ba0"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="4e2ff35414a885831fdd8932a5ccb226b99eb030"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index dea804791cb..2dc1e7f72fd 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="b3fa9fbfa2265ac8944e76c2dced30e319699ba0"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="4e2ff35414a885831fdd8932a5ccb226b99eb030"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="adb24954bf8068f21705b570450475d183336b2d"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="0627790166dccd8dd370fa7d9f434ed9fc027fb4"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index b911462cda8..b66c8948e84 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="b3fa9fbfa2265ac8944e76c2dced30e319699ba0"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="4e2ff35414a885831fdd8932a5ccb226b99eb030"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="adb24954bf8068f21705b570450475d183336b2d"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="0627790166dccd8dd370fa7d9f434ed9fc027fb4"/>
diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml
index 0d75ffc3022..a704cc30dbc 100644
--- a/b2g/config/nexus-5-l/sources.xml
+++ b/b2g/config/nexus-5-l/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="61e82f99bb8bc78d52b5717e9a2481ec7267fa33">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="b3fa9fbfa2265ac8944e76c2dced30e319699ba0"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="4e2ff35414a885831fdd8932a5ccb226b99eb030"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>

From 54f34b0eab13a16de2e468df2dfcd44fd1350b2e Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Thu, 30 Apr 2015 14:50:03 -0700
Subject: [PATCH 76/88] Bumping manifests a=b2g-bump

---
 b2g/config/flame-kk/sources.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml
index b13462786ca..118a3a68855 100644
--- a/b2g/config/flame-kk/sources.xml
+++ b/b2g/config/flame-kk/sources.xml
@@ -125,7 +125,7 @@
   <!-- Flame specific things -->
   <project name="device/generic/armv7-a-neon" path="device/generic/armv7-a-neon" revision="1bb28abbc215f45220620af5cd60a8ac1be93722"/>
   <project name="device/qcom/common" path="device/qcom/common" revision="2501e5940ba69ece7654ff85611c76ae5bda299c"/>
-  <project name="device-flame" path="device/t2m/flame" remote="b2g" revision="b83fc73de7b64594cd74b33e498bf08332b5d87b"/>
+  <project name="device-flame" path="device/t2m/flame" remote="b2g" revision="a9f3f8fb8b0844724de32426b7bcc4e6dc4fa2ed"/>
   <project name="codeaurora_kernel_msm" path="kernel" remote="b2g" revision="0865bc4134b67220df4058625fba29305d6b10c3"/>
   <project name="kernel_lk" path="bootable/bootloader/lk" remote="b2g" revision="fda40423ffa573dc6cafd3780515010cb2a086be"/>
   <project name="platform_bootable_recovery" path="bootable/recovery" remote="b2g" revision="d5e53ed6f22fa06052351dc03510af9473af01ea"/>

From d1671bfc8f8a4ce63f46229ac1ec58c00b5dffd0 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Thu, 30 Apr 2015 15:10:34 -0700
Subject: [PATCH 77/88] Bumping gaia.json for 4 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/45c1d03f8a48
Author: autolander <bug.autolander@gmail.com>
Desc: Bug 1157159 - merge pull request #29781 from mikehenrty:bug-1157159-button-padding to mozilla-b2g:master

========

https://hg.mozilla.org/integration/gaia-central/rev/8f06eee50cc0
Author: Michael Henretty <michael.henretty@gmail.com>
Desc: Bug 1157159 - Adjust button padding to account for gecko patch in bug 1010675

========

https://hg.mozilla.org/integration/gaia-central/rev/0f781e1f7e45
Author: autolander <bug.autolander@gmail.com>
Desc: Bug 1159474 - merge pull request #29797 from gaye:bug-1159474-db.js-in-worker to mozilla-b2g:master

========

https://hg.mozilla.org/integration/gaia-central/rev/fa1aca48a712
Author: gaye <gaye@mozilla.com>
Desc: Bug 1159474 - Bring up db.js in v3 worker r=millermedeiros
---
 b2g/config/gaia.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 388bb5cd1d6..02c7cac18cd 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,9 +1,9 @@
 {
     "git": {
-        "git_revision": "4e2ff35414a885831fdd8932a5ccb226b99eb030", 
+        "git_revision": "be4937beae100433e896c2028b58c6389d97b828", 
         "remote": "https://git.mozilla.org/releases/gaia.git", 
         "branch": ""
     }, 
-    "revision": "f8904d6b3b6839469382681c9d9c8cfa096a90ff", 
+    "revision": "45c1d03f8a48c4012b27a0c73d8e1b7c3f853c17", 
     "repo_path": "integration/gaia-central"
 }

From 9605ed5cdf8c45ac0a83aa03f6b2d25580667088 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Thu, 30 Apr 2015 15:13:17 -0700
Subject: [PATCH 78/88] Bumping manifests a=b2g-bump

---
 b2g/config/dolphin/sources.xml      | 4 ++--
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator-l/sources.xml   | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame-kk/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/nexus-5-l/sources.xml    | 2 +-
 10 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml
index 73291c65d99..dcca9236c94 100644
--- a/b2g/config/dolphin/sources.xml
+++ b/b2g/config/dolphin/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="2eda36a4795012a5d1275b77ebb20ac377c8cd26">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="4e2ff35414a885831fdd8932a5ccb226b99eb030"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="be4937beae100433e896c2028b58c6389d97b828"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
@@ -134,7 +134,7 @@
   <project name="platform/hardware/akm" path="hardware/akm" revision="6d3be412647b0eab0adff8a2768736cf4eb68039"/>
   <project groups="invensense" name="platform/hardware/invensense" path="hardware/invensense" revision="e6d9ab28b4f4e7684f6c07874ee819c9ea0002a2"/>
   <project name="platform/hardware/ril" path="hardware/ril" revision="865ce3b4a2ba0b3a31421ca671f4d6c5595f8690"/>
-  <project name="kernel/common" path="kernel" revision="0be9cc12cd81b145e1471016c19722429ff9285e"/>
+  <project name="kernel/common" path="kernel" revision="a2977758950865feb5980996d8e889677dea3bd4"/>
   <project name="platform/system/core" path="system/core" revision="7992618bd4ee33ce96897675a5c0a9b619122f13"/>
   <project name="u-boot" path="u-boot" revision="f1502910977ac88f43da7bf9277c3523ad4b0b2f"/>
   <project name="vendor/sprd/gps" path="vendor/sprd/gps" revision="7d6e1269be7186b2073fa568958b357826692c4b"/>
diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index fad0eb1e3db..d7c29e24e44 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="4e2ff35414a885831fdd8932a5ccb226b99eb030"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="be4937beae100433e896c2028b58c6389d97b828"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="9a9797062c6001d6346504161c51187a2968466b"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 07a7e644b19..89cbb2683f1 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="4e2ff35414a885831fdd8932a5ccb226b99eb030"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="be4937beae100433e896c2028b58c6389d97b828"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="adb24954bf8068f21705b570450475d183336b2d"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="0627790166dccd8dd370fa7d9f434ed9fc027fb4"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index f0ad2cc595d..379a5ba16b6 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="2eda36a4795012a5d1275b77ebb20ac377c8cd26">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="4e2ff35414a885831fdd8932a5ccb226b99eb030"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="be4937beae100433e896c2028b58c6389d97b828"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml
index 530f482b896..4c67eb9fcde 100644
--- a/b2g/config/emulator-l/sources.xml
+++ b/b2g/config/emulator-l/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="61e82f99bb8bc78d52b5717e9a2481ec7267fa33">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="4e2ff35414a885831fdd8932a5ccb226b99eb030"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="be4937beae100433e896c2028b58c6389d97b828"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index fad0eb1e3db..d7c29e24e44 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="4e2ff35414a885831fdd8932a5ccb226b99eb030"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="be4937beae100433e896c2028b58c6389d97b828"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="9a9797062c6001d6346504161c51187a2968466b"/>
diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml
index 118a3a68855..3633f3d6a7a 100644
--- a/b2g/config/flame-kk/sources.xml
+++ b/b2g/config/flame-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="2eda36a4795012a5d1275b77ebb20ac377c8cd26">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="4e2ff35414a885831fdd8932a5ccb226b99eb030"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="be4937beae100433e896c2028b58c6389d97b828"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index 2dc1e7f72fd..8eb3774d1ff 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="4e2ff35414a885831fdd8932a5ccb226b99eb030"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="be4937beae100433e896c2028b58c6389d97b828"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="adb24954bf8068f21705b570450475d183336b2d"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="0627790166dccd8dd370fa7d9f434ed9fc027fb4"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index b66c8948e84..f8d56ef6034 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="4e2ff35414a885831fdd8932a5ccb226b99eb030"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="be4937beae100433e896c2028b58c6389d97b828"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="adb24954bf8068f21705b570450475d183336b2d"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="0627790166dccd8dd370fa7d9f434ed9fc027fb4"/>
diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml
index a704cc30dbc..b9f269cfc1d 100644
--- a/b2g/config/nexus-5-l/sources.xml
+++ b/b2g/config/nexus-5-l/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="61e82f99bb8bc78d52b5717e9a2481ec7267fa33">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="4e2ff35414a885831fdd8932a5ccb226b99eb030"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="be4937beae100433e896c2028b58c6389d97b828"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>

From 23a9337203c63d98b90b2e888af2e08a61ff481a Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Thu, 30 Apr 2015 15:55:06 -0700
Subject: [PATCH 79/88] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/fad3ec1819fa
Author: Sam Foster <sam@sam-i-am.com>
Desc: Merge pull request #29756 from sfoster/ftu-change-btn-bug-1157173

Bug 1157173 - Rejigger change button styles

Test run at https://treeherder.mozilla.org/#/jobs?repo=gaia&revision=ce5f36766914c645ccab5bb0bb6bc9be55d2e96b was green, landing manually

========

https://hg.mozilla.org/integration/gaia-central/rev/587d4d6d4a3d
Author: Sam Foster <sfoster@mozilla.com>
Desc: Bug 1157173 - Rejigger change button styles. r=mhenretty
---
 b2g/config/gaia.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 02c7cac18cd..9117c82c4a7 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,9 +1,9 @@
 {
     "git": {
-        "git_revision": "be4937beae100433e896c2028b58c6389d97b828", 
+        "git_revision": "d62c0bec329216edba8218f0cb5b950f8ba3dd40", 
         "remote": "https://git.mozilla.org/releases/gaia.git", 
         "branch": ""
     }, 
-    "revision": "45c1d03f8a48c4012b27a0c73d8e1b7c3f853c17", 
+    "revision": "fad3ec1819fa2b2beff2c2a394a23276ce9ac184", 
     "repo_path": "integration/gaia-central"
 }

From 9b3132d93aad4b00cb0a320bc33eac096a4b3b83 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Thu, 30 Apr 2015 15:57:18 -0700
Subject: [PATCH 80/88] Bumping manifests a=b2g-bump

---
 b2g/config/dolphin/sources.xml      | 2 +-
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator-l/sources.xml   | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame-kk/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/nexus-5-l/sources.xml    | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml
index dcca9236c94..5750cb728f0 100644
--- a/b2g/config/dolphin/sources.xml
+++ b/b2g/config/dolphin/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="2eda36a4795012a5d1275b77ebb20ac377c8cd26">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="be4937beae100433e896c2028b58c6389d97b828"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="d62c0bec329216edba8218f0cb5b950f8ba3dd40"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index d7c29e24e44..7cb79baae5c 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="be4937beae100433e896c2028b58c6389d97b828"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="d62c0bec329216edba8218f0cb5b950f8ba3dd40"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="9a9797062c6001d6346504161c51187a2968466b"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 89cbb2683f1..7665c1ca314 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="be4937beae100433e896c2028b58c6389d97b828"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="d62c0bec329216edba8218f0cb5b950f8ba3dd40"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="adb24954bf8068f21705b570450475d183336b2d"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="0627790166dccd8dd370fa7d9f434ed9fc027fb4"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index 379a5ba16b6..cb423d2497f 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="2eda36a4795012a5d1275b77ebb20ac377c8cd26">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="be4937beae100433e896c2028b58c6389d97b828"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="d62c0bec329216edba8218f0cb5b950f8ba3dd40"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml
index 4c67eb9fcde..eae274a12d6 100644
--- a/b2g/config/emulator-l/sources.xml
+++ b/b2g/config/emulator-l/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="61e82f99bb8bc78d52b5717e9a2481ec7267fa33">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="be4937beae100433e896c2028b58c6389d97b828"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="d62c0bec329216edba8218f0cb5b950f8ba3dd40"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index d7c29e24e44..7cb79baae5c 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="be4937beae100433e896c2028b58c6389d97b828"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="d62c0bec329216edba8218f0cb5b950f8ba3dd40"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="9a9797062c6001d6346504161c51187a2968466b"/>
diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml
index 3633f3d6a7a..2453f2b34b2 100644
--- a/b2g/config/flame-kk/sources.xml
+++ b/b2g/config/flame-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="2eda36a4795012a5d1275b77ebb20ac377c8cd26">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="be4937beae100433e896c2028b58c6389d97b828"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="d62c0bec329216edba8218f0cb5b950f8ba3dd40"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index 8eb3774d1ff..f6b9ce171a0 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="be4937beae100433e896c2028b58c6389d97b828"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="d62c0bec329216edba8218f0cb5b950f8ba3dd40"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="adb24954bf8068f21705b570450475d183336b2d"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="0627790166dccd8dd370fa7d9f434ed9fc027fb4"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index f8d56ef6034..92591b953b6 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="be4937beae100433e896c2028b58c6389d97b828"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="d62c0bec329216edba8218f0cb5b950f8ba3dd40"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="adb24954bf8068f21705b570450475d183336b2d"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="0627790166dccd8dd370fa7d9f434ed9fc027fb4"/>
diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml
index b9f269cfc1d..cc26068415a 100644
--- a/b2g/config/nexus-5-l/sources.xml
+++ b/b2g/config/nexus-5-l/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="61e82f99bb8bc78d52b5717e9a2481ec7267fa33">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="be4937beae100433e896c2028b58c6389d97b828"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="d62c0bec329216edba8218f0cb5b950f8ba3dd40"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>

From 9304918be4f9028e8a8e4d63e54f8d43b845893b Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Thu, 30 Apr 2015 16:45:36 -0700
Subject: [PATCH 81/88] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/0fa4b6da0a19
Author: autolander <bug.autolander@gmail.com>
Desc: Bug 1149070 - merge pull request #29462 from jrburke:bug1149070-text-selection-email-compose to mozilla-b2g:master

========

https://hg.mozilla.org/integration/gaia-central/rev/c6832dfb2d5b
Author: jrburke <jrburke@gmail.com>
Desc: Bug 1149070 - [Text Selection] Right caret disappeared in email select all
---
 b2g/config/gaia.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 9117c82c4a7..d797f47c6c9 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,9 +1,9 @@
 {
     "git": {
-        "git_revision": "d62c0bec329216edba8218f0cb5b950f8ba3dd40", 
+        "git_revision": "abb3a635dbfe9162c9923d0318d59f06abfda25f", 
         "remote": "https://git.mozilla.org/releases/gaia.git", 
         "branch": ""
     }, 
-    "revision": "fad3ec1819fa2b2beff2c2a394a23276ce9ac184", 
+    "revision": "0fa4b6da0a1908439ebe9b74ac67e851234d72fe", 
     "repo_path": "integration/gaia-central"
 }

From 5480e4de6cf85f587d208eb95c6efd71aaacdcff Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Thu, 30 Apr 2015 16:47:51 -0700
Subject: [PATCH 82/88] Bumping manifests a=b2g-bump

---
 b2g/config/dolphin/sources.xml      | 2 +-
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator-l/sources.xml   | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame-kk/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/nexus-5-l/sources.xml    | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml
index 5750cb728f0..ffbab6f88b6 100644
--- a/b2g/config/dolphin/sources.xml
+++ b/b2g/config/dolphin/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="2eda36a4795012a5d1275b77ebb20ac377c8cd26">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="d62c0bec329216edba8218f0cb5b950f8ba3dd40"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="abb3a635dbfe9162c9923d0318d59f06abfda25f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index 7cb79baae5c..43c5b22a2b6 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="d62c0bec329216edba8218f0cb5b950f8ba3dd40"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="abb3a635dbfe9162c9923d0318d59f06abfda25f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="9a9797062c6001d6346504161c51187a2968466b"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 7665c1ca314..7e7b6d37bdc 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="d62c0bec329216edba8218f0cb5b950f8ba3dd40"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="abb3a635dbfe9162c9923d0318d59f06abfda25f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="adb24954bf8068f21705b570450475d183336b2d"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="0627790166dccd8dd370fa7d9f434ed9fc027fb4"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index cb423d2497f..295d6a4511d 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="2eda36a4795012a5d1275b77ebb20ac377c8cd26">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="d62c0bec329216edba8218f0cb5b950f8ba3dd40"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="abb3a635dbfe9162c9923d0318d59f06abfda25f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml
index eae274a12d6..d8af0ff2151 100644
--- a/b2g/config/emulator-l/sources.xml
+++ b/b2g/config/emulator-l/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="61e82f99bb8bc78d52b5717e9a2481ec7267fa33">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="d62c0bec329216edba8218f0cb5b950f8ba3dd40"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="abb3a635dbfe9162c9923d0318d59f06abfda25f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 7cb79baae5c..43c5b22a2b6 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="d62c0bec329216edba8218f0cb5b950f8ba3dd40"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="abb3a635dbfe9162c9923d0318d59f06abfda25f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="9a9797062c6001d6346504161c51187a2968466b"/>
diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml
index 2453f2b34b2..cfec804752b 100644
--- a/b2g/config/flame-kk/sources.xml
+++ b/b2g/config/flame-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="2eda36a4795012a5d1275b77ebb20ac377c8cd26">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="d62c0bec329216edba8218f0cb5b950f8ba3dd40"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="abb3a635dbfe9162c9923d0318d59f06abfda25f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index f6b9ce171a0..eeca31485c4 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="d62c0bec329216edba8218f0cb5b950f8ba3dd40"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="abb3a635dbfe9162c9923d0318d59f06abfda25f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="adb24954bf8068f21705b570450475d183336b2d"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="0627790166dccd8dd370fa7d9f434ed9fc027fb4"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index 92591b953b6..b3ea55c9642 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="d62c0bec329216edba8218f0cb5b950f8ba3dd40"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="abb3a635dbfe9162c9923d0318d59f06abfda25f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="adb24954bf8068f21705b570450475d183336b2d"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="0627790166dccd8dd370fa7d9f434ed9fc027fb4"/>
diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml
index cc26068415a..3851c1d5451 100644
--- a/b2g/config/nexus-5-l/sources.xml
+++ b/b2g/config/nexus-5-l/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="61e82f99bb8bc78d52b5717e9a2481ec7267fa33">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="d62c0bec329216edba8218f0cb5b950f8ba3dd40"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="abb3a635dbfe9162c9923d0318d59f06abfda25f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>

From 46aa7ad31235bba03faf052669420fcbb650dad4 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Thu, 30 Apr 2015 18:40:23 -0700
Subject: [PATCH 83/88] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/513f75827c68
Author: autolander <bug.autolander@gmail.com>
Desc: Bug 1159982 - merge pull request #29822 from jrburke:bug1159982-email-addr-scroll-dir to mozilla-b2g:master

========

https://hg.mozilla.org/integration/gaia-central/rev/7abcdc49ade6
Author: jrburke <jrburke@gmail.com>
Desc: Bug 1159982 - [RTL][Email] Long email address is not correctly displayed on email address dialog
---
 b2g/config/gaia.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index d797f47c6c9..d392ec0b6e8 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,9 +1,9 @@
 {
     "git": {
-        "git_revision": "abb3a635dbfe9162c9923d0318d59f06abfda25f", 
+        "git_revision": "dbf80638edc82c254f52db3446a7ace1e9303260", 
         "remote": "https://git.mozilla.org/releases/gaia.git", 
         "branch": ""
     }, 
-    "revision": "0fa4b6da0a1908439ebe9b74ac67e851234d72fe", 
+    "revision": "513f75827c68814b92524bd4d20361eaf4d09e59", 
     "repo_path": "integration/gaia-central"
 }

From f617eabb0a2e323012b9bf8a8742f564292a0139 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Thu, 30 Apr 2015 18:43:08 -0700
Subject: [PATCH 84/88] Bumping manifests a=b2g-bump

---
 b2g/config/dolphin/sources.xml      | 2 +-
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator-l/sources.xml   | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame-kk/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/nexus-5-l/sources.xml    | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml
index ffbab6f88b6..70393fe7b08 100644
--- a/b2g/config/dolphin/sources.xml
+++ b/b2g/config/dolphin/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="2eda36a4795012a5d1275b77ebb20ac377c8cd26">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="abb3a635dbfe9162c9923d0318d59f06abfda25f"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="dbf80638edc82c254f52db3446a7ace1e9303260"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index 43c5b22a2b6..1537a78e4fc 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="abb3a635dbfe9162c9923d0318d59f06abfda25f"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="dbf80638edc82c254f52db3446a7ace1e9303260"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="9a9797062c6001d6346504161c51187a2968466b"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 7e7b6d37bdc..8e11667d06b 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="abb3a635dbfe9162c9923d0318d59f06abfda25f"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="dbf80638edc82c254f52db3446a7ace1e9303260"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="adb24954bf8068f21705b570450475d183336b2d"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="0627790166dccd8dd370fa7d9f434ed9fc027fb4"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index 295d6a4511d..6baa2f9383f 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="2eda36a4795012a5d1275b77ebb20ac377c8cd26">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="abb3a635dbfe9162c9923d0318d59f06abfda25f"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="dbf80638edc82c254f52db3446a7ace1e9303260"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml
index d8af0ff2151..f75112a793b 100644
--- a/b2g/config/emulator-l/sources.xml
+++ b/b2g/config/emulator-l/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="61e82f99bb8bc78d52b5717e9a2481ec7267fa33">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="abb3a635dbfe9162c9923d0318d59f06abfda25f"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="dbf80638edc82c254f52db3446a7ace1e9303260"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 43c5b22a2b6..1537a78e4fc 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="abb3a635dbfe9162c9923d0318d59f06abfda25f"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="dbf80638edc82c254f52db3446a7ace1e9303260"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="9a9797062c6001d6346504161c51187a2968466b"/>
diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml
index cfec804752b..1a59a2b2e88 100644
--- a/b2g/config/flame-kk/sources.xml
+++ b/b2g/config/flame-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="2eda36a4795012a5d1275b77ebb20ac377c8cd26">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="abb3a635dbfe9162c9923d0318d59f06abfda25f"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="dbf80638edc82c254f52db3446a7ace1e9303260"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index eeca31485c4..dd430579fb8 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="abb3a635dbfe9162c9923d0318d59f06abfda25f"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="dbf80638edc82c254f52db3446a7ace1e9303260"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="adb24954bf8068f21705b570450475d183336b2d"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="0627790166dccd8dd370fa7d9f434ed9fc027fb4"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index b3ea55c9642..b3137327779 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="abb3a635dbfe9162c9923d0318d59f06abfda25f"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="dbf80638edc82c254f52db3446a7ace1e9303260"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="adb24954bf8068f21705b570450475d183336b2d"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="0627790166dccd8dd370fa7d9f434ed9fc027fb4"/>
diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml
index 3851c1d5451..d74df04907c 100644
--- a/b2g/config/nexus-5-l/sources.xml
+++ b/b2g/config/nexus-5-l/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="61e82f99bb8bc78d52b5717e9a2481ec7267fa33">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="abb3a635dbfe9162c9923d0318d59f06abfda25f"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="dbf80638edc82c254f52db3446a7ace1e9303260"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>

From 84bbd186d94b94961009a1c9bec8f85f980706c0 Mon Sep 17 00:00:00 2001
From: Marco Bonardo <mbonardo@mozilla.com>
Date: Fri, 1 May 2015 10:42:48 +0200
Subject: [PATCH 85/88] Bug 1160450 - Places Maintenance never runs. r=ttaubert

---
 toolkit/components/places/PlacesDBUtils.jsm               | 8 ++++++--
 .../places/tests/unit/test_preventive_maintenance.js      | 7 +++++--
 toolkit/components/places/tests/unit/test_telemetry.js    | 2 ++
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/toolkit/components/places/PlacesDBUtils.jsm b/toolkit/components/places/PlacesDBUtils.jsm
index b8f4e1affc1..d759f226460 100644
--- a/toolkit/components/places/PlacesDBUtils.jsm
+++ b/toolkit/components/places/PlacesDBUtils.jsm
@@ -67,7 +67,6 @@ this.PlacesDBUtils = {
       }
 
       // Notify observers that maintenance finished.
-      Services.prefs.setIntPref("places.database.lastMaintenance", parseInt(Date.now() / 1000));
       Services.obs.notifyObservers(null, FINISHED_MAINTENANCE_TOPIC, null);
     }
   },
@@ -94,7 +93,12 @@ this.PlacesDBUtils = {
     , this._refreshUI
     ]);
     tasks._telemetryStart = Date.now();
-    tasks.callback = aCallback;
+    tasks.callback = function() {
+      Services.prefs.setIntPref("places.database.lastMaintenance",
+                                parseInt(Date.now() / 1000));
+      if (aCallback)
+        aCallback();
+    }
     tasks.scope = aScope;
     this._executeTasks(tasks);
   },
diff --git a/toolkit/components/places/tests/unit/test_preventive_maintenance.js b/toolkit/components/places/tests/unit/test_preventive_maintenance.js
index 1f4a616432f..bc87e6bad98 100644
--- a/toolkit/components/places/tests/unit/test_preventive_maintenance.js
+++ b/toolkit/components/places/tests/unit/test_preventive_maintenance.js
@@ -1279,14 +1279,17 @@ add_task(function test_preventive_maintenance()
   stmt.finalize();
   do_check_true(defaultBookmarksMaxId > 0);
 
-  for ([, test] in Iterator(tests)) {
+  for (let [, test] in Iterator(tests)) {
     dump("\nExecuting test: " + test.name + "\n" + "*** " + test.desc + "\n");
     yield test.setup();
 
     let promiseMaintenanceFinished =
         promiseTopicObserved(FINISHED_MAINTENANCE_NOTIFICATION_TOPIC);
-    PlacesDBUtils.maintenanceOnIdle();
+    Services.prefs.clearUserPref("places.database.lastMaintenance");
+    let callbackInvoked = false;
+    PlacesDBUtils.maintenanceOnIdle(() => callbackInvoked = true);
     yield promiseMaintenanceFinished;
+    do_check_true(callbackInvoked);
 
     // Check the lastMaintenance time has been saved.
     do_check_neq(Services.prefs.getIntPref("places.database.lastMaintenance"), null);
diff --git a/toolkit/components/places/tests/unit/test_telemetry.js b/toolkit/components/places/tests/unit/test_telemetry.js
index 7c6ddae2e7b..2853c9e47ff 100644
--- a/toolkit/components/places/tests/unit/test_telemetry.js
+++ b/toolkit/components/places/tests/unit/test_telemetry.js
@@ -126,6 +126,7 @@ add_task(function test_execute()
 });
 
 add_test(function test_healthreport_callback() {
+  Services.prefs.clearUserPref("places.database.lastMaintenance");
   PlacesDBUtils.telemetry(null, function onResult(data) {
     do_check_neq(data, null);
 
@@ -133,6 +134,7 @@ add_test(function test_healthreport_callback() {
     do_check_eq(data.PLACES_PAGES_COUNT, 1);
     do_check_eq(data.PLACES_BOOKMARKS_COUNT, 1);
 
+    do_check_true(!Services.prefs.prefHasUserValue("places.database.lastMaintenance"));
     run_next_test();
   });
 });

From dae9f1d2c7661df1dcd2e0835a33a92cf00e0c04 Mon Sep 17 00:00:00 2001
From: Mark Banner <standard8@mozilla.com>
Date: Fri, 1 May 2015 10:42:46 +0100
Subject: [PATCH 86/88] Bug 1160145 - Fix eslint warnings in Loop's xpcshell
 and mochitest files and turn on linting for them. r=dmose

---
 browser/components/loop/.eslintignore         |   3 -
 browser/components/loop/README.txt            |   2 +-
 .../components/loop/test/mochitest/.eslintrc  |  17 +
 .../test/mochitest/browser_CardDavImporter.js |   2 +
 .../test/mochitest/browser_GoogleImporter.js  |   2 +
 .../test/mochitest/browser_LoopContacts.js    |   9 +-
 .../browser_mozLoop_appVersionInfo.js         |   2 +
 .../mochitest/browser_mozLoop_doNotDisturb.js |   2 +
 .../browser_mozLoop_pluralStrings.js          |  44 +-
 .../test/mochitest/browser_mozLoop_prefs.js   |   2 +
 .../mochitest/browser_mozLoop_socialShare.js  |   2 +
 .../mochitest/browser_mozLoop_telemetry.js    |   3 +
 .../components/loop/test/mochitest/head.js    |   8 +-
 .../components/loop/test/xpcshell/.eslintrc   |  17 +
 browser/components/loop/test/xpcshell/head.js |   2 +
 .../test/xpcshell/test_looppush_initialize.js | 405 +++++++++---------
 .../loop/test/xpcshell/test_looprooms.js      |   2 +
 .../test/xpcshell/test_loopservice_busy.js    |   2 +
 .../xpcshell/test_loopservice_directcall.js   |   2 +
 .../test/xpcshell/test_loopservice_dnd.js     |   4 +-
 .../test_loopservice_encryptionkey.js         |   2 +
 .../xpcshell/test_loopservice_initialize.js   |   4 +-
 .../test/xpcshell/test_loopservice_locales.js |   2 +
 .../xpcshell/test_loopservice_loop_prefs.js   |   2 +
 .../xpcshell/test_loopservice_notification.js |   4 +-
 .../xpcshell/test_loopservice_registration.js |   2 +
 .../test_loopservice_registration_retry.js    |   2 +
 .../test/xpcshell/test_loopservice_restart.js |  10 +-
 .../test_loopservice_token_invalid.js         |   2 +
 .../xpcshell/test_loopservice_token_save.js   |   2 +
 .../xpcshell/test_loopservice_token_send.js   |   2 +
 .../test_loopservice_token_validation.js      |   2 +
 32 files changed, 330 insertions(+), 238 deletions(-)
 create mode 100644 browser/components/loop/test/mochitest/.eslintrc
 create mode 100644 browser/components/loop/test/xpcshell/.eslintrc

diff --git a/browser/components/loop/.eslintignore b/browser/components/loop/.eslintignore
index c3a825f5e59..8ac40f1ae3a 100644
--- a/browser/components/loop/.eslintignore
+++ b/browser/components/loop/.eslintignore
@@ -9,9 +9,6 @@ content/libs
 content/shared/libs
 standalone/content/libs
 standalone/node_modules
-# We should look at turning these on when we fix the warnings
-test/xpcshell
-test/mochitest
 # Libs we don't need to check
 test/shared/vendor
 
diff --git a/browser/components/loop/README.txt b/browser/components/loop/README.txt
index 3bb638bad1a..45e14894087 100644
--- a/browser/components/loop/README.txt
+++ b/browser/components/loop/README.txt
@@ -54,7 +54,7 @@ If you install eslint and the react plugin globally:
 
 You can also run it by hand in the browser/components/loop directory:
 
-  eslint -ext .js -ext .jsx --ext .jsm .
+  eslint --ext .js --ext .jsx --ext .jsm .
 
 Front-End Unit Tests
 ====================
diff --git a/browser/components/loop/test/mochitest/.eslintrc b/browser/components/loop/test/mochitest/.eslintrc
new file mode 100644
index 00000000000..bd58bc5876d
--- /dev/null
+++ b/browser/components/loop/test/mochitest/.eslintrc
@@ -0,0 +1,17 @@
+{
+  "ecmaFeatures": {
+    "arrowFunctions": true,
+    "blockBindings": true,
+    "destructuring": true,
+    "generators": true,
+    "restParams": true,
+    "spread": true,
+    "objectLiteralShorthandMethods": true,
+  },
+  "rules": {
+    "generator-star-spacing": [2, "after"],
+    // We should fix the errors and enable this (set to 2)
+    "no-var": 0,
+    "strict": [2, "global"]
+  }
+}
diff --git a/browser/components/loop/test/mochitest/browser_CardDavImporter.js b/browser/components/loop/test/mochitest/browser_CardDavImporter.js
index e92962fdfd4..c614d45e7e9 100644
--- a/browser/components/loop/test/mochitest/browser_CardDavImporter.js
+++ b/browser/components/loop/test/mochitest/browser_CardDavImporter.js
@@ -1,6 +1,8 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
+"use strict";
+
 const {CardDavImporter} = Cu.import("resource:///modules/loop/CardDavImporter.jsm", {});
 
 const kAuth = {
diff --git a/browser/components/loop/test/mochitest/browser_GoogleImporter.js b/browser/components/loop/test/mochitest/browser_GoogleImporter.js
index 0acbd0a81c3..d344bdcc43e 100644
--- a/browser/components/loop/test/mochitest/browser_GoogleImporter.js
+++ b/browser/components/loop/test/mochitest/browser_GoogleImporter.js
@@ -1,6 +1,8 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
+"use strict";
+
 const {GoogleImporter} = Cu.import("resource:///modules/loop/GoogleImporter.jsm", {});
 
 let importer = new GoogleImporter();
diff --git a/browser/components/loop/test/mochitest/browser_LoopContacts.js b/browser/components/loop/test/mochitest/browser_LoopContacts.js
index 0f5dcec8273..10196a9430b 100644
--- a/browser/components/loop/test/mochitest/browser_LoopContacts.js
+++ b/browser/components/loop/test/mochitest/browser_LoopContacts.js
@@ -1,6 +1,8 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
+"use strict";
+
 const {LoopContacts} = Cu.import("resource:///modules/loop/LoopContacts.jsm", {});
 const {LoopStorage} = Cu.import("resource:///modules/loop/LoopStorage.jsm", {});
 
@@ -221,8 +223,13 @@ add_task(function* () {
       Assert.ok(!err, "There shouldn't be an error");
       Assert.equal(result.length, toRetrieve.length, "Result list should be the same " +
                    "size as the list of items to retrieve");
+
+      function resultFilter(c) {
+        return c._guid == this._guid;
+      }
+
       for (let contact of toRetrieve) {
-        let found = result.filter(c => c._guid == contact._guid);
+        let found = result.filter(resultFilter.bind(contact));
         Assert.ok(found.length, "Contact " + contact._guid + " should be in the list");
         compareContacts(found[0], contact);
       }
diff --git a/browser/components/loop/test/mochitest/browser_mozLoop_appVersionInfo.js b/browser/components/loop/test/mochitest/browser_mozLoop_appVersionInfo.js
index caa9b7879d1..848cacf4682 100644
--- a/browser/components/loop/test/mochitest/browser_mozLoop_appVersionInfo.js
+++ b/browser/components/loop/test/mochitest/browser_mozLoop_appVersionInfo.js
@@ -6,6 +6,8 @@
  * effects - rather than just testing MozLoopAPI alone.
  */
 
+"use strict";
+
 Components.utils.import("resource://gre/modules/Promise.jsm", this);
 
 add_task(loadLoopPanel);
diff --git a/browser/components/loop/test/mochitest/browser_mozLoop_doNotDisturb.js b/browser/components/loop/test/mochitest/browser_mozLoop_doNotDisturb.js
index a167cc2ebb7..fd7428ff634 100644
--- a/browser/components/loop/test/mochitest/browser_mozLoop_doNotDisturb.js
+++ b/browser/components/loop/test/mochitest/browser_mozLoop_doNotDisturb.js
@@ -6,6 +6,8 @@
  * effects - rather than just testing MozLoopAPI alone.
  */
 
+"use strict";
+
 Components.utils.import("resource://gre/modules/Promise.jsm", this);
 
 add_task(loadLoopPanel);
diff --git a/browser/components/loop/test/mochitest/browser_mozLoop_pluralStrings.js b/browser/components/loop/test/mochitest/browser_mozLoop_pluralStrings.js
index 31aa6182062..87b76cb6973 100644
--- a/browser/components/loop/test/mochitest/browser_mozLoop_pluralStrings.js
+++ b/browser/components/loop/test/mochitest/browser_mozLoop_pluralStrings.js
@@ -1,21 +1,23 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-/**
- * This is an integration test from navigator.mozLoop through to the end
- * effects - rather than just testing MozLoopAPI alone.
- */
-
-Components.utils.import("resource://gre/modules/Promise.jsm", this);
-
-add_task(loadLoopPanel);
-
-add_task(function* test_mozLoop_pluralStrings() {
-  Assert.ok(gMozLoopAPI, "mozLoop should exist");
-
-  var strings = JSON.parse(gMozLoopAPI.getStrings("feedback_window_will_close_in2"));
-  Assert.equal(gMozLoopAPI.getPluralForm(0, strings.textContent),
-               "This window will close in {{countdown}} seconds");
-  Assert.equal(gMozLoopAPI.getPluralForm(1, strings.textContent),
-               "This window will close in {{countdown}} second");
-});
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/**
+ * This is an integration test from navigator.mozLoop through to the end
+ * effects - rather than just testing MozLoopAPI alone.
+ */
+
+"use strict";
+
+Components.utils.import("resource://gre/modules/Promise.jsm", this);
+
+add_task(loadLoopPanel);
+
+add_task(function* test_mozLoop_pluralStrings() {
+  Assert.ok(gMozLoopAPI, "mozLoop should exist");
+
+  var strings = JSON.parse(gMozLoopAPI.getStrings("feedback_window_will_close_in2"));
+  Assert.equal(gMozLoopAPI.getPluralForm(0, strings.textContent),
+               "This window will close in {{countdown}} seconds");
+  Assert.equal(gMozLoopAPI.getPluralForm(1, strings.textContent),
+               "This window will close in {{countdown}} second");
+});
diff --git a/browser/components/loop/test/mochitest/browser_mozLoop_prefs.js b/browser/components/loop/test/mochitest/browser_mozLoop_prefs.js
index c3c3d52c24f..e5b690dc7df 100644
--- a/browser/components/loop/test/mochitest/browser_mozLoop_prefs.js
+++ b/browser/components/loop/test/mochitest/browser_mozLoop_prefs.js
@@ -6,6 +6,8 @@
  * effects - rather than just testing MozLoopAPI alone.
  */
 
+"use strict";
+
 Components.utils.import("resource://gre/modules/Promise.jsm", this);
 
 add_task(loadLoopPanel);
diff --git a/browser/components/loop/test/mochitest/browser_mozLoop_socialShare.js b/browser/components/loop/test/mochitest/browser_mozLoop_socialShare.js
index 7f7de1177ce..20c3ef0ddaf 100644
--- a/browser/components/loop/test/mochitest/browser_mozLoop_socialShare.js
+++ b/browser/components/loop/test/mochitest/browser_mozLoop_socialShare.js
@@ -6,6 +6,8 @@
  * effects - rather than just testing MozLoopAPI alone.
  */
 
+"use strict";
+
 Cu.import("resource://gre/modules/Promise.jsm");
 const {SocialService} = Cu.import("resource://gre/modules/SocialService.jsm", {});
 
diff --git a/browser/components/loop/test/mochitest/browser_mozLoop_telemetry.js b/browser/components/loop/test/mochitest/browser_mozLoop_telemetry.js
index 46cda6b4369..14493b76172 100644
--- a/browser/components/loop/test/mochitest/browser_mozLoop_telemetry.js
+++ b/browser/components/loop/test/mochitest/browser_mozLoop_telemetry.js
@@ -4,6 +4,9 @@
 /*
  * This file contains tests for the mozLoop telemetry API.
  */
+
+"use strict";
+
 Components.utils.import("resource://gre/modules/Promise.jsm", this);
 
 add_task(loadLoopPanel);
diff --git a/browser/components/loop/test/mochitest/head.js b/browser/components/loop/test/mochitest/head.js
index e13029c3b37..7364c61d0cd 100644
--- a/browser/components/loop/test/mochitest/head.js
+++ b/browser/components/loop/test/mochitest/head.js
@@ -1,6 +1,8 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
+"use strict";
+
 const HAWK_TOKEN_LENGTH = 64;
 const {
   LOOP_SESSION_TYPE,
@@ -123,8 +125,8 @@ function loadLoopPanel(aOverrideOptions = {}) {
   let loopPanel = document.getElementById("loop-notification-panel");
   loopPanel.setAttribute("animate", "false");
 
-  // Now get the actual API.
-  yield promiseGetMozLoopAPI();
+  // Now get the actual API loaded into gMozLoopAPI.
+  return promiseGetMozLoopAPI();
 }
 
 function promiseOAuthParamsSetup(baseURL, params) {
@@ -319,7 +321,7 @@ const mockDb = {
     callback(null, details);
   },
   remove: function(guid, callback) {
-    if (!guid in this._store) {
+    if (!(guid in this._store)) {
       callback(new Error("Could not find _guid '" + guid + "' in database"));
       return;
     }
diff --git a/browser/components/loop/test/xpcshell/.eslintrc b/browser/components/loop/test/xpcshell/.eslintrc
new file mode 100644
index 00000000000..bd58bc5876d
--- /dev/null
+++ b/browser/components/loop/test/xpcshell/.eslintrc
@@ -0,0 +1,17 @@
+{
+  "ecmaFeatures": {
+    "arrowFunctions": true,
+    "blockBindings": true,
+    "destructuring": true,
+    "generators": true,
+    "restParams": true,
+    "spread": true,
+    "objectLiteralShorthandMethods": true,
+  },
+  "rules": {
+    "generator-star-spacing": [2, "after"],
+    // We should fix the errors and enable this (set to 2)
+    "no-var": 0,
+    "strict": [2, "global"]
+  }
+}
diff --git a/browser/components/loop/test/xpcshell/head.js b/browser/components/loop/test/xpcshell/head.js
index 59e90bb29b3..57c55f0777c 100644
--- a/browser/components/loop/test/xpcshell/head.js
+++ b/browser/components/loop/test/xpcshell/head.js
@@ -1,6 +1,8 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
+"use strict";
+
 const {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components;
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
diff --git a/browser/components/loop/test/xpcshell/test_looppush_initialize.js b/browser/components/loop/test/xpcshell/test_looppush_initialize.js
index 065f4092135..63fd5a80cc7 100644
--- a/browser/components/loop/test/xpcshell/test_looppush_initialize.js
+++ b/browser/components/loop/test/xpcshell/test_looppush_initialize.js
@@ -1,222 +1,223 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
-{
-  let dummyCallback = () => {};
-  let mockWebSocket = new MockWebSocketChannel();
-  let pushServerRequestCount = 0;
 
-  add_test(function test_initalize_offline() {
-    Services.io.offline = true;
-    do_check_false(MozLoopPushHandler.initialize());
-    Services.io.offline = false;
-    run_next_test();
-  });
+"use strict";
 
-  add_test(function test_initalize_missing_chanid() {
-    Assert.throws(() => MozLoopPushHandler.register(null, dummyCallback, dummyCallback));
-    run_next_test();
-  });
+let dummyCallback = () => {};
+let mockWebSocket = new MockWebSocketChannel();
+let pushServerRequestCount = 0;
 
-  add_test(function test_initalize_missing_regcallback() {
-    Assert.throws(() => MozLoopPushHandler.register("chan-1", null, dummyCallback));
-    run_next_test();
-  });
+add_test(function test_initalize_offline() {
+  Services.io.offline = true;
+  do_check_false(MozLoopPushHandler.initialize());
+  Services.io.offline = false;
+  run_next_test();
+});
 
-  add_test(function test_initalize_missing_notifycallback() {
-    Assert.throws(() => MozLoopPushHandler.register("chan-1", dummyCallback, null));
-    run_next_test();
-  });
+add_test(function test_initalize_missing_chanid() {
+  Assert.throws(() => MozLoopPushHandler.register(null, dummyCallback, dummyCallback));
+  run_next_test();
+});
 
-  add_test(function test_initalize_websocket() {
-    do_check_true(MozLoopPushHandler.initialize({mockWebSocket: mockWebSocket}));
-    MozLoopPushHandler.register(
-      "chan-1",
-      function(err, url, id) {
-        Assert.equal(err, null, "err should be null to indicate success");
-        Assert.equal(url, kEndPointUrl, "Should return push server application URL");
-        Assert.equal(id, "chan-1", "Should have channel id = chan-1");
-        Assert.equal(mockWebSocket.uri.prePath, kServerPushUrl,
-                     "Should have the url from preferences");
-        Assert.equal(mockWebSocket.origin, kServerPushUrl,
-                     "Should have the origin url from preferences");
-        Assert.equal(mockWebSocket.protocol, "push-notification",
-                     "Should have the protocol set to push-notifications");
-        mockWebSocket.notify(15);
-      },
-      function(version, id) {
-        Assert.equal(version, 15, "Should have version number 15");
-        Assert.equal(id, "chan-1", "Should have channel id = chan-1");
-        run_next_test();
-      });
-  });
+add_test(function test_initalize_missing_regcallback() {
+  Assert.throws(() => MozLoopPushHandler.register("chan-1", null, dummyCallback));
+  run_next_test();
+});
 
-  add_test(function test_register_twice_same_channel() {
-    MozLoopPushHandler.register(
-      "chan-2",
-      function(err, url, id) {
-        Assert.equal(err, null, "Should return null for success");
-        Assert.equal(url, kEndPointUrl, "Should return push server application URL");
-        Assert.equal(id, "chan-2", "Should have channel id = chan-2");
-        Assert.equal(mockWebSocket.uri.prePath, kServerPushUrl,
-                     "Should have the url from preferences");
-        Assert.equal(mockWebSocket.origin, kServerPushUrl,
-                     "Should have the origin url from preferences");
-        Assert.equal(mockWebSocket.protocol, "push-notification",
-                     "Should have the protocol set to push-notifications");
+add_test(function test_initalize_missing_notifycallback() {
+  Assert.throws(() => MozLoopPushHandler.register("chan-1", dummyCallback, null));
+  run_next_test();
+});
 
-        // Register again for the same channel
-        MozLoopPushHandler.register(
-          "chan-2",
-          function(err, url, id) {
-            Assert.equal(err, null, "Should return null for success");
-            Assert.equal(id, "chan-2", "Should have channel id = chan-2");
-            run_next_test();
-          },
-          dummyCallback
-        );
-      },
-      dummyCallback
-    );
-  });
-
-  // Test that the PushHander will re-connect after the near-end disconnect.
-  // The uaID is cleared to force re-registration of all notification channels.
-  add_test(function test_reconnect_websocket() {
-    MozLoopPushHandler.uaID = undefined;
-    mockWebSocket.stop();
-    // Previously registered onRegistration callbacks will fire and be checked (see above).
-  });
-
-  // Test that the PushHander will re-connect after the far-end disconnect.
-  // The uaID is cleared to force re-regsitration of all notification channels.
-  add_test(function test_reopen_websocket() {
-    MozLoopPushHandler.uaID = undefined;
-    MozLoopPushHandler.registeredChannels = {}; //Do this to force a new registration callback.
-    mockWebSocket.serverClose();
-    // Previously registered onRegistration callbacks will fire and be checked (see above).
-  });
-
-  // Force a re-registration cycle and have the PushServer return a 500.
-  // A retry should occur and the registration then complete.
-  add_test(function test_retry_registration() {
-    MozLoopPushHandler.uaID = undefined;
-    mockWebSocket.initRegStatus = 500;
-    mockWebSocket.stop();
-  });
-
-  add_test(function test_reconnect_no_registration() {
-    let regCnt = 0;
-    MozLoopPushHandler.shutdown();
-    MozLoopPushHandler.initialize({mockWebSocket: mockWebSocket});
-    MozLoopPushHandler.register(
-      "test-chan",
-      function(err, url, id) {
-        Assert.equal(++regCnt, 1, "onRegistered should only be called once");
-        Assert.equal(err, null, "err should be null to indicate success");
-        Assert.equal(url, kEndPointUrl, "Should return push server application URL");
-        Assert.equal(id, "test-chan", "Should have channel id = test-chan");
-        mockWebSocket.stop();
-        setTimeout(run_next_test(), 0);
-      },
-      dummyCallback
-    );
-  });
-
-  add_test(function test_ping_websocket() {
-    let pingReceived = false,
-        socketClosed = false;
-    mockWebSocket.defaultMsgHandler = (msg) => {
-      pingReceived = true;
-      // Do not send a ping response.
-    }
-    mockWebSocket.close = () => {
-      socketClosed = true;
-    }
-
-    MozLoopPushHandler.shutdown();
-    MozLoopPushHandler.initialize({mockWebSocket: mockWebSocket});
-    MozLoopPushHandler.register(
-      "test-chan",
-      function(err, url) {
-        Assert.equal(err, null, "err should be null to indicate success");
-        waitForCondition(() => pingReceived).then(() => {
-          waitForCondition(() => socketClosed).then(() => {
-            run_next_test();
-          }, () => {
-            do_throw("should have closed the websocket");
-          });
-        }, () => {
-          do_throw("should have sent ping");
-        });
-      },
-      dummyCallback
-    );
-  });
-
-  add_test(function test_retry_pushurl() {
-    MozLoopPushHandler.shutdown();
-    loopServer.registerPathHandler("/push-server-config", (request, response) => {
-      // The PushHandler should retry the request for the push-server-config for
-      // each of these cases without throwing an error.
-      let n = 0;
-      switch (++pushServerRequestCount) {
-      case ++n:
-        // Non-200 response
-        response.setStatusLine(null, 500, "Retry");
-        response.processAsync();
-        response.finish();
-        break;
-      case ++n:
-        // missing parameter
-        response.setStatusLine(null, 200, "OK");
-        response.write(JSON.stringify({pushServerURI: null}));
-        response.processAsync();
-        response.finish();
-        break;
-      case ++n:
-        // json parse error
-        response.setStatusLine(null, 200, "OK");
-        response.processAsync();
-        response.finish();
-        break;
-      case ++n:
-        response.setStatusLine(null, 200, "OK");
-        response.write(JSON.stringify({pushServerURI: kServerPushUrl}));
-        response.processAsync();
-        response.finish();
-
-        run_next_test();
-        break;
-      }
+add_test(function test_initalize_websocket() {
+  do_check_true(MozLoopPushHandler.initialize({mockWebSocket: mockWebSocket}));
+  MozLoopPushHandler.register(
+    "chan-1",
+    function(err, url, id) {
+      Assert.equal(err, null, "err should be null to indicate success");
+      Assert.equal(url, kEndPointUrl, "Should return push server application URL");
+      Assert.equal(id, "chan-1", "Should have channel id = chan-1");
+      Assert.equal(mockWebSocket.uri.prePath, kServerPushUrl,
+                   "Should have the url from preferences");
+      Assert.equal(mockWebSocket.origin, kServerPushUrl,
+                   "Should have the origin url from preferences");
+      Assert.equal(mockWebSocket.protocol, "push-notification",
+                   "Should have the protocol set to push-notifications");
+      mockWebSocket.notify(15);
+    },
+    function(version, id) {
+      Assert.equal(version, 15, "Should have version number 15");
+      Assert.equal(id, "chan-1", "Should have channel id = chan-1");
+      run_next_test();
     });
+});
 
-    do_check_true(MozLoopPushHandler.initialize({mockWebSocket: mockWebSocket}));
-  });
+add_test(function test_register_twice_same_channel() {
+  MozLoopPushHandler.register(
+    "chan-2",
+    function(err, url, id) {
+      Assert.equal(err, null, "Should return null for success");
+      Assert.equal(url, kEndPointUrl, "Should return push server application URL");
+      Assert.equal(id, "chan-2", "Should have channel id = chan-2");
+      Assert.equal(mockWebSocket.uri.prePath, kServerPushUrl,
+                   "Should have the url from preferences");
+      Assert.equal(mockWebSocket.origin, kServerPushUrl,
+                   "Should have the origin url from preferences");
+      Assert.equal(mockWebSocket.protocol, "push-notification",
+                   "Should have the protocol set to push-notifications");
 
-  function run_test() {
-    setupFakeLoopServer();
+      // Register again for the same channel
+      MozLoopPushHandler.register(
+        "chan-2",
+        function(err, url, id) {
+          Assert.equal(err, null, "Should return null for success");
+          Assert.equal(id, "chan-2", "Should have channel id = chan-2");
+          run_next_test();
+        },
+        dummyCallback
+      );
+    },
+    dummyCallback
+  );
+});
 
-    loopServer.registerPathHandler("/push-server-config", (request, response) => {
+// Test that the PushHander will re-connect after the near-end disconnect.
+// The uaID is cleared to force re-registration of all notification channels.
+add_test(function test_reconnect_websocket() {
+  MozLoopPushHandler.uaID = undefined;
+  mockWebSocket.stop();
+  // Previously registered onRegistration callbacks will fire and be checked (see above).
+});
+
+// Test that the PushHander will re-connect after the far-end disconnect.
+// The uaID is cleared to force re-regsitration of all notification channels.
+add_test(function test_reopen_websocket() {
+  MozLoopPushHandler.uaID = undefined;
+  MozLoopPushHandler.registeredChannels = {}; //Do this to force a new registration callback.
+  mockWebSocket.serverClose();
+  // Previously registered onRegistration callbacks will fire and be checked (see above).
+});
+
+// Force a re-registration cycle and have the PushServer return a 500.
+// A retry should occur and the registration then complete.
+add_test(function test_retry_registration() {
+  MozLoopPushHandler.uaID = undefined;
+  mockWebSocket.initRegStatus = 500;
+  mockWebSocket.stop();
+});
+
+add_test(function test_reconnect_no_registration() {
+  let regCnt = 0;
+  MozLoopPushHandler.shutdown();
+  MozLoopPushHandler.initialize({mockWebSocket: mockWebSocket});
+  MozLoopPushHandler.register(
+    "test-chan",
+    function(err, url, id) {
+      Assert.equal(++regCnt, 1, "onRegistered should only be called once");
+      Assert.equal(err, null, "err should be null to indicate success");
+      Assert.equal(url, kEndPointUrl, "Should return push server application URL");
+      Assert.equal(id, "test-chan", "Should have channel id = test-chan");
+      mockWebSocket.stop();
+      setTimeout(run_next_test(), 0);
+    },
+    dummyCallback
+  );
+});
+
+add_test(function test_ping_websocket() {
+  let pingReceived = false,
+      socketClosed = false;
+  mockWebSocket.defaultMsgHandler = (msg) => {
+    pingReceived = true;
+    // Do not send a ping response.
+  }
+  mockWebSocket.close = () => {
+    socketClosed = true;
+  }
+
+  MozLoopPushHandler.shutdown();
+  MozLoopPushHandler.initialize({mockWebSocket: mockWebSocket});
+  MozLoopPushHandler.register(
+    "test-chan",
+    function(err, url) {
+      Assert.equal(err, null, "err should be null to indicate success");
+      waitForCondition(() => pingReceived).then(() => {
+        waitForCondition(() => socketClosed).then(() => {
+          run_next_test();
+        }, () => {
+          do_throw("should have closed the websocket");
+        });
+      }, () => {
+        do_throw("should have sent ping");
+      });
+    },
+    dummyCallback
+  );
+});
+
+add_test(function test_retry_pushurl() {
+  MozLoopPushHandler.shutdown();
+  loopServer.registerPathHandler("/push-server-config", (request, response) => {
+    // The PushHandler should retry the request for the push-server-config for
+    // each of these cases without throwing an error.
+    let n = 0;
+    switch (++pushServerRequestCount) {
+    case ++n:
+      // Non-200 response
+      response.setStatusLine(null, 500, "Retry");
+      response.processAsync();
+      response.finish();
+      break;
+    case ++n:
+      // missing parameter
+      response.setStatusLine(null, 200, "OK");
+      response.write(JSON.stringify({pushServerURI: null}));
+      response.processAsync();
+      response.finish();
+      break;
+    case ++n:
+      // json parse error
+      response.setStatusLine(null, 200, "OK");
+      response.processAsync();
+      response.finish();
+      break;
+    case ++n:
       response.setStatusLine(null, 200, "OK");
       response.write(JSON.stringify({pushServerURI: kServerPushUrl}));
       response.processAsync();
       response.finish();
-    });
 
-    Services.prefs.setCharPref("services.push.serverURL", kServerPushUrl);
-    Services.prefs.setIntPref("loop.retry_delay.start", 10); // 10 ms
-    Services.prefs.setIntPref("loop.retry_delay.limit", 20); // 20 ms
-    Services.prefs.setIntPref("loop.ping.interval", 50); // 50 ms
-    Services.prefs.setIntPref("loop.ping.timeout", 20); // 20 ms
+      run_next_test();
+      break;
+    }
+  });
 
-    do_register_cleanup(function() {
-      Services.prefs.clearUserPref("services.push.serverULR");
-      Services.prefs.clearUserPref("loop.retry_delay.start");
-      Services.prefs.clearUserPref("loop.retry_delay.limit");
-      Services.prefs.clearUserPref("loop.ping.interval");
-      Services.prefs.clearUserPref("loop.ping.timeout");
-    });
+  do_check_true(MozLoopPushHandler.initialize({mockWebSocket: mockWebSocket}));
+});
 
-    run_next_test();
-  };
-}
+function run_test() {
+  setupFakeLoopServer();
+
+  loopServer.registerPathHandler("/push-server-config", (request, response) => {
+    response.setStatusLine(null, 200, "OK");
+    response.write(JSON.stringify({pushServerURI: kServerPushUrl}));
+    response.processAsync();
+    response.finish();
+  });
+
+  Services.prefs.setCharPref("services.push.serverURL", kServerPushUrl);
+  Services.prefs.setIntPref("loop.retry_delay.start", 10); // 10 ms
+  Services.prefs.setIntPref("loop.retry_delay.limit", 20); // 20 ms
+  Services.prefs.setIntPref("loop.ping.interval", 50); // 50 ms
+  Services.prefs.setIntPref("loop.ping.timeout", 20); // 20 ms
+
+  do_register_cleanup(function() {
+    Services.prefs.clearUserPref("services.push.serverULR");
+    Services.prefs.clearUserPref("loop.retry_delay.start");
+    Services.prefs.clearUserPref("loop.retry_delay.limit");
+    Services.prefs.clearUserPref("loop.ping.interval");
+    Services.prefs.clearUserPref("loop.ping.timeout");
+  });
+
+  run_next_test();
+};
diff --git a/browser/components/loop/test/xpcshell/test_looprooms.js b/browser/components/loop/test/xpcshell/test_looprooms.js
index 5ab2d6c69a9..8d8fe383a91 100644
--- a/browser/components/loop/test/xpcshell/test_looprooms.js
+++ b/browser/components/loop/test/xpcshell/test_looprooms.js
@@ -2,6 +2,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+"use strict";
+
 Cu.import("resource://services-common/utils.js");
 Cu.import("resource:///modules/loop/LoopRooms.jsm");
 Cu.import("resource:///modules/Chat.jsm");
diff --git a/browser/components/loop/test/xpcshell/test_loopservice_busy.js b/browser/components/loop/test/xpcshell/test_loopservice_busy.js
index 7766081eacf..835b98b2338 100644
--- a/browser/components/loop/test/xpcshell/test_loopservice_busy.js
+++ b/browser/components/loop/test/xpcshell/test_loopservice_busy.js
@@ -2,6 +2,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+"use strict";
+
 const { LoopCallsInternal } = Cu.import("resource:///modules/loop/LoopCalls.jsm", {});
 
 XPCOMUtils.defineLazyModuleGetter(this, "Chat",
diff --git a/browser/components/loop/test/xpcshell/test_loopservice_directcall.js b/browser/components/loop/test/xpcshell/test_loopservice_directcall.js
index e94a2ace591..e2e33cced50 100644
--- a/browser/components/loop/test/xpcshell/test_loopservice_directcall.js
+++ b/browser/components/loop/test/xpcshell/test_loopservice_directcall.js
@@ -2,6 +2,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+"use strict";
+
 XPCOMUtils.defineLazyModuleGetter(this, "Chat",
                                   "resource:///modules/Chat.jsm");
 let openChatOrig = Chat.open;
diff --git a/browser/components/loop/test/xpcshell/test_loopservice_dnd.js b/browser/components/loop/test/xpcshell/test_loopservice_dnd.js
index 93bca0ffc0c..44c79740fb4 100644
--- a/browser/components/loop/test/xpcshell/test_loopservice_dnd.js
+++ b/browser/components/loop/test/xpcshell/test_loopservice_dnd.js
@@ -2,6 +2,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+"use strict";
+
 XPCOMUtils.defineLazyModuleGetter(this, "Chat",
                                   "resource:///modules/Chat.jsm");
 let openChatOrig = Chat.open;
@@ -41,7 +43,7 @@ add_test(function test_do_not_disturb_disabled_should_open_chat_window() {
 
     mockPushHandler.notify(1, MozLoopService.channelIDs.callsFxA);
 
-    waitForCondition(function() opened).then(() => {
+    waitForCondition(() => opened).then(() => {
       run_next_test();
     }, () => {
       do_throw("should have opened a chat window");
diff --git a/browser/components/loop/test/xpcshell/test_loopservice_encryptionkey.js b/browser/components/loop/test/xpcshell/test_loopservice_encryptionkey.js
index 775b3cf4755..20edf68c5b8 100644
--- a/browser/components/loop/test/xpcshell/test_loopservice_encryptionkey.js
+++ b/browser/components/loop/test/xpcshell/test_loopservice_encryptionkey.js
@@ -2,6 +2,8 @@
  http://creativecommons.org/publicdomain/zero/1.0/ */
 /* global Services, Assert */
 
+"use strict";
+
 const kGuestKeyPref = "loop.key";
 const kFxAKeyPref = "loop.key.fxa";
 
diff --git a/browser/components/loop/test/xpcshell/test_loopservice_initialize.js b/browser/components/loop/test/xpcshell/test_loopservice_initialize.js
index e82244af97e..37a6fd5d688 100644
--- a/browser/components/loop/test/xpcshell/test_loopservice_initialize.js
+++ b/browser/components/loop/test/xpcshell/test_loopservice_initialize.js
@@ -1,13 +1,15 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
+"use strict";
+
 let startTimerCalled = false;
 
 /**
  * Tests that registration doesn't happen when the expiry time is
  * not set.
  */
-add_task(function test_initialize_no_expiry() {
+add_task(function* test_initialize_no_expiry() {
   startTimerCalled = false;
 
   let initializedPromise = yield MozLoopService.initialize();
diff --git a/browser/components/loop/test/xpcshell/test_loopservice_locales.js b/browser/components/loop/test/xpcshell/test_loopservice_locales.js
index b23da701904..f3ca1daea67 100644
--- a/browser/components/loop/test/xpcshell/test_loopservice_locales.js
+++ b/browser/components/loop/test/xpcshell/test_loopservice_locales.js
@@ -1,6 +1,8 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
+"use strict";
+
 function test_locale() {
   // Set the pref to something controlled.
   Services.prefs.setCharPref("general.useragent.locale", "ab-CD");
diff --git a/browser/components/loop/test/xpcshell/test_loopservice_loop_prefs.js b/browser/components/loop/test/xpcshell/test_loopservice_loop_prefs.js
index 380739e8e0d..4e71dfd5b7c 100644
--- a/browser/components/loop/test/xpcshell/test_loopservice_loop_prefs.js
+++ b/browser/components/loop/test/xpcshell/test_loopservice_loop_prefs.js
@@ -2,6 +2,8 @@
  http://creativecommons.org/publicdomain/zero/1.0/ */
 /*global XPCOMUtils, Services, Assert */
 
+"use strict";
+
 var fakeCharPrefName = "color";
 var fakeBoolPrefName = "boolean";
 var fakePrefValue = "green";
diff --git a/browser/components/loop/test/xpcshell/test_loopservice_notification.js b/browser/components/loop/test/xpcshell/test_loopservice_notification.js
index 81b9fd6146a..2e64b652247 100644
--- a/browser/components/loop/test/xpcshell/test_loopservice_notification.js
+++ b/browser/components/loop/test/xpcshell/test_loopservice_notification.js
@@ -2,6 +2,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+"use strict";
+
 XPCOMUtils.defineLazyModuleGetter(this, "Chat",
                                   "resource:///modules/Chat.jsm");
 
@@ -20,7 +22,7 @@ add_test(function test_openChatWindow_on_notification() {
 
     mockPushHandler.notify(1, MozLoopService.channelIDs.callsFxA);
 
-    waitForCondition(function() opened).then(() => {
+    waitForCondition(() => opened).then(() => {
       do_check_true(opened, "should open a chat window");
 
       do_check_eq(Services.prefs.getCharPref("loop.seenToS"), "seen",
diff --git a/browser/components/loop/test/xpcshell/test_loopservice_registration.js b/browser/components/loop/test/xpcshell/test_loopservice_registration.js
index ddc68148730..ae3d4b68b73 100644
--- a/browser/components/loop/test/xpcshell/test_loopservice_registration.js
+++ b/browser/components/loop/test/xpcshell/test_loopservice_registration.js
@@ -1,6 +1,8 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
+"use strict";
+
 Cu.import("resource://services-common/utils.js");
 
 /**
diff --git a/browser/components/loop/test/xpcshell/test_loopservice_registration_retry.js b/browser/components/loop/test/xpcshell/test_loopservice_registration_retry.js
index c568428dd3b..fb3a18d8adc 100644
--- a/browser/components/loop/test/xpcshell/test_loopservice_registration_retry.js
+++ b/browser/components/loop/test/xpcshell/test_loopservice_registration_retry.js
@@ -1,6 +1,8 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
+"use strict";
+
 Cu.import("resource://gre/modules/Task.jsm");
 Cu.import("resource://services-common/utils.js");
 
diff --git a/browser/components/loop/test/xpcshell/test_loopservice_restart.js b/browser/components/loop/test/xpcshell/test_loopservice_restart.js
index cc0b16c8d35..b93ed02c8fc 100644
--- a/browser/components/loop/test/xpcshell/test_loopservice_restart.js
+++ b/browser/components/loop/test/xpcshell/test_loopservice_restart.js
@@ -1,6 +1,8 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
+"use strict";
+
 const FAKE_FXA_TOKEN_DATA = JSON.stringify({
   "token_type": "bearer",
   "access_token": "1bad3e44b12f77a88fe09f016f6a37c42e40f974bc7a8b432bb0d2f0e37e1752",
@@ -20,7 +22,7 @@ const LOOP_INITIAL_DELAY_PREF = "loop.initialDelay";
  * This file is to test restart+reauth.
  */
 
-add_task(function test_initialize_with_no_guest_rooms_and_no_auth_token() {
+add_task(function* test_initialize_with_no_guest_rooms_and_no_auth_token() {
   // Set time to be 2 seconds in the past.
   var nowSeconds = Date.now() / 1000;
   Services.prefs.setBoolPref(LOOP_CREATED_ROOM_PREF, false);
@@ -34,7 +36,7 @@ add_task(function test_initialize_with_no_guest_rooms_and_no_auth_token() {
   });
 });
 
-add_task(function test_initialize_with_created_room_and_no_auth_token() {
+add_task(function* test_initialize_with_created_room_and_no_auth_token() {
   Services.prefs.setBoolPref(LOOP_CREATED_ROOM_PREF, true);
   Services.prefs.clearUserPref(LOOP_FXA_TOKEN_PREF);
 
@@ -50,7 +52,7 @@ add_task(function test_initialize_with_created_room_and_no_auth_token() {
   });
 });
 
-add_task(function test_initialize_with_invalid_fxa_token() {
+add_task(function* test_initialize_with_invalid_fxa_token() {
   Services.prefs.setCharPref(LOOP_FXA_PROFILE_PREF, FAKE_FXA_PROFILE);
   Services.prefs.setCharPref(LOOP_FXA_TOKEN_PREF, FAKE_FXA_TOKEN_DATA);
 
@@ -83,7 +85,7 @@ add_task(function test_initialize_with_invalid_fxa_token() {
   });
 });
 
-add_task(function test_initialize_with_fxa_token() {
+add_task(function* test_initialize_with_fxa_token() {
   Services.prefs.setCharPref(LOOP_FXA_PROFILE_PREF, FAKE_FXA_PROFILE);
   Services.prefs.setCharPref(LOOP_FXA_TOKEN_PREF, FAKE_FXA_TOKEN_DATA);
 
diff --git a/browser/components/loop/test/xpcshell/test_loopservice_token_invalid.js b/browser/components/loop/test/xpcshell/test_loopservice_token_invalid.js
index d78fc3b24ae..5346557de37 100644
--- a/browser/components/loop/test/xpcshell/test_loopservice_token_invalid.js
+++ b/browser/components/loop/test/xpcshell/test_loopservice_token_invalid.js
@@ -1,6 +1,8 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
+"use strict";
+
 const LOOP_HAWK_PREF = "loop.hawk-session-token";
 const fakeSessionToken1 = "1bad3e44b12f77a88fe09f016f6a37c42e40f974bc7a8b432bb0d2f0e37e1751";
 const fakeSessionToken2 = "1bad3e44b12f77a88fe09f016f6a37c42e40f974bc7a8b432bb0d2f0e37e1750";
diff --git a/browser/components/loop/test/xpcshell/test_loopservice_token_save.js b/browser/components/loop/test/xpcshell/test_loopservice_token_save.js
index f4ba80c4d4b..7ea74ae04ec 100644
--- a/browser/components/loop/test/xpcshell/test_loopservice_token_save.js
+++ b/browser/components/loop/test/xpcshell/test_loopservice_token_save.js
@@ -1,6 +1,8 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
+"use strict";
+
 /**
  * Test that things behave reasonably when a reasonable Hawk-Session-Token
  * header is returned with the registration response.
diff --git a/browser/components/loop/test/xpcshell/test_loopservice_token_send.js b/browser/components/loop/test/xpcshell/test_loopservice_token_send.js
index 3c7d5497414..b3727064b95 100644
--- a/browser/components/loop/test/xpcshell/test_loopservice_token_send.js
+++ b/browser/components/loop/test/xpcshell/test_loopservice_token_send.js
@@ -1,6 +1,8 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
+"use strict";
+
 add_test(function test_registration_uses_hawk_session_token() {
   Services.prefs.setCharPref("loop.hawk-session-token",
     "1bad3e44b12f77a88fe09f016f6a37c42e40f974bc7a8b432bb0d2f0e37e1750");
diff --git a/browser/components/loop/test/xpcshell/test_loopservice_token_validation.js b/browser/components/loop/test/xpcshell/test_loopservice_token_validation.js
index 59f193e5a44..7374c85ffb7 100644
--- a/browser/components/loop/test/xpcshell/test_loopservice_token_validation.js
+++ b/browser/components/loop/test/xpcshell/test_loopservice_token_validation.js
@@ -1,6 +1,8 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
+"use strict";
+
 // XXX should report error if Hawk-Session-Token is lexically invalid
 // (not a string of 64 hex digits) to help resist other possible injection
 // attacks.  For now, however, we're just checking if it's the right length.

From 2bfa1ea880d1df9dccf76a1992ca5332d3f1bfd6 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 1 May 2015 04:37:34 -0700
Subject: [PATCH 87/88] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/1bbaa54b674c
Author: autolander <bug.autolander@gmail.com>
Desc: Bug 1159674 - merge pull request #29794 from andreastt:bug_1159674 to mozilla-b2g:master

========

https://hg.mozilla.org/integration/gaia-central/rev/932f4ce02cf6
Author: Andreas Tolfsen <ato@mozilla.com>
Desc: Bug 1159674 - Introduce NoSuchWindowException in gaia-ui-tests; r=davehunt
---
 b2g/config/gaia.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index d392ec0b6e8..b4a63d18a5d 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,9 +1,9 @@
 {
     "git": {
-        "git_revision": "dbf80638edc82c254f52db3446a7ace1e9303260", 
+        "git_revision": "8e64346ce8197b50b815a294278797bc144aa3e6", 
         "remote": "https://git.mozilla.org/releases/gaia.git", 
         "branch": ""
     }, 
-    "revision": "513f75827c68814b92524bd4d20361eaf4d09e59", 
+    "revision": "1bbaa54b674c42e0d8b2fe31d8b0080901811fa0", 
     "repo_path": "integration/gaia-central"
 }

From b35da7a91f6a7445d670f9edc29618f9127728a9 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 1 May 2015 04:39:46 -0700
Subject: [PATCH 88/88] Bumping manifests a=b2g-bump

---
 b2g/config/dolphin/sources.xml      | 2 +-
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator-l/sources.xml   | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame-kk/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/nexus-5-l/sources.xml    | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml
index 70393fe7b08..c2d18d13f1e 100644
--- a/b2g/config/dolphin/sources.xml
+++ b/b2g/config/dolphin/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="2eda36a4795012a5d1275b77ebb20ac377c8cd26">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="dbf80638edc82c254f52db3446a7ace1e9303260"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="8e64346ce8197b50b815a294278797bc144aa3e6"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index 1537a78e4fc..c33d63aa97b 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="dbf80638edc82c254f52db3446a7ace1e9303260"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="8e64346ce8197b50b815a294278797bc144aa3e6"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="9a9797062c6001d6346504161c51187a2968466b"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 8e11667d06b..ed72352f583 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="dbf80638edc82c254f52db3446a7ace1e9303260"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="8e64346ce8197b50b815a294278797bc144aa3e6"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="adb24954bf8068f21705b570450475d183336b2d"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="0627790166dccd8dd370fa7d9f434ed9fc027fb4"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index 6baa2f9383f..c53b3622be8 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="2eda36a4795012a5d1275b77ebb20ac377c8cd26">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="dbf80638edc82c254f52db3446a7ace1e9303260"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="8e64346ce8197b50b815a294278797bc144aa3e6"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml
index f75112a793b..c159b77c945 100644
--- a/b2g/config/emulator-l/sources.xml
+++ b/b2g/config/emulator-l/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="61e82f99bb8bc78d52b5717e9a2481ec7267fa33">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="dbf80638edc82c254f52db3446a7ace1e9303260"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="8e64346ce8197b50b815a294278797bc144aa3e6"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 1537a78e4fc..c33d63aa97b 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="dbf80638edc82c254f52db3446a7ace1e9303260"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="8e64346ce8197b50b815a294278797bc144aa3e6"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="9a9797062c6001d6346504161c51187a2968466b"/>
diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml
index 1a59a2b2e88..6a52fe38057 100644
--- a/b2g/config/flame-kk/sources.xml
+++ b/b2g/config/flame-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="2eda36a4795012a5d1275b77ebb20ac377c8cd26">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="dbf80638edc82c254f52db3446a7ace1e9303260"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="8e64346ce8197b50b815a294278797bc144aa3e6"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index dd430579fb8..0ecfbe6caec 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="dbf80638edc82c254f52db3446a7ace1e9303260"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="8e64346ce8197b50b815a294278797bc144aa3e6"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="adb24954bf8068f21705b570450475d183336b2d"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="0627790166dccd8dd370fa7d9f434ed9fc027fb4"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index b3137327779..e5211e66663 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="dbf80638edc82c254f52db3446a7ace1e9303260"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="8e64346ce8197b50b815a294278797bc144aa3e6"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="adb24954bf8068f21705b570450475d183336b2d"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="0627790166dccd8dd370fa7d9f434ed9fc027fb4"/>
diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml
index d74df04907c..ec498f8e427 100644
--- a/b2g/config/nexus-5-l/sources.xml
+++ b/b2g/config/nexus-5-l/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="61e82f99bb8bc78d52b5717e9a2481ec7267fa33">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="dbf80638edc82c254f52db3446a7ace1e9303260"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="8e64346ce8197b50b815a294278797bc144aa3e6"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="d3868ff4bb3a4b81382795e2784258c210fe6cb8"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>