From 0ce68fb65db71c39686b7befdeb0aa88ae513f8b Mon Sep 17 00:00:00 2001
From: Marco Bonardo <mbonardo@mozilla.com>
Date: Wed, 10 Feb 2016 17:16:23 +0100
Subject: [PATCH 01/45] Bug 1243779 - Remove uriIsPrefix option from
 nsINavHistoryQuery.r=adw

MozReview-Commit-ID: CM2Jm6iApct
---
 .../source/lib/sdk/places/host/host-query.js  | 22 +++++-
 addon-sdk/source/lib/sdk/places/utils.js      | 25 ++++--
 .../places/nsINavHistoryService.idl           | 10 +--
 toolkit/components/places/nsNavHistory.cpp    | 46 ++---------
 .../components/places/nsNavHistoryQuery.cpp   | 23 +-----
 toolkit/components/places/nsNavHistoryQuery.h |  2 -
 .../queries/test_abstime-annotation-uri.js    | 76 ++++---------------
 .../tests/queries/test_querySerialization.js  |  7 +-
 .../tests/queries/test_searchterms-uri.js     | 51 ++-----------
 9 files changed, 72 insertions(+), 190 deletions(-)

diff --git a/addon-sdk/source/lib/sdk/places/host/host-query.js b/addon-sdk/source/lib/sdk/places/host/host-query.js
index 7984db95ec2..f2dbd6550cd 100644
--- a/addon-sdk/source/lib/sdk/places/host/host-query.js
+++ b/addon-sdk/source/lib/sdk/places/host/host-query.js
@@ -47,18 +47,32 @@ function execute (queries, options) {
   return new Promise(resolve => {
     let root = historyService
         .executeQueries(queries, queries.length, options).root;
-    resolve(collect([], root));
+    // Let's extract an eventual uri wildcard, if both domain and uri are set.
+    // See utils.js::urlQueryParser() for more details.
+    // In case of multiple queries, we only retain the first found wildcard.
+    let uriWildcard = queries.reduce((prev, query) => {
+      if (query.uri && query.domain) {
+        if (!prev)
+          prev = query.uri.spec;
+        query.uri = null;
+      }
+      return prev;
+    }, "");
+    resolve(collect([], root, uriWildcard));
   });
 }
 
-function collect (acc, node) {
+function collect (acc, node, uriWildcard) {
   node.containerOpen = true;
   for (let i = 0; i < node.childCount; i++) {
     let child = node.getChild(i);
-    acc.push(child);
+
+    if (!uriWildcard || child.uri.startsWith(uriWildcard)) {
+      acc.push(child);
+    }
     if (child.type === child.RESULT_TYPE_FOLDER) {
       let container = child.QueryInterface(Ci.nsINavHistoryContainerResultNode);
-      collect(acc, container);
+      collect(acc, container, uriWildcard);
     }
   }
   node.containerOpen = false;
diff --git a/addon-sdk/source/lib/sdk/places/utils.js b/addon-sdk/source/lib/sdk/places/utils.js
index 034b4f946f9..44366d2aaba 100644
--- a/addon-sdk/source/lib/sdk/places/utils.js
+++ b/addon-sdk/source/lib/sdk/places/utils.js
@@ -12,7 +12,7 @@ module.metadata = {
   }
 };
 
-const { Cc, Ci } = require('chrome');
+const { Cc, Ci, Cu } = require('chrome');
 const { Class } = require('../core/heritage');
 const { method } = require('../lang/functional');
 const { defer, promised, all } = require('../core/promise');
@@ -22,6 +22,8 @@ const { merge } = require('../util/object');
 const bmsrv = Cc["@mozilla.org/browser/nav-bookmarks-service;1"].
                 getService(Ci.nsINavBookmarksService);
 
+Cu.importGlobalProperties(["URL"]);
+
 /*
  * TreeNodes are used to construct dependency trees
  * for BookmarkItems
@@ -128,9 +130,9 @@ exports.isRootGroup = isRootGroup;
  *    --> 'http://moz.com', 'http://moz.com/thunderbird'
  * '*.moz.com' // domain: moz.com, domainIsHost: false
  *    --> 'http://moz.com', 'http://moz.com/index', 'http://ff.moz.com/test'
- * 'http://moz.com' // url: http://moz.com/, urlIsPrefix: false
+ * 'http://moz.com' // uri: http://moz.com/
  *    --> 'http://moz.com/'
- * 'http://moz.com/*' // url: http://moz.com/, urlIsPrefix: true
+ * 'http://moz.com/*' // uri: http://moz.com/, domain: moz.com, domainIsHost: true
  *    --> 'http://moz.com/', 'http://moz.com/thunderbird'
  */
 
@@ -139,8 +141,21 @@ function urlQueryParser (query, url) {
   if (/^https?:\/\//.test(url)) {
     query.uri = url.charAt(url.length - 1) === '/' ? url : url + '/';
     if (/\*$/.test(url)) {
-      query.uri = url.replace(/\*$/, '');
-      query.uriIsPrefix = true;
+      // Wildcard searches on URIs are not supported, so try to extract a
+      // domain and filter the data later.
+      url = url.replace(/\*$/, '');
+      try {
+        query.domain = new URL(url).hostname;
+        query.domainIsHost = true;
+        // Unfortunately here we cannot use an expando to store the wildcard,
+        // cause the query is a wrapped native XPCOM object, so we reuse uri.
+        // We clearly don't want to query for both uri and domain, thus we'll
+        // have to handle this in host-query.js::execute()
+        query.uri = url;
+      } catch (ex) {
+        // Cannot extract an host cause it's not a valid uri, the query will
+        // just return nothing.
+      }
     }
   } else {
     if (/^\*/.test(url)) {
diff --git a/toolkit/components/places/nsINavHistoryService.idl b/toolkit/components/places/nsINavHistoryService.idl
index 037b3ea1e47..9cfa8bde391 100644
--- a/toolkit/components/places/nsINavHistoryService.idl
+++ b/toolkit/components/places/nsINavHistoryService.idl
@@ -903,17 +903,9 @@ interface nsINavHistoryQuery : nsISupports
   attribute AUTF8String domain;
   readonly attribute boolean hasDomain;
 
-  /**
-   * Controls the interpretation of 'uri'. When unset (default), the URI will
-   * request an exact match of the specified URI. When set, any history entry
-   * beginning in 'uri' will match. For example "http://bar.com/foo" will match
-   * "http://bar.com/foo" as well as "http://bar.com/foo/baz.gif".
-   */
-  attribute boolean uriIsPrefix;
-
   /**
    * This is a URI to match, to, for example, find out every time you visited
-   * a given URI. Use uriIsPrefix to control whether this is an exact match.
+   * a given URI. This is an exact match.
    */
   attribute nsIURI uri;
   readonly attribute boolean hasUri;
diff --git a/toolkit/components/places/nsNavHistory.cpp b/toolkit/components/places/nsNavHistory.cpp
index ab1e07bc910..e86ad98f534 100644
--- a/toolkit/components/places/nsNavHistory.cpp
+++ b/toolkit/components/places/nsNavHistory.cpp
@@ -895,27 +895,12 @@ nsNavHistory::EvaluateQueryForNode(const nsCOMArray<nsNavHistoryQuery>& aQueries
         if (NS_FAILED(NS_NewURI(getter_AddRefs(nodeUri), aNode->mURI)))
           continue;
       }
-      if (! query->UriIsPrefix()) {
-        // easy case: the URI is an exact match
-        bool equals;
-        nsresult rv = query->Uri()->Equals(nodeUri, &equals);
-        NS_ENSURE_SUCCESS(rv, false);
-        if (! equals)
-          continue;
-      } else {
-        // harder case: match prefix, note that we need to get the ASCII string
-        // from the node's parsed URI instead of using the node's mUrl string,
-        // because that might not be normalized
-        nsAutoCString nodeUriString;
-        nodeUri->GetAsciiSpec(nodeUriString);
-        nsAutoCString queryUriString;
-        query->Uri()->GetAsciiSpec(queryUriString);
-        if (queryUriString.Length() > nodeUriString.Length())
-          continue; // not long enough to match as prefix
-        nodeUriString.SetLength(queryUriString.Length());
-        if (! nodeUriString.Equals(queryUriString))
-          continue; // prefixes don't match
-      }
+
+      bool equals;
+      nsresult rv = query->Uri()->Equals(nodeUri, &equals);
+      NS_ENSURE_SUCCESS(rv, false);
+      if (! equals)
+        continue;
     }
 
     // Transitions matching.
@@ -1324,9 +1309,6 @@ bool IsOptimizableHistoryQuery(const nsCOMArray<nsNavHistoryQuery>& aQueries,
   if (aQuery->AnnotationIsNot() || !aQuery->Annotation().IsEmpty())
     return false;
 
-  if (aQuery->UriIsPrefix() || aQuery->Uri())
-    return false;
-
   if (aQuery->Folders().Length() > 0)
     return false;
 
@@ -3369,12 +3351,7 @@ nsNavHistory::QueryToSelectClause(nsNavHistoryQuery* aQuery, // const
 
   // URI
   if (NS_SUCCEEDED(aQuery->GetHasUri(&hasIt)) && hasIt) {
-    if (aQuery->UriIsPrefix()) {
-      clause.Condition("h.url >= ").Param(":uri")
-            .Condition("h.url <= ").Param(":uri_upper");
-    }
-    else
-      clause.Condition("h.url =").Param(":uri");
+    clause.Condition("h.url =").Param(":uri");
   }
 
   // annotation
@@ -3568,15 +3545,6 @@ nsNavHistory::BindQueryClauseParameters(mozIStorageBaseStatement* statement,
       statement, NS_LITERAL_CSTRING("uri") + qIndex, aQuery->Uri()
     );
     NS_ENSURE_SUCCESS(rv, rv);
-    if (aQuery->UriIsPrefix()) {
-      nsAutoCString uriString;
-      aQuery->Uri()->GetSpec(uriString);
-      uriString.Append(char(0x7F)); // MAX_UTF8
-      rv = URIBinder::Bind(
-        statement, NS_LITERAL_CSTRING("uri_upper") + qIndex, uriString
-      );
-      NS_ENSURE_SUCCESS(rv, rv);
-    }
   }
 
   // annotation
diff --git a/toolkit/components/places/nsNavHistoryQuery.cpp b/toolkit/components/places/nsNavHistoryQuery.cpp
index e0acd8bff8b..337da6c7e33 100644
--- a/toolkit/components/places/nsNavHistoryQuery.cpp
+++ b/toolkit/components/places/nsNavHistoryQuery.cpp
@@ -126,7 +126,6 @@ static void SetOptionsKeyUint32(const nsCString& aValue,
 #define QUERYKEY_NOTANNOTATION "!annotation"
 #define QUERYKEY_ANNOTATION "annotation"
 #define QUERYKEY_URI "uri"
-#define QUERYKEY_URIISPREFIX "uriIsPrefix"
 #define QUERYKEY_SEPARATOR "OR"
 #define QUERYKEY_GROUP "group"
 #define QUERYKEY_SORT "sort"
@@ -426,9 +425,6 @@ nsNavHistory::QueriesToQueryString(nsINavHistoryQuery **aQueries,
     // uri
     query->GetHasUri(&hasIt);
     if (hasIt) {
-      AppendBoolKeyValueIfTrue(aQueryString,
-                               NS_LITERAL_CSTRING(QUERYKEY_URIISPREFIX),
-                               query, &nsINavHistoryQuery::GetUriIsPrefix);
       nsCOMPtr<nsIURI> uri;
       query->GetUri(getter_AddRefs(uri));
       NS_ENSURE_TRUE(uri, NS_ERROR_FAILURE); // hasURI should tell is if invalid
@@ -725,10 +721,6 @@ nsNavHistory::TokensToQueries(const nsTArray<QueryKeyValuePair>& aTokens,
       rv = query->SetUri(uri);
       NS_ENSURE_SUCCESS(rv, rv);
 
-    // URI is prefix
-    } else if (kvp.key.EqualsLiteral(QUERYKEY_URIISPREFIX)) {
-      SetQueryKeyBool(kvp.value, query, &nsINavHistoryQuery::SetUriIsPrefix);
-
     // not annotation
     } else if (kvp.key.EqualsLiteral(QUERYKEY_NOTANNOTATION)) {
       nsAutoCString unescaped(kvp.value);
@@ -901,7 +893,7 @@ nsNavHistoryQuery::nsNavHistoryQuery()
     mBeginTimeReference(TIME_RELATIVE_EPOCH),
     mEndTime(0), mEndTimeReference(TIME_RELATIVE_EPOCH),
     mOnlyBookmarked(false),
-    mDomainIsHost(false), mUriIsPrefix(false),
+    mDomainIsHost(false),
     mAnnotationIsNot(false),
     mTagsAreNot(false)
 {
@@ -916,7 +908,7 @@ nsNavHistoryQuery::nsNavHistoryQuery(const nsNavHistoryQuery& aOther)
     mEndTime(aOther.mEndTime), mEndTimeReference(aOther.mEndTimeReference),
     mSearchTerms(aOther.mSearchTerms), mOnlyBookmarked(aOther.mOnlyBookmarked),
     mDomainIsHost(aOther.mDomainIsHost), mDomain(aOther.mDomain),
-    mUriIsPrefix(aOther.mUriIsPrefix), mUri(aOther.mUri),
+    mUri(aOther.mUri),
     mAnnotationIsNot(aOther.mAnnotationIsNot),
     mAnnotation(aOther.mAnnotation), mTags(aOther.mTags),
     mTagsAreNot(aOther.mTagsAreNot), mTransitions(aOther.mTransitions)
@@ -1073,17 +1065,6 @@ NS_IMETHODIMP nsNavHistoryQuery::GetHasDomain(bool* _retval)
   return NS_OK;
 }
 
-NS_IMETHODIMP nsNavHistoryQuery::GetUriIsPrefix(bool* aIsPrefix)
-{
-  *aIsPrefix = mUriIsPrefix;
-  return NS_OK;
-}
-NS_IMETHODIMP nsNavHistoryQuery::SetUriIsPrefix(bool aIsPrefix)
-{
-  mUriIsPrefix = aIsPrefix;
-  return NS_OK;
-}
-
 NS_IMETHODIMP nsNavHistoryQuery::GetUri(nsIURI** aUri)
 {
   NS_IF_ADDREF(*aUri = mUri);
diff --git a/toolkit/components/places/nsNavHistoryQuery.h b/toolkit/components/places/nsNavHistoryQuery.h
index 581ce242b1f..d1a8b759a14 100644
--- a/toolkit/components/places/nsNavHistoryQuery.h
+++ b/toolkit/components/places/nsNavHistoryQuery.h
@@ -42,7 +42,6 @@ public:
   bool OnlyBookmarked() { return mOnlyBookmarked; }
   bool DomainIsHost() { return mDomainIsHost; }
   const nsCString& Domain() { return mDomain; }
-  bool UriIsPrefix() { return mUriIsPrefix; }
   nsIURI* Uri() { return mUri; } // NOT AddRef-ed!
   bool AnnotationIsNot() { return mAnnotationIsNot; }
   const nsCString& Annotation() { return mAnnotation; }
@@ -82,7 +81,6 @@ protected:
   bool mOnlyBookmarked;
   bool mDomainIsHost;
   nsCString mDomain; // Default is IsVoid, empty string is valid query
-  bool mUriIsPrefix;
   nsCOMPtr<nsIURI> mUri;
   bool mAnnotationIsNot;
   nsCString mAnnotation;
diff --git a/toolkit/components/places/tests/queries/test_abstime-annotation-uri.js b/toolkit/components/places/tests/queries/test_abstime-annotation-uri.js
index ce71e5b584b..fcb1885e217 100644
--- a/toolkit/components/places/tests/queries/test_abstime-annotation-uri.js
+++ b/toolkit/components/places/tests/queries/test_abstime-annotation-uri.js
@@ -53,24 +53,6 @@ var testData = [
    uri: "http://foo.com/", annoName: goodAnnoName, annoVal: val,
    lastVisit: jan14_2130, title: "moz"},
 
-  // Test begin edge of time
-  {isInQuery: true, isVisit: true, isDetails: true, title: "moz mozilla",
-   uri: "http://foo.com/begin.html", lastVisit: beginTime},
-
-  // Test end edge of time
-  {isInQuery: true, isVisit: true, isDetails: true, title: "moz mozilla",
-   uri: "http://foo.com/end.html", lastVisit: endTime},
-
-  // Test uri included with isRedirect=true, different transtype
-  {isInQuery: true, isVisit: true, isDetails: true, title: "moz",
-   isRedirect: true, uri: "http://foo.com/redirect", lastVisit: jan11_800,
-   transType: PlacesUtils.history.TRANSITION_LINK},
-
-  // Test leading time edge with tag string is included
-  {isInQuery: true, isVisit: true, isDetails: true, title: "taggariffic",
-   uri: "http://foo.com/tagging/test.html", lastVisit: beginTime, isTag: true,
-   tagArray: ["moz"] },
-
   // Begin the invalid queries:
   // Test www. style URI is not included, with an annotation
   {isInQuery: false, isVisit: true, isDetails: true, isPageAnnotation: true,
@@ -136,7 +118,6 @@ add_task(function* test_abstime_annotation_uri()
   query.endTimeReference = PlacesUtils.history.TIME_RELATIVE_EPOCH;
   query.searchTerms = "moz";
   query.uri = uri("http://foo.com");
-  query.uriIsPrefix = true;
   query.annotation = "text/foo";
   query.annotationIsNot = true;
 
@@ -156,53 +137,26 @@ add_task(function* test_abstime_annotation_uri()
   // Ensure the result set is correct
   compareArrayToResult(testData, root);
 
-  // Make some changes to the result set
-  // Let's add something first
-  var addItem = [{isInQuery: true, isVisit: true, isDetails: true, title: "moz",
-                 uri: "http://foo.com/i-am-added.html", lastVisit: jan11_800}];
-  yield task_populateDB(addItem);
-  do_print("Adding item foo.com/i-am-added.html");
-  do_check_eq(isInResult(addItem, root), true);
-
-  // Let's update something by title
-  var change1 = [{isDetails: true, uri: "http://foo.com/changeme1",
-                  lastVisit: jan12_1730, title: "moz moz mozzie"}];
+  // live update.
+  do_print("change title");
+  var change1 = [{isDetails: true, uri:"http://foo.com/",
+                  title: "mo"},];
   yield task_populateDB(change1);
-  do_print("LiveUpdate by changing title");
-  do_check_eq(isInResult(change1, root), true);
+  do_check_false(isInResult({uri: "http://foo.com/"}, root));
 
-  // Let's update something by annotation
-  // Updating a page by removing an annotation does not cause it to join this
-  // query set.  I tend to think that it should cause that page to join this
-  // query set, because this visit fits all theother specified criteria once the
-  // annotation is removed. Uncommenting this will fail the test.
-  // This is bug 424050 - appears to happen for both domain and URI queries
-  /*var change2 = [{isPageAnnotation: true, uri: "http://foo.com/badannotaion.html",
-                  annoName: "text/mozilla", annoVal: "test"}];
+  var change2 = [{isDetails: true, uri:"http://foo.com/",
+                  title: "moz", lastvisit: endTime},];
   yield task_populateDB(change2);
-  do_print("LiveUpdate by removing annotation");
-  do_check_eq(isInResult(change2, root), true);*/
+  dump_table("moz_places");
+  do_check_false(isInResult({uri: "http://foo.com/"}, root));
 
-  // Let's update by adding a visit in the time range for an existing URI
-  var change3 = [{isDetails: true, uri: "http://foo.com/changeme3.htm",
-                  title: "moz", lastVisit: jan15_2045}];
+  // Let's delete something from the result set - using annotation
+  var change3 = [{isPageAnnotation: true,
+                  uri: "http://foo.com/",
+                  annoName: badAnnoName, annoVal: "test"}];
   yield task_populateDB(change3);
-  do_print("LiveUpdate by adding visit within timerange");
-  do_check_eq(isInResult(change3, root), true);
-
-  // And delete something from the result set - using annotation
-  // Once more, bug 424050
-  /*var change4 = [{isPageAnnotation: true, uri: "http://foo.com/",
-                  annoVal: "test", annoName: badAnnoName}];
-  yield task_populateDB(change4);
-  do_print("LiveUpdate by deleting item from set by adding annotation");
-  do_check_eq(isInResult(change4, root), false);*/
-
-  // Delete something by changing the title
-  var change5 = [{isDetails: true, uri: "http://foo.com/end.html", title: "deleted"}];
-  yield task_populateDB(change5);
-  do_print("LiveUpdate by deleting item by changing title");
-  do_check_eq(isInResult(change5, root), false);
+  do_print("LiveUpdate by removing annotation");
+  do_check_false(isInResult({uri: "http://foo.com/"}, root));
 
   root.containerOpen = false;
 });
diff --git a/toolkit/components/places/tests/queries/test_querySerialization.js b/toolkit/components/places/tests/queries/test_querySerialization.js
index a728a29bd75..40196c163c8 100644
--- a/toolkit/components/places/tests/queries/test_querySerialization.js
+++ b/toolkit/components/places/tests/queries/test_querySerialization.js
@@ -165,18 +165,13 @@ const querySwitches = [
   // hasUri
   {
     flag:        "hasUri",
-    subswitches: ["uri", "uriIsPrefix"],
+    subswitches: ["uri"],
     desc:        "nsINavHistoryQuery.hasUri",
     matches:     flagSwitchMatches,
     runs:        [
       function (aQuery, aQueryOptions) {
         aQuery.uri = uri("http://mozilla.com");
-        aQuery.uriIsPrefix = false;
       },
-      function (aQuery, aQueryOptions) {
-        aQuery.uri = uri("http://mozilla.com");
-        aQuery.uriIsPrefix = true;
-      }
     ]
   },
   // hasAnnotation
diff --git a/toolkit/components/places/tests/queries/test_searchterms-uri.js b/toolkit/components/places/tests/queries/test_searchterms-uri.js
index 11f9f4ae632..8740306b63a 100644
--- a/toolkit/components/places/tests/queries/test_searchterms-uri.js
+++ b/toolkit/components/places/tests/queries/test_searchterms-uri.js
@@ -13,16 +13,6 @@
      uri: "http://foo.com/", annoName: "moz/test", annoVal: "val",
      lastVisit: lastweek, title: "you know, moz is cool"},
 
-    // Test subdomain included with isRedirect=true, different transtype
-    {isInQuery: true, isVisit: true, isDetails: true, title: "amozzie",
-     isRedirect: true, uri: "http://foo.com/redirect", lastVisit: old,
-     referrer: "http://myreferrer.com", transType: PlacesUtils.history.TRANSITION_LINK},
-
-    // Test www. style URI is included, with a tag
-    {isInQuery: true, isVisit: true, isDetails: true, isTag: true,
-     uri: "http://foo.com/yiihah", tagArray: ["moz"], lastVisit: yesterday,
-     title: "foo"},
-
     // Test https protocol
     {isInQuery: false, isVisit: true, isDetails: true, title: "moz",
      uri: "https://foo.com/", lastVisit: today},
@@ -62,7 +52,6 @@ add_task(function* test_searchterms_uri()
    var query = PlacesUtils.history.getNewQuery();
    query.searchTerms = "moz";
    query.uri = uri("http://foo.com");
-   query.uriIsPrefix = true;
 
    // Options
    var options = PlacesUtils.history.getNewQueryOptions();
@@ -82,41 +71,17 @@ add_task(function* test_searchterms_uri()
    // Check our inital result set
    compareArrayToResult(testData, root);
 
-   // If that passes, check liveupdate
-   // Add to the query set
-   do_print("Adding item to query");
-   var change1 = [{isVisit: true, isDetails: true, uri: "http://foo.com/added.htm",
-                   title: "moz", transType: PlacesUtils.history.TRANSITION_LINK}];
+   // live update.
+   do_print("change title");
+   var change1 = [{isDetails: true, uri:"http://foo.com/",
+                   title: "mo"},];
    yield task_populateDB(change1);
-   do_check_true(isInResult(change1, root));
 
-   // Update an existing URI
-   do_print("Updating Item");
-   var change2 = [{isDetails: true, uri: "http://foo.com/changeme1.htm",
-                   title: "moz" }];
+   do_check_false(isInResult({uri: "http://foo.com/"}, root));
+   var change2 = [{isDetails: true, uri:"http://foo.com/",
+                   title: "moz"},];
    yield task_populateDB(change2);
-   do_check_true(isInResult(change2, root));
-
-   // Add one and take one out of query set, and simply change one so that it
-   // still applies to the query.
-   do_print("Updating More Items");
-   var change3 = [{isDetails: true, uri:"http://foo.com/changeme2.htm",
-                   title: "moz"},
-                  {isDetails: true, uri: "http://foo.com/yiihah",
-                   title: "moz now updated"},
-                  {isDetails: true, uri: "http://foo.com/redirect",
-                   title: "gone"}];
-   yield task_populateDB(change3);
-   do_check_true(isInResult({uri: "http://foo.com/changeme2.htm"}, root));
-   do_check_true(isInResult({uri: "http://foo.com/yiihah"}, root));
-   do_check_false(isInResult({uri: "http://foo.com/redirect"}, root));
-
-   // And now, delete one
-   do_print("Deleting items");
-   var change4 = [{isDetails: true, uri: "http://foo.com/",
-                   title: "mo,z"}];
-   yield task_populateDB(change4);
-   do_check_false(isInResult(change4, root));
+   do_check_true(isInResult({uri: "http://foo.com/"}, root));
 
    root.containerOpen = false;
 });

From bbbe0d375577b5fd56d881d01f5ecd01afa3cefd Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Tue, 16 Feb 2016 09:15:06 -0600
Subject: [PATCH 02/45] Backout f5bd25c789b6 "Bug 1245121 - Enable JSON Viewer
 on RELEASE_BUILD" for Talos regressions.

---
 devtools/client/preferences/devtools.js | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/devtools/client/preferences/devtools.js b/devtools/client/preferences/devtools.js
index bd7cb53b671..269dbe9979a 100644
--- a/devtools/client/preferences/devtools.js
+++ b/devtools/client/preferences/devtools.js
@@ -332,12 +332,11 @@ pref("devtools.fontinspector.enabled", true);
 // version for each user.
 pref("devtools.telemetry.tools.opened.version", "{}");
 
-// Enable the JSON View tool (an inspector for application/json documents) on
-// Nightly and Dev. Edition.
-#ifdef RELEASE_BUILD
-pref("devtools.jsonview.enabled", false);
+// Enable the JSON View tool (an inspector for application/json documents)
+#ifdef MOZ_DEV_EDITION
+  pref("devtools.jsonview.enabled", true);
 #else
-pref("devtools.jsonview.enabled", true);
+  pref("devtools.jsonview.enabled", false);
 #endif
 
 // Disable the HTML responsive design tool by default.  Currently disabled until

From c6d6db4cf7b04e1cf56972f59dead920c23392e5 Mon Sep 17 00:00:00 2001
From: Alexandre Poirot <poirot.alex@gmail.com>
Date: Tue, 16 Feb 2016 07:23:56 -0800
Subject: [PATCH 03/45] Bug 1246692 - Test that the browser toolbox has a
 working console. r=jryans

---
 devtools/client/framework/ToolboxProcess.jsm  |  2 +
 devtools/client/framework/test/browser.ini    |  1 +
 .../framework/test/browser_browser_toolbox.js | 63 +++++++++++++++++++
 .../framework/toolbox-process-window.js       | 23 ++++++-
 4 files changed, 86 insertions(+), 3 deletions(-)
 create mode 100644 devtools/client/framework/test/browser_browser_toolbox.js

diff --git a/devtools/client/framework/ToolboxProcess.jsm b/devtools/client/framework/ToolboxProcess.jsm
index 1cfed182e6b..c2f2eebc746 100644
--- a/devtools/client/framework/ToolboxProcess.jsm
+++ b/devtools/client/framework/ToolboxProcess.jsm
@@ -198,6 +198,8 @@ BrowserToolboxProcess.prototype = {
 
     if (this._options.addonID) {
       xulURI += "?addonID=" + this._options.addonID;
+    } else if (this._options.testScript) {
+      xulURI += "?testScript=" + encodeURIComponent(this._options.testScript);
     }
 
     dumpn("Running chrome debugging process.");
diff --git a/devtools/client/framework/test/browser.ini b/devtools/client/framework/test/browser.ini
index f5c99fd23ea..bdcb18dd3e4 100644
--- a/devtools/client/framework/test/browser.ini
+++ b/devtools/client/framework/test/browser.ini
@@ -17,6 +17,7 @@ support-files =
   browser_toolbox_options_enable_serviceworkers_testing.html
   serviceworker.js
 
+[browser_browser_toolbox.js]
 [browser_devtools_api.js]
 [browser_devtools_api_destroy.js]
 [browser_dynamic_tool_enabling.js]
diff --git a/devtools/client/framework/test/browser_browser_toolbox.js b/devtools/client/framework/test/browser_browser_toolbox.js
new file mode 100644
index 00000000000..05b5865a51c
--- /dev/null
+++ b/devtools/client/framework/test/browser_browser_toolbox.js
@@ -0,0 +1,63 @@
+/* vim: set ts=2 et sw=2 tw=80: */
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+// On debug test slave, it takes about 50s to run the test.
+requestLongerTimeout(4);
+
+add_task(function* runTest() {
+  yield new Promise(done => {
+    let options = {"set": [
+      ["devtools.debugger.prompt-connection", false],
+      ["devtools.debugger.remote-enabled", true],
+      ["devtools.chrome.enabled", true],
+      // Test-only pref to allow passing `testScript` argument to the browser
+      // toolbox
+      ["devtools.browser-toolbox.allow-unsafe-script", true],
+      // On debug test slave, it takes more than the default time (20s)
+      // to get a initialized console
+      ["devtools.debugger.remote-timeout", 120000]
+    ]};
+    SpecialPowers.pushPrefEnv(options, done);
+  });
+
+  // Wait for a notification sent by a script evaluated in the webconsole
+  // of the browser toolbox.
+  let onCustomMessage = new Promise(done => {
+    Services.obs.addObserver(function listener() {
+      Services.obs.removeObserver(listener, "browser-toolbox-console-works");
+      done();
+    }, "browser-toolbox-console-works", false);
+  });
+
+  let { BrowserToolboxProcess } = Cu.import("resource://devtools/client/framework/ToolboxProcess.jsm", {});
+  let closePromise;
+  yield new Promise(onRun => {
+    let options = {
+      // Pass a test script evaluated in the browser toolbox window
+      // living in a distinct process. It has access to `toolbox` object
+      // in its global scope.
+      testScript: "new " + function () {
+        toolbox.selectTool("webconsole")
+          .then(() => toolbox.getPanel("webconsole"))
+          .then(() => {
+            let { jsterm } = toolbox.getPanel("webconsole").hud;
+            let js = "Services.obs.notifyObservers(null, 'browser-toolbox-console-works', null);";
+            return jsterm.execute(js);
+          })
+          .then(() => toolbox.destroy());
+      }
+    };
+    closePromise = new Promise(onClose => {
+      info("Opening the browser toolbox\n");
+      BrowserToolboxProcess.init(onClose, onRun, options);
+    });
+  });
+  ok(true, "Browser toolbox started\n");
+
+  yield onCustomMessage;
+  ok(true, "Received the custom message");
+
+  yield closePromise;
+  ok(true, "Browser toolbox process just closed");
+});
diff --git a/devtools/client/framework/toolbox-process-window.js b/devtools/client/framework/toolbox-process-window.js
index a24e4265370..b0cecbc560d 100644
--- a/devtools/client/framework/toolbox-process-window.js
+++ b/devtools/client/framework/toolbox-process-window.js
@@ -111,9 +111,26 @@ function openToolbox({ form, chrome, isTabActor }) {
 }
 
 function onNewToolbox(toolbox) {
-   gToolbox = toolbox;
-   bindToolboxHandlers();
-   raise();
+  gToolbox = toolbox;
+  bindToolboxHandlers();
+  raise();
+  let testScript = getParameterByName("testScript");
+  if (testScript) {
+    // Only allow executing random chrome scripts when a special
+    // test-only pref is set
+    let prefName = "devtools.browser-toolbox.allow-unsafe-script";
+    if (Services.prefs.getPrefType(prefName) == Services.prefs.PREF_BOOL &&
+        Services.prefs.getBoolPref(prefName) === true) {
+      evaluateTestScript(testScript, toolbox);
+    }
+  }
+}
+
+function evaluateTestScript(script, toolbox) {
+  let sandbox = Cu.Sandbox(window);
+  sandbox.window = window;
+  sandbox.toolbox = toolbox;
+  Cu.evalInSandbox(script, sandbox);
 }
 
 function bindToolboxHandlers() {

From f713d7edade169d05b19fd5e415e69d3c475da5e Mon Sep 17 00:00:00 2001
From: Alexandre Poirot <poirot.alex@gmail.com>
Date: Tue, 16 Feb 2016 07:23:56 -0800
Subject: [PATCH 04/45] Bug 1247270 - Ensure reloading every devtools-related
 documents when hitting the reload shortcut. r=jryans

---
 devtools/bootstrap.js      | 56 +++++++++++++++++++++++++++++++++++---
 devtools/shared/Loader.jsm | 20 +-------------
 2 files changed, 53 insertions(+), 23 deletions(-)

diff --git a/devtools/bootstrap.js b/devtools/bootstrap.js
index d9b1f423355..b9ab944c58b 100644
--- a/devtools/bootstrap.js
+++ b/devtools/bootstrap.js
@@ -79,11 +79,59 @@ function reload(event) {
 
   // Ask the loader to update itself and reopen the toolbox if needed
   const {devtools} = Cu.import("resource://devtools/shared/Loader.jsm", {});
-  devtools.reload(reloadToolbox);
+  devtools.reload();
 
-  // Also tells gDevTools to reload its dependencies
-  const {gDevTools} = devtools.require("devtools/client/framework/devtools");
-  gDevTools.reload();
+  // Go over all top level windows to reload all devtools related things
+  let windowsEnum = Services.wm.getEnumerator(null);
+  while (windowsEnum.hasMoreElements()) {
+    let window = windowsEnum.getNext();
+    let windowtype = window.document.documentElement.getAttribute("windowtype");
+    if (windowtype == "navigator:browser" && window.gBrowser) {
+      // Enumerate tabs on firefox windows
+      for (let tab of window.gBrowser.tabs) {
+        let browser = tab.linkedBrowser;
+        let location = browser.documentURI.spec;
+        let mm = browser.messageManager;
+        // To reload JSON-View tabs and any devtools document
+        if (location.startsWith("about:debugging") ||
+            location.startsWith("chrome://devtools/")) {
+          browser.reload();
+        }
+        // We have to use a frame script to query "baseURI"
+        mm.loadFrameScript("data:text/javascript,new " + function () {
+          let isJSONView = content.document.baseURI.startsWith("resource://devtools/");
+          if (isJSONView) {
+            content.location.reload();
+          }
+        }, false);
+      }
+    } else if (windowtype === "devtools:webide") {
+      window.location.reload();
+    } else if (windowtype === "devtools:webconsole") {
+      // Browser console document can't just be reloaded.
+      // HUDService is going to close it on unload.
+      // Instead we have to manually toggle it.
+      let HUDService = devtools.require("devtools/client/webconsole/hudservice");
+      HUDService.toggleBrowserConsole()
+        .then(() => {
+          HUDService.toggleBrowserConsole();
+        });
+    }
+  }
+
+  if (reloadToolbox) {
+    // Reopen the toolbox automatically if we are reloading from toolbox shortcut
+    // and are on a browser window.
+    // Wait for a second before opening the toolbox to avoid races
+    // between the old and the new one.
+    let {setTimeout} = Cu.import("resource://gre/modules/Timer.jsm", {});
+    setTimeout(() => {
+      let { TargetFactory } = devtools.require("devtools/client/framework/target");
+      let { gDevTools } = devtools.require("devtools/client/framework/devtools");
+      let target = TargetFactory.forTab(top.gBrowser.selectedTab);
+      gDevTools.showToolbox(target);
+    }, 1000);
+  }
 }
 
 let listener;
diff --git a/devtools/shared/Loader.jsm b/devtools/shared/Loader.jsm
index cc08f17d4cc..c36407041e9 100644
--- a/devtools/shared/Loader.jsm
+++ b/devtools/shared/Loader.jsm
@@ -422,7 +422,7 @@ DevToolsLoader.prototype = {
   /**
    * Reload the current provider.
    */
-  reload: function(showToolbox) {
+  reload: function() {
     var events = this.require("sdk/system/events");
     events.emit("startupcache-invalidate", {});
     events.emit("devtools-unloaded", {});
@@ -432,24 +432,6 @@ DevToolsLoader.prototype = {
     delete this._mainid;
     this._chooseProvider();
     this.main("devtools/client/main");
-
-    let window = Services.wm.getMostRecentWindow(null);
-    let location = window.location.href;
-    if (location.includes("/browser.xul") && showToolbox) {
-      // Reopen the toolbox automatically if we are reloading from toolbox shortcut
-      // and are on a browser window.
-      // Wait for a second before opening the toolbox to avoid races
-      // between the old and the new one.
-      let {setTimeout} = Cu.import("resource://gre/modules/Timer.jsm", {});
-      setTimeout(() => {
-        let { gBrowser } = window;
-        let target = this.TargetFactory.forTab(gBrowser.selectedTab);
-        const { gDevTools } = require("devtools/client/framework/devtools");
-        gDevTools.showToolbox(target);
-      }, 1000);
-    } else if (location.includes("/webide.xul")) {
-      window.location.reload();
-    }
   },
 
   /**

From f778c4e38cf5d13f51d0c8c2fa1af1e283f43d48 Mon Sep 17 00:00:00 2001
From: Alexandre Poirot <poirot.alex@gmail.com>
Date: Tue, 16 Feb 2016 07:23:56 -0800
Subject: [PATCH 05/45] Bug 1241050 - Convert DeveloperToolbar.jsm to commonjs
 module. r=jwalker

---
 browser/base/content/browser.js                        |  6 +++---
 devtools/client/framework/toolbox.js                   |  4 ++--
 devtools/client/inspector/inspector-panel.js           |  2 +-
 .../{DeveloperToolbar.jsm => developer-toolbar.js}     | 10 ++++------
 devtools/client/shared/moz.build                       |  2 +-
 5 files changed, 11 insertions(+), 13 deletions(-)
 rename devtools/client/shared/{DeveloperToolbar.jsm => developer-toolbar.js} (99%)

diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index d41f4d8be7d..e394a0f3c4f 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -157,9 +157,9 @@ XPCOMUtils.defineLazyGetter(this, "PopupNotifications", function () {
 });
 
 XPCOMUtils.defineLazyGetter(this, "DeveloperToolbar", function() {
-  let tmp = {};
-  Cu.import("resource://devtools/client/shared/DeveloperToolbar.jsm", tmp);
-  return new tmp.DeveloperToolbar(window, document.getElementById("developer-toolbar"));
+  let { require } = Cu.import("resource://devtools/shared/Loader.jsm", {});
+  let { DeveloperToolbar } = require("devtools/client/shared/developer-toolbar");
+  return new DeveloperToolbar(window, document.getElementById("developer-toolbar"));
 });
 
 XPCOMUtils.defineLazyGetter(this, "BrowserToolboxProcess", function() {
diff --git a/devtools/client/framework/toolbox.js b/devtools/client/framework/toolbox.js
index 53cbb237233..537f3e484f2 100644
--- a/devtools/client/framework/toolbox.js
+++ b/devtools/client/framework/toolbox.js
@@ -28,8 +28,6 @@ Cu.import("resource://devtools/client/scratchpad/scratchpad-manager.jsm");
 Cu.import("resource://devtools/client/shared/DOMHelpers.jsm");
 Cu.import("resource://gre/modules/Task.jsm");
 
-loader.lazyImporter(this, "CommandUtils",
-  "resource://devtools/client/shared/DeveloperToolbar.jsm");
 loader.lazyGetter(this, "toolboxStrings", () => {
   const properties = "chrome://devtools/locale/toolbox.properties";
   const bundle = Services.strings.createBundle(properties);
@@ -45,6 +43,8 @@ loader.lazyGetter(this, "toolboxStrings", () => {
     }
   };
 });
+loader.lazyRequireGetter(this, "CommandUtils",
+  "devtools/client/shared/developer-toolbar", true);
 loader.lazyRequireGetter(this, "getHighlighterUtils",
   "devtools/client/framework/toolbox-highlighter-utils", true);
 loader.lazyRequireGetter(this, "Hosts",
diff --git a/devtools/client/inspector/inspector-panel.js b/devtools/client/inspector/inspector-panel.js
index 40e43c12416..d94edf7bda3 100644
--- a/devtools/client/inspector/inspector-panel.js
+++ b/devtools/client/inspector/inspector-panel.js
@@ -36,7 +36,7 @@ loader.lazyGetter(this, "clipboardHelper", () => {
   return Cc["@mozilla.org/widget/clipboardhelper;1"].getService(Ci.nsIClipboardHelper);
 });
 
-loader.lazyImporter(this, "CommandUtils", "resource://devtools/client/shared/DeveloperToolbar.jsm");
+loader.lazyRequireGetter(this, "CommandUtils", "devtools/client/shared/developer-toolbar", true);
 
 /**
  * Represents an open instance of the Inspector for a tab.
diff --git a/devtools/client/shared/DeveloperToolbar.jsm b/devtools/client/shared/developer-toolbar.js
similarity index 99%
rename from devtools/client/shared/DeveloperToolbar.jsm
rename to devtools/client/shared/developer-toolbar.js
index 24f73ed40d6..486319a93bf 100644
--- a/devtools/client/shared/DeveloperToolbar.jsm
+++ b/devtools/client/shared/developer-toolbar.js
@@ -4,16 +4,13 @@
 
 "use strict";
 
-this.EXPORTED_SYMBOLS = [ "DeveloperToolbar", "CommandUtils" ];
-
 const NS_XHTML = "http://www.w3.org/1999/xhtml";
 const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
-const { classes: Cc, interfaces: Ci, utils: Cu } = Components;
+const { Cc, Ci, Cu } = require("chrome");
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 
-const { require } = Cu.import("resource://devtools/shared/Loader.jsm", {});
 const { TargetFactory } = require("devtools/client/framework/target");
 const promise = require("promise");
 
@@ -233,7 +230,7 @@ var CommandUtils = {
   },
 };
 
-this.CommandUtils = CommandUtils;
+exports.CommandUtils = CommandUtils;
 
 /**
  * Due to a number of panel bugs we need a way to check if we are running on
@@ -257,7 +254,7 @@ XPCOMUtils.defineLazyGetter(this, "OS", function() {
  * @param aChromeWindow The browser window to which this toolbar is attached
  * @param aToolbarElement See browser.xul:<toolbar id="developer-toolbar">
  */
-this.DeveloperToolbar = function DeveloperToolbar(aChromeWindow, aToolbarElement)
+function DeveloperToolbar(aChromeWindow, aToolbarElement)
 {
   this._chromeWindow = aChromeWindow;
 
@@ -278,6 +275,7 @@ this.DeveloperToolbar = function DeveloperToolbar(aChromeWindow, aToolbarElement
 
   EventEmitter.decorate(this);
 }
+exports.DeveloperToolbar = DeveloperToolbar;
 
 /**
  * Inspector notifications dispatched through the nsIObserverService
diff --git a/devtools/client/shared/moz.build b/devtools/client/shared/moz.build
index 21f2dbbcf86..9679b644bb7 100644
--- a/devtools/client/shared/moz.build
+++ b/devtools/client/shared/moz.build
@@ -21,7 +21,7 @@ DevToolsModules(
     'css-parsing-utils.js',
     'Curl.jsm',
     'demangle.js',
-    'DeveloperToolbar.jsm',
+    'developer-toolbar.js',
     'devices.js',
     'DOMHelpers.jsm',
     'doorhanger.js',

From a708d7cbf6f70b065c18a16ca75e93f31100fb6a Mon Sep 17 00:00:00 2001
From: Alexandre Poirot <poirot.alex@gmail.com>
Date: Tue, 16 Feb 2016 07:23:57 -0800
Subject: [PATCH 06/45] Bug 1241050 - Cleanup developer-toolbar imports.
 r=jwalker

---
 devtools/client/shared/developer-toolbar.js | 63 ++++++---------------
 1 file changed, 17 insertions(+), 46 deletions(-)

diff --git a/devtools/client/shared/developer-toolbar.js b/devtools/client/shared/developer-toolbar.js
index 486319a93bf..ce5bf37ef26 100644
--- a/devtools/client/shared/developer-toolbar.js
+++ b/devtools/client/shared/developer-toolbar.js
@@ -4,60 +4,31 @@
 
 "use strict";
 
+const { Cc, Ci, Cu } = require("chrome");
+const promise = require("promise");
+const Services = require("Services");
+const { TargetFactory } = require("devtools/client/framework/target");
+const Telemetry = require("devtools/client/shared/telemetry");
+
 const NS_XHTML = "http://www.w3.org/1999/xhtml";
 const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
-const { Cc, Ci, Cu } = require("chrome");
-
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-Cu.import("resource://gre/modules/Services.jsm");
-
-const { TargetFactory } = require("devtools/client/framework/target");
-const promise = require("promise");
-
 const Node = Ci.nsIDOMNode;
 
-XPCOMUtils.defineLazyModuleGetter(this, "console",
-                                  "resource://gre/modules/Console.jsm");
+loader.lazyImporter(this, "console", "resource://gre/modules/Console.jsm");
+loader.lazyImporter(this, "PluralForm", "resource://gre/modules/PluralForm.jsm");
+loader.lazyImporter(this, "EventEmitter", "resource://devtools/shared/event-emitter.js");
 
-XPCOMUtils.defineLazyModuleGetter(this, "PluralForm",
-                                  "resource://gre/modules/PluralForm.jsm");
-
-XPCOMUtils.defineLazyModuleGetter(this, "EventEmitter",
-                                  "resource://devtools/shared/event-emitter.js");
-
-XPCOMUtils.defineLazyGetter(this, "prefBranch", function() {
-  let prefService = Cc["@mozilla.org/preferences-service;1"]
-                    .getService(Ci.nsIPrefService);
-  return prefService.getBranch(null)
+loader.lazyGetter(this, "prefBranch", function() {
+  return Services.prefs.getBranch(null)
                     .QueryInterface(Ci.nsIPrefBranch2);
 });
-
-XPCOMUtils.defineLazyGetter(this, "toolboxStrings", function () {
+loader.lazyGetter(this, "toolboxStrings", function () {
   return Services.strings.createBundle("chrome://devtools/locale/toolbox.properties");
 });
 
-const Telemetry = require("devtools/client/shared/telemetry");
-
-XPCOMUtils.defineLazyGetter(this, "gcliInit", function() {
-  try {
-    return require("devtools/shared/gcli/commands/index");
-  }
-  catch (ex) {
-    console.log(ex);
-  }
-});
-
-XPCOMUtils.defineLazyGetter(this, "util", () => {
-  return require("gcli/util/util");
-});
-
-Object.defineProperty(this, "ConsoleServiceListener", {
-  get: function() {
-    return require("devtools/shared/webconsole/utils").ConsoleServiceListener;
-  },
-  configurable: true,
-  enumerable: true
-});
+loader.lazyRequireGetter(this, "gcliInit", "devtools/shared/gcli/commands/index");
+loader.lazyRequireGetter(this, "util", "gcli/util/util");
+loader.lazyRequireGetter(this, "ConsoleServiceListener", "devtools/shared/webconsole/utils", true);
 
 /**
  * A collection of utilities to help working with commands
@@ -239,11 +210,11 @@ exports.CommandUtils = CommandUtils;
  * When bug 780102 is fixed all isLinux checks can be removed and we can revert
  * to using panels.
  */
-XPCOMUtils.defineLazyGetter(this, "isLinux", function() {
+loader.lazyGetter(this, "isLinux", function() {
   return OS == "Linux";
 });
 
-XPCOMUtils.defineLazyGetter(this, "OS", function() {
+loader.lazyGetter(this, "OS", function() {
   let os = Cc["@mozilla.org/xre/app-info;1"].getService(Ci.nsIXULRuntime).OS;
   return os;
 });

From c79fb62fb4d4466bf2fa3cab3f34c8022e78273f Mon Sep 17 00:00:00 2001
From: Alexandre Poirot <poirot.alex@gmail.com>
Date: Tue, 16 Feb 2016 07:23:57 -0800
Subject: [PATCH 07/45] Bug 1241050 - Ensure reloading the developer toolbar
 when using the reload addon. r=jwalker

---
 devtools/bootstrap.js | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/devtools/bootstrap.js b/devtools/bootstrap.js
index b9ab944c58b..7f5e5bbc516 100644
--- a/devtools/bootstrap.js
+++ b/devtools/bootstrap.js
@@ -105,6 +105,24 @@ function reload(event) {
           }
         }, false);
       }
+
+      // Manually reload gcli if it has been used
+      // Bug 1248348: Inject the developer toolbar dynamically within browser/
+      // so that we can easily remove/reinject it
+      const desc = Object.getOwnPropertyDescriptor(window, "DeveloperToolbar");
+      if (desc && !desc.get) {
+        let wasVisible = window.DeveloperToolbar.visible;
+        window.DeveloperToolbar.hide()
+          .then(() => {
+            window.DeveloperToolbar.destroy();
+
+            let { DeveloperToolbar } = devtools.require("devtools/client/shared/developer-toolbar");
+            window.DeveloperToolbar = new DeveloperToolbar(window, window.document.getElementById("developer-toolbar"));
+            if (wasVisible) {
+              window.DeveloperToolbar.show();
+            }
+          });
+      }
     } else if (windowtype === "devtools:webide") {
       window.location.reload();
     } else if (windowtype === "devtools:webconsole") {

From 21c1fbaca8bdef5666cd870888f2e1daa23ce5ca Mon Sep 17 00:00:00 2001
From: Julian Descottes <jdescottes@mozilla.com>
Date: Mon, 15 Feb 2016 00:42:56 +0100
Subject: [PATCH 08/45] Bug 1224877 - fix animation_timeline_pause_button
 intermittent;r=pbro

---
 .../test/browser_animation_timeline_pause_button.js           | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/devtools/client/animationinspector/test/browser_animation_timeline_pause_button.js b/devtools/client/animationinspector/test/browser_animation_timeline_pause_button.js
index 51d91043f6c..49d440e0be0 100644
--- a/devtools/client/animationinspector/test/browser_animation_timeline_pause_button.js
+++ b/devtools/client/animationinspector/test/browser_animation_timeline_pause_button.js
@@ -65,8 +65,10 @@ add_task(function*() {
   info("Select a finite animation, reload the page and wait for the " +
        "animation to complete");
   yield selectNode(".negative-delay", inspector);
+
+  let onScrubberStopped = waitForScrubberStopped(timeline);
   yield reloadTab(inspector);
-  yield waitForScrubberStopped(timeline);
+  yield onScrubberStopped;
 
   ok(btn.classList.contains("paused"),
      "The button is in paused state once finite animations are done");

From e204838f11b8d226f39d19f473d8f0f53289c5f8 Mon Sep 17 00:00:00 2001
From: Julian Descottes <jdescottes@mozilla.com>
Date: Fri, 12 Feb 2016 11:03:34 +0100
Subject: [PATCH 09/45] Bug 1243131 - memory tool: select snapshot using
 ACCEL+{UP/DOWN};r=fitzgen

Adds a keydown listener on the memory panel window. Select previous/next snapshot
when user presses UP/DOWN with the accelKey modifier (metaKey on OSX, ctrlKey on
windows).

Keydown events with modifiers are no longer listened to by the tree node elements.

Updated tree node test.
Added new mochitest to test the new keyboard navigation on the census view. )
---
 devtools/client/memory/app.js                 | 33 +++++++
 .../client/memory/test/browser/browser.ini    |  1 +
 .../browser_memory_keyboard-snapshot-list.js  | 94 +++++++++++++++++++
 devtools/client/memory/test/browser/head.js   | 23 +++++
 .../test/mochitest/test_tree_06.html          | 29 ++++++
 devtools/client/shared/components/tree.js     |  5 +
 6 files changed, 185 insertions(+)
 create mode 100644 devtools/client/memory/test/browser/browser_memory_keyboard-snapshot-list.js

diff --git a/devtools/client/memory/app.js b/devtools/client/memory/app.js
index 0825cb9a024..35eb21834b8 100644
--- a/devtools/client/memory/app.js
+++ b/devtools/client/memory/app.js
@@ -3,6 +3,7 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 const { assert } = require("devtools/shared/DevToolsUtils");
+const { appinfo } = require("Services");
 const { DOM: dom, createClass, createFactory, PropTypes } = require("devtools/client/shared/vendor/react");
 const { connect } = require("devtools/client/shared/vendor/react-redux");
 const { breakdowns, diffingState, viewState } = require("./constants");
@@ -53,6 +54,17 @@ const MemoryApp = createClass({
     return {};
   },
 
+  componentDidMount() {
+    // Attach the keydown listener directly to the window. When an element that
+    // has the focus (such as a tree node) is removed from the DOM, the focus
+    // falls back to the body.
+    window.addEventListener("keydown", this.onKeyDown);
+  },
+
+  componentWillUnmount() {
+    window.removeEventListener("keydown", this.onKeyDown);
+  },
+
   childContextTypes: {
     front: PropTypes.any,
     heapWorker: PropTypes.any,
@@ -67,6 +79,27 @@ const MemoryApp = createClass({
     };
   },
 
+  onKeyDown(e) {
+    let { snapshots, dispatch, heapWorker } = this.props;
+    const selectedSnapshot = snapshots.find(s => s.selected);
+    const selectedIndex = snapshots.indexOf(selectedSnapshot);
+
+    let isOSX = appinfo.OS == "Darwin";
+    let isAccelKey = (isOSX && e.metaKey) || (!isOSX && e.ctrlKey);
+    // On ACCEL+UP, select previous snapshot.
+    if (isAccelKey && e.key === "ArrowUp") {
+      let previousIndex = Math.max(0, selectedIndex - 1);
+      let previousSnapshotId = snapshots[previousIndex].id;
+      dispatch(selectSnapshotAndRefresh(heapWorker, previousSnapshotId));
+    }
+    // On ACCEL+DOWN, select next snapshot.
+    if (isAccelKey && e.key === "ArrowDown") {
+      let nextIndex = Math.min(snapshots.length - 1, selectedIndex + 1);
+      let nextSnapshotId = snapshots[nextIndex].id;
+      dispatch(selectSnapshotAndRefresh(heapWorker, nextSnapshotId));
+    }
+  },
+
   render() {
     let {
       dispatch,
diff --git a/devtools/client/memory/test/browser/browser.ini b/devtools/client/memory/test/browser/browser.ini
index 29fee425dc4..769c61b3ca9 100644
--- a/devtools/client/memory/test/browser/browser.ini
+++ b/devtools/client/memory/test/browser/browser.ini
@@ -15,6 +15,7 @@ support-files =
 [browser_memory_dominator_trees_02.js]
 [browser_memory_filter_01.js]
 [browser_memory_keyboard.js]
+[browser_memory_keyboard-snapshot-list.js]
 [browser_memory_no_allocation_stacks.js]
 [browser_memory_no_auto_expand.js]
     skip-if = debug # bug 1219554
diff --git a/devtools/client/memory/test/browser/browser_memory_keyboard-snapshot-list.js b/devtools/client/memory/test/browser/browser_memory_keyboard-snapshot-list.js
new file mode 100644
index 00000000000..72614c0838e
--- /dev/null
+++ b/devtools/client/memory/test/browser/browser_memory_keyboard-snapshot-list.js
@@ -0,0 +1,94 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+// Test that using ACCEL+UP/DOWN, the user can navigate between snapshots.
+
+"use strict";
+
+const {
+  snapshotState
+} = require("devtools/client/memory/constants");
+const {
+  takeSnapshotAndCensus
+} = require("devtools/client/memory/actions/snapshot");
+
+const TEST_URL = "http://example.com/browser/devtools/client/memory/test/browser/doc_steady_allocation.html";
+
+this.test = makeMemoryTest(TEST_URL, function* ({ panel }) {
+  // Creating snapshots already takes ~25 seconds on linux 32 debug machines
+  // which makes the test very likely to go over the allowed timeout
+  requestLongerTimeout(2);
+
+  const heapWorker = panel.panelWin.gHeapAnalysesClient;
+  const front = panel.panelWin.gFront;
+  const store = panel.panelWin.gStore;
+  const { dispatch } = store;
+  const doc = panel.panelWin.document;
+
+  info("Take 3 snapshots");
+  dispatch(takeSnapshotAndCensus(front, heapWorker));
+  dispatch(takeSnapshotAndCensus(front, heapWorker));
+  dispatch(takeSnapshotAndCensus(front, heapWorker));
+
+  yield waitUntilState(store, state =>
+    state.snapshots.length == 3 &&
+    state.snapshots.every(s => s.state === snapshotState.SAVED_CENSUS));
+  ok(true, "All snapshots are in SAVED_CENSUS state");
+
+  yield waitUntilSnapshotSelected(store, 2);
+  ok(true, "Third snapshot selected after creating all snapshots.");
+
+  info("Press ACCEL+UP key, expect second snapshot selected.");
+  EventUtils.synthesizeKey("VK_UP", { accelKey: true }, panel.panelWin);
+  yield waitUntilSnapshotSelected(store, 1);
+  ok(true, "Second snapshot selected after alt+UP.");
+
+  info("Press ACCEL+UP key, expect first snapshot selected.");
+  EventUtils.synthesizeKey("VK_UP", { accelKey: true }, panel.panelWin);
+  yield waitUntilSnapshotSelected(store, 0);
+  ok(true, "First snapshot is selected after ACCEL+UP");
+
+  info("Check ACCEL+UP is a noop when the first snapshot is selected.");
+  EventUtils.synthesizeKey("VK_UP", { accelKey: true }, panel.panelWin);
+  // We assume the snapshot selection should be synchronous here.
+  is(getSelectedSnapshotIndex(store), 0, "First snapshot is still selected");
+
+  info("Press ACCEL+DOWN key, expect second snapshot selected.");
+  EventUtils.synthesizeKey("VK_DOWN", { accelKey: true }, panel.panelWin);
+  yield waitUntilSnapshotSelected(store, 1);
+  ok(true, "Second snapshot is selected after ACCEL+DOWN");
+
+  info("Click on first node.");
+  let firstNode = doc.querySelector(".tree .heap-tree-item-name");
+  EventUtils.synthesizeMouseAtCenter(firstNode, {}, panel.panelWin);
+  yield waitUntilState(store, state => state.snapshots[1].census.focused ===
+      state.snapshots[1].census.report.children[0]
+  );
+  ok(true, "First root is selected after click.");
+
+  info("Press DOWN key, expect second root focused.");
+  EventUtils.synthesizeKey("VK_DOWN", {}, panel.panelWin);
+  yield waitUntilState(store, state => state.snapshots[1].census.focused ===
+      state.snapshots[1].census.report.children[1]
+  );
+  ok(true, "Second root is selected after pressing DOWN.");
+  is(getSelectedSnapshotIndex(store), 1, "Second snapshot is still selected");
+
+  info("Press UP key, expect second root focused.");
+  EventUtils.synthesizeKey("VK_UP", {}, panel.panelWin);
+  yield waitUntilState(store, state => state.snapshots[1].census.focused ===
+      state.snapshots[1].census.report.children[0]
+  );
+  ok(true, "First root is selected after pressing UP.");
+  is(getSelectedSnapshotIndex(store), 1, "Second snapshot is still selected");
+
+  info("Press ACCEL+DOWN key, expect third snapshot selected.");
+  EventUtils.synthesizeKey("VK_DOWN", { accelKey: true }, panel.panelWin);
+  yield waitUntilSnapshotSelected(store, 2);
+  ok(true, "Thirdˆ snapshot is selected after ACCEL+DOWN");
+
+  info("Check ACCEL+DOWN is a noop when the last snapshot is selected.");
+  EventUtils.synthesizeKey("VK_DOWN", { accelKey: true }, panel.panelWin);
+  // We assume the snapshot selection should be synchronous here.
+  is(getSelectedSnapshotIndex(store), 2, "Third snapshot is still selected");
+});
diff --git a/devtools/client/memory/test/browser/head.js b/devtools/client/memory/test/browser/head.js
index a6f51e8381b..a9d7f445e68 100644
--- a/devtools/client/memory/test/browser/head.js
+++ b/devtools/client/memory/test/browser/head.js
@@ -142,3 +142,26 @@ function getDisplayedSnapshotStatus(document) {
   const status = document.querySelector(".snapshot-status");
   return status ? status.textContent.trim() : null;
 }
+
+/**
+ * Get the index of the currently selected snapshot.
+ *
+ * @return {Number}
+ */
+function getSelectedSnapshotIndex(store) {
+  let snapshots = store.getState().snapshots;
+  let selectedSnapshot = snapshots.find(s => s.selected);
+  return snapshots.indexOf(selectedSnapshot);
+}
+
+/**
+ * Returns a promise that will resolve when the snapshot with provided index
+ * becomes selected.
+ *
+ * @return {Promise}
+ */
+function waitUntilSnapshotSelected(store, snapshotIndex) {
+  return waitUntilState(store, state =>
+    state.snapshots[snapshotIndex] &&
+    state.snapshots[snapshotIndex].selected === true);
+}
diff --git a/devtools/client/shared/components/test/mochitest/test_tree_06.html b/devtools/client/shared/components/test/mochitest/test_tree_06.html
index 5e4259358fb..8b673e74d99 100644
--- a/devtools/client/shared/components/test/mochitest/test_tree_06.html
+++ b/devtools/client/shared/components/test/mochitest/test_tree_06.html
@@ -276,6 +276,35 @@ window.onload = Task.async(function* () {
       "-N:false",
       "--O:false",
     ], "After the RIGHT, K should be focused.");
+
+    // Check that keys are ignored if any modifier is present.
+    let keysWithModifier = [
+      { key: "ArrowDown", altKey: true },
+      { key: "ArrowDown", ctrlKey: true },
+      { key: "ArrowDown", metaKey: true },
+      { key: "ArrowDown", shiftKey: true },
+    ];
+    for (let key of keysWithModifier) {
+      Simulate.keyDown(document.querySelector(".tree"), key);
+      yield forceRender(tree);
+      isRenderedTree(document.body.textContent, [
+        "A:false",
+        "-B:false",
+        "--E:false",
+        "---K:true",
+        "---L:false",
+        "--F:false",
+        "--G:false",
+        "-C:false",
+        "--H:false",
+        "--I:false",
+        "-D:false",
+        "--J:false",
+        "M:false",
+        "-N:false",
+        "--O:false",
+      ], "After DOWN + (alt|ctrl|meta|shift), K should remain focused.");
+    }
   } catch(e) {
     ok(false, "Got an error: " + DevToolsUtils.safeErrorString(e));
   } finally {
diff --git a/devtools/client/shared/components/tree.js b/devtools/client/shared/components/tree.js
index bf441ad3d51..bb6cfb38912 100644
--- a/devtools/client/shared/components/tree.js
+++ b/devtools/client/shared/components/tree.js
@@ -405,6 +405,11 @@ const Tree = module.exports = createClass({
       return;
     }
 
+    // Allow parent nodes to use navigation arrows with modifiers.
+    if (e.altKey || e.ctrlKey || e.shiftKey || e.metaKey) {
+      return;
+    }
+
     // Prevent scrolling when pressing navigation keys. Guard against mocked
     // events received when testing.
     if (e.nativeEvent && e.nativeEvent.preventDefault) {

From d8f6c7f4a3fcc5942a512e2fe0fd532d53263466 Mon Sep 17 00:00:00 2001
From: Felipe Gomes <felipc@gmail.com>
Date: Tue, 16 Feb 2016 13:28:40 -0200
Subject: [PATCH 10/45] Bug 1094761 - Fix browser_contextSearchTabPosition.js
 to not hit the network. r=Florian

MozReview-Commit-ID: 9VrFlhmWaXv
---
 browser/base/content/test/general/browser.ini   |  2 --
 browser/components/search/test/browser.ini      |  2 ++
 .../test}/browser_contextSearchTabPosition.js   | 17 +++++++++++------
 3 files changed, 13 insertions(+), 8 deletions(-)
 rename browser/{base/content/test/general => components/search/test}/browser_contextSearchTabPosition.js (85%)

diff --git a/browser/base/content/test/general/browser.ini b/browser/base/content/test/general/browser.ini
index 392f5020596..d5621869a27 100644
--- a/browser/base/content/test/general/browser.ini
+++ b/browser/base/content/test/general/browser.ini
@@ -290,8 +290,6 @@ skip-if = os == 'win' || e10s # Bug 1159268 - Need a content-process safe versio
 skip-if = e10s # Bug 1094510 - test hits the network in e10s mode only
 [browser_clipboard.js]
 [browser_contentAreaClick.js]
-[browser_contextSearchTabPosition.js]
-skip-if = os == "mac" || e10s # bug 967013; e10s: bug 1094761 - test hits the network in e10s, causing next test to crash
 [browser_ctrlTab.js]
 [browser_datachoices_notification.js]
 skip-if = !datareporting
diff --git a/browser/components/search/test/browser.ini b/browser/components/search/test/browser.ini
index 5d5745a2bda..39d8d1953ba 100644
--- a/browser/components/search/test/browser.ini
+++ b/browser/components/search/test/browser.ini
@@ -21,6 +21,8 @@ support-files =
 [browser_bing.js]
 [browser_bing_behavior.js]
 [browser_contextmenu.js]
+[browser_contextSearchTabPosition.js]
+skip-if = os == "mac" # bug 967013
 [browser_eBay.js]
 [browser_eBay_behavior.js]
 [browser_google.js]
diff --git a/browser/base/content/test/general/browser_contextSearchTabPosition.js b/browser/components/search/test/browser_contextSearchTabPosition.js
similarity index 85%
rename from browser/base/content/test/general/browser_contextSearchTabPosition.js
rename to browser/components/search/test/browser_contextSearchTabPosition.js
index 76646789000..b928a36979b 100644
--- a/browser/base/content/test/general/browser_contextSearchTabPosition.js
+++ b/browser/components/search/test/browser_contextSearchTabPosition.js
@@ -3,12 +3,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 add_task(function* test() {
-
-  // Will need to be changed if Google isn't the default search engine.
-  // Note: geoSpecificDefaults are disabled for mochitests, so this is the
-  // non-US en-US default.
-  let histogramKey = "google.contextmenu";
+  let engine = yield promiseNewEngine("testEngine.xml");
+  let histogramKey = "other-" + engine.name + ".contextmenu";
   let numSearchesBefore = 0;
+
   try {
     let hs = Services.telemetry.getKeyedHistogramById("SEARCH_COUNTS").snapshot();
     if (histogramKey in hs) {
@@ -19,7 +17,7 @@ add_task(function* test() {
   }
 
   let tabs = [];
-  let tabsLoadedDeferred = Promise.defer();
+  let tabsLoadedDeferred = new Deferred();
 
   function tabAdded(event) {
     let tab = event.target;
@@ -54,3 +52,10 @@ add_task(function* test() {
   Assert.equal(hs[histogramKey].sum, numSearchesBefore + 2,
                "The histogram must contain the correct search count");
 });
+
+function Deferred() {
+  this.promise = new Promise((resolve, reject) => {
+    this.resolve = resolve;
+    this.reject = reject;
+  });
+}

From 06a5ff290aaa8f03c71afa01bcfd516f727c884d Mon Sep 17 00:00:00 2001
From: Felipe Gomes <felipc@gmail.com>
Date: Tue, 16 Feb 2016 13:28:40 -0200
Subject: [PATCH 11/45] Bug 1248494 - Fix browser_bug538331.js for e10s. r=Enn

MozReview-Commit-ID: Dw90bxM7cKm
---
 browser/components/test/browser.ini          | 1 -
 browser/components/test/browser_bug538331.js | 7 ++-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/browser/components/test/browser.ini b/browser/components/test/browser.ini
index a6c154438a8..5e7a7ccc0eb 100644
--- a/browser/components/test/browser.ini
+++ b/browser/components/test/browser.ini
@@ -1,4 +1,3 @@
 [DEFAULT]
 
 [browser_bug538331.js]
-skip-if = e10s # Bug ?????? - child process crash, but only when run as part of the suite (ie, probably not actually this tests fault!?)
diff --git a/browser/components/test/browser_bug538331.js b/browser/components/test/browser_bug538331.js
index d8abb25045b..fce3790a055 100644
--- a/browser/components/test/browser_bug538331.js
+++ b/browser/components/test/browser_bug538331.js
@@ -361,11 +361,8 @@ function testShowNotification()
         if (i == (BG_NOTIFY_TESTS.length - 1)) {
           // Wait for any windows caught by the windowcatcher to close
           gWindowCatcher.finish(function () {
+            BrowserTestUtils.waitForNewTab(gBrowser).then(testNotificationURL);
             button.click();
-            gBrowser.selectedBrowser.addEventListener("load", function () {
-              gBrowser.selectedBrowser.removeEventListener("load", arguments.callee, true);
-              testNotificationURL();
-            }, true);
           });
         } else {
           notifyBox.removeAllNotifications(true);
@@ -389,7 +386,7 @@ function testNotificationURL()
 {
   ok(true, "Test testNotificationURL: clicking the notification button " +
            "opened the url specified by the update");
-  let href = gBrowser.selectedBrowser.contentWindow.location.href;
+  let href = gBrowser.currentURI.spec;
   let expectedURL = BG_NOTIFY_TESTS[BG_NOTIFY_TESTS.length - 1].notificationURL;
   is(href, expectedURL, "The url opened from the notification should be the " +
      "url provided by the update");

From a6c4043332ff2ddad682e76cacfb9b3ca8e12aad Mon Sep 17 00:00:00 2001
From: Felipe Gomes <felipc@gmail.com>
Date: Tue, 16 Feb 2016 13:28:40 -0200
Subject: [PATCH 12/45] Bug 1150147 - Re-enable browser_SocialProvider.js for
 e10s, as it appears to be working fine. rs=me

MozReview-Commit-ID: DYK8RvIBJf6
---
 toolkit/components/social/test/browser/browser.ini | 1 -
 1 file changed, 1 deletion(-)

diff --git a/toolkit/components/social/test/browser/browser.ini b/toolkit/components/social/test/browser/browser.ini
index 7b18221e7a9..2d36a995fd1 100644
--- a/toolkit/components/social/test/browser/browser.ini
+++ b/toolkit/components/social/test/browser/browser.ini
@@ -16,7 +16,6 @@ support-files =
 
 [browser_workerAPI.js]
 [browser_SocialProvider.js]
-skip-if = e10s && debug # Leaking docshells (bug 1150147)
 [browser_notifications.js]
 
 # These tests are currently unreliable on ASAN builds with remote frameworkers.

From 14a3cd3a674add880f10e4d6894d76d62cfec6c8 Mon Sep 17 00:00:00 2001
From: Felipe Gomes <felipc@gmail.com>
Date: Tue, 16 Feb 2016 13:28:40 -0200
Subject: [PATCH 13/45] Bug 1212647 - Re-enable browser_search_favicon.js for
 e10s, as it appears to be working fine. rs=me

MozReview-Commit-ID: EI2CizDWK4m
---
 browser/base/content/test/general/browser.ini | 1 -
 1 file changed, 1 deletion(-)

diff --git a/browser/base/content/test/general/browser.ini b/browser/base/content/test/general/browser.ini
index d5621869a27..3185c7d9fe3 100644
--- a/browser/base/content/test/general/browser.ini
+++ b/browser/base/content/test/general/browser.ini
@@ -136,7 +136,6 @@ skip-if = e10s # Bug 1093153 - no about:home support yet
 [browser_action_searchengine_alias.js]
 [browser_addKeywordSearch.js]
 [browser_search_favicon.js]
-skip-if = e10s # Bug 1212647
 [browser_alltabslistener.js]
 [browser_audioTabIcon.js]
 [browser_autocomplete_a11y_label.js]

From 47ea363ca9e4deb2d98302d46b07c416948e3505 Mon Sep 17 00:00:00 2001
From: Julian Descottes <jdescottes@mozilla.com>
Date: Fri, 12 Feb 2016 01:43:44 +0100
Subject: [PATCH 14/45] Bug 1243695 - ensure caret is visible in ruleview prop
 editor;r=miker

---
 devtools/client/shared/inplace-editor.js | 2 ++
 devtools/client/themes/rules.css         | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/devtools/client/shared/inplace-editor.js b/devtools/client/shared/inplace-editor.js
index c2a9bfcd553..247c6ab99a0 100644
--- a/devtools/client/shared/inplace-editor.js
+++ b/devtools/client/shared/inplace-editor.js
@@ -386,6 +386,8 @@ InplaceEditor.prototype = {
       // If the editor is empty use a width corresponding to 1 character.
       this.input.style.width = "1ch";
     } else {
+      // Add 2 pixels to ensure the caret will be visible
+      width = width + 2;
       this.input.style.width = width + "px";
     }
   },
diff --git a/devtools/client/themes/rules.css b/devtools/client/themes/rules.css
index c9bd4a77084..5ece1bc11ce 100644
--- a/devtools/client/themes/rules.css
+++ b/devtools/client/themes/rules.css
@@ -319,7 +319,7 @@
 .styleinspector-propertyeditor {
   border: 1px solid #CCC;
   padding: 0;
-  margin: -1px;
+  margin: -1px -3px -1px -1px;
 }
 
 .ruleview-property {

From 8620edbdc83fbac60249a8a9df348e24898bf3a1 Mon Sep 17 00:00:00 2001
From: Nick Fitzgerald <fitzgen@gmail.com>
Date: Thu, 11 Feb 2016 14:32:00 +0100
Subject: [PATCH 15/45] Bug 1247658 - Expose a method to JS for find the
 shortest retaining paths of some nodes in a heap snapshot; r=bz r=jimb

This commit adds the `computeShortestPaths` method to the `HeapSnapshot` webidl
interface. It implements this new method on the
`mozilla::devtools::HeapSnapshot` class.
---
 devtools/shared/heapsnapshot/HeapSnapshot.cpp | 140 +++++++++++++++++-
 devtools/shared/heapsnapshot/HeapSnapshot.h   |   6 +
 ...st_HeapSnapshot_computeShortestPaths_01.js |  69 +++++++++
 ...st_HeapSnapshot_computeShortestPaths_02.js |  47 ++++++
 .../heapsnapshot/tests/unit/xpcshell.ini      |   2 +
 dom/webidl/HeapSnapshot.webidl                |  27 ++++
 6 files changed, 290 insertions(+), 1 deletion(-)
 create mode 100644 devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_computeShortestPaths_01.js
 create mode 100644 devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_computeShortestPaths_02.js

diff --git a/devtools/shared/heapsnapshot/HeapSnapshot.cpp b/devtools/shared/heapsnapshot/HeapSnapshot.cpp
index b7167dcfe0d..cdfc5cf66da 100644
--- a/devtools/shared/heapsnapshot/HeapSnapshot.cpp
+++ b/devtools/shared/heapsnapshot/HeapSnapshot.cpp
@@ -14,6 +14,7 @@
 #include "js/UbiNodeBreadthFirst.h"
 #include "js/UbiNodeCensus.h"
 #include "js/UbiNodeDominatorTree.h"
+#include "js/UbiNodeShortestPaths.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/CycleCollectedJSRuntime.h"
 #include "mozilla/devtools/AutoMemMap.h"
@@ -54,6 +55,7 @@ using ::google::protobuf::io::GzipInputStream;
 using ::google::protobuf::io::ZeroCopyInputStream;
 
 using JS::ubi::AtomOrTwoByteChars;
+using JS::ubi::ShortestPaths;
 
 MallocSizeOf
 GetCurrentThreadDebuggerMallocSizeOf()
@@ -572,7 +574,7 @@ HeapSnapshot::ComputeDominatorTree(ErrorResult& rv)
     maybeTree = JS::ubi::DominatorTree::Create(rt, nogc, getRoot());
   }
 
-  if (maybeTree.isNothing()) {
+  if (NS_WARN_IF(maybeTree.isNothing())) {
     rv.Throw(NS_ERROR_OUT_OF_MEMORY);
     return nullptr;
   }
@@ -580,6 +582,142 @@ HeapSnapshot::ComputeDominatorTree(ErrorResult& rv)
   return MakeAndAddRef<DominatorTree>(Move(*maybeTree), this, mParent);
 }
 
+void
+HeapSnapshot::ComputeShortestPaths(JSContext*cx, uint64_t start,
+                                   const Sequence<uint64_t>& targets,
+                                   uint64_t maxNumPaths,
+                                   JS::MutableHandleObject results,
+                                   ErrorResult& rv)
+{
+  // First ensure that our inputs are valid.
+
+  if (NS_WARN_IF(maxNumPaths == 0)) {
+    rv.Throw(NS_ERROR_INVALID_ARG);
+    return;
+  }
+
+  Maybe<JS::ubi::Node> startNode = getNodeById(start);
+  if (NS_WARN_IF(startNode.isNothing())) {
+    rv.Throw(NS_ERROR_INVALID_ARG);
+    return;
+  }
+
+  if (NS_WARN_IF(targets.Length() == 0)) {
+    rv.Throw(NS_ERROR_INVALID_ARG);
+    return;
+  }
+
+  // Aggregate the targets into a set and make sure that they exist in the heap
+  // snapshot.
+
+  JS::ubi::NodeSet targetsSet;
+  if (NS_WARN_IF(!targetsSet.init())) {
+    rv.Throw(NS_ERROR_OUT_OF_MEMORY);
+    return;
+  }
+
+  for (const auto& target : targets) {
+    Maybe<JS::ubi::Node> targetNode = getNodeById(target);
+    if (NS_WARN_IF(targetNode.isNothing())) {
+      rv.Throw(NS_ERROR_INVALID_ARG);
+      return;
+    }
+
+    if (NS_WARN_IF(!targetsSet.put(*targetNode))) {
+      rv.Throw(NS_ERROR_OUT_OF_MEMORY);
+      return;
+    }
+  }
+
+  // Walk the heap graph and find the shortest paths.
+
+  Maybe<ShortestPaths> maybeShortestPaths;
+  {
+    auto ccrt = CycleCollectedJSRuntime::Get();
+    MOZ_ASSERT(ccrt);
+    auto rt = ccrt->Runtime();
+    MOZ_ASSERT(rt);
+    JS::AutoCheckCannotGC nogc(rt);
+    maybeShortestPaths = ShortestPaths::Create(rt, nogc, maxNumPaths, *startNode,
+                                               Move(targetsSet));
+  }
+
+  if (NS_WARN_IF(maybeShortestPaths.isNothing())) {
+    rv.Throw(NS_ERROR_OUT_OF_MEMORY);
+    return;
+  }
+
+  auto& shortestPaths = *maybeShortestPaths;
+
+  // Convert the results into a Map object mapping target node IDs to arrays of
+  // paths found.
+
+  RootedObject resultsMap(cx, JS::NewMapObject(cx));
+  if (NS_WARN_IF(!resultsMap)) {
+    rv.Throw(NS_ERROR_OUT_OF_MEMORY);
+    return;
+  }
+
+  for (auto range = shortestPaths.eachTarget(); !range.empty(); range.popFront()) {
+    JS::RootedValue key(cx, JS::NumberValue(range.front().identifier()));
+    JS::AutoValueVector paths(cx);
+
+    bool ok = shortestPaths.forEachPath(range.front(), [&](JS::ubi::Path& path) {
+      JS::AutoValueVector pathValues(cx);
+
+      for (JS::ubi::BackEdge* edge : path) {
+        JS::RootedObject pathPart(cx, JS_NewPlainObject(cx));
+        if (!pathPart) {
+          return false;
+        }
+
+        JS::RootedValue predecessor(cx, NumberValue(edge->predecessor().identifier()));
+        if (!JS_DefineProperty(cx, pathPart, "predecessor", predecessor, JSPROP_ENUMERATE)) {
+          return false;
+        }
+
+        RootedValue edgeNameVal(cx, NullValue());
+        if (edge->name()) {
+          RootedString edgeName(cx, JS_AtomizeUCString(cx, edge->name().get()));
+          if (!edgeName) {
+            return false;
+          }
+          edgeNameVal = StringValue(edgeName);
+        }
+
+        if (!JS_DefineProperty(cx, pathPart, "edge", edgeNameVal, JSPROP_ENUMERATE)) {
+          return false;
+        }
+
+        if (!pathValues.append(ObjectValue(*pathPart))) {
+          return false;
+        }
+      }
+
+      RootedObject pathObj(cx, JS_NewArrayObject(cx, pathValues));
+      return pathObj && paths.append(ObjectValue(*pathObj));
+    });
+
+    if (NS_WARN_IF(!ok)) {
+      rv.Throw(NS_ERROR_OUT_OF_MEMORY);
+      return;
+    }
+
+    JS::RootedObject pathsArray(cx, JS_NewArrayObject(cx, paths));
+    if (NS_WARN_IF(!pathsArray)) {
+      rv.Throw(NS_ERROR_OUT_OF_MEMORY);
+      return;
+    }
+
+    JS::RootedValue pathsVal(cx, ObjectValue(*pathsArray));
+    if (NS_WARN_IF(!JS::MapSet(cx, resultsMap, key, pathsVal))) {
+      rv.Throw(NS_ERROR_OUT_OF_MEMORY);
+      return;
+    }
+  }
+
+  results.set(resultsMap);
+}
 
 /*** Saving Heap Snapshots ************************************************************************/
 
diff --git a/devtools/shared/heapsnapshot/HeapSnapshot.h b/devtools/shared/heapsnapshot/HeapSnapshot.h
index efc80c25cc8..8e591d9c900 100644
--- a/devtools/shared/heapsnapshot/HeapSnapshot.h
+++ b/devtools/shared/heapsnapshot/HeapSnapshot.h
@@ -164,6 +164,12 @@ public:
 
   already_AddRefed<DominatorTree> ComputeDominatorTree(ErrorResult& rv);
 
+  void ComputeShortestPaths(JSContext*cx, uint64_t start,
+                            const dom::Sequence<uint64_t>& targets,
+                            uint64_t maxNumPaths,
+                            JS::MutableHandleObject results,
+                            ErrorResult& rv);
+
   dom::Nullable<uint64_t> GetCreationTime() {
     static const uint64_t maxTime = uint64_t(1) << 53;
     if (timestamp.isSome() && timestamp.ref() <= maxTime) {
diff --git a/devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_computeShortestPaths_01.js b/devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_computeShortestPaths_01.js
new file mode 100644
index 00000000000..2ec577bd00e
--- /dev/null
+++ b/devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_computeShortestPaths_01.js
@@ -0,0 +1,69 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+// Sanity test that we can compute shortest paths.
+//
+// Because the actual heap graph is too unpredictable and likely to drastically
+// change as various implementation bits change, we don't test exact paths
+// here. See js/src/jsapi-tests/testUbiNode.cpp for such tests, where we can
+// control the specific graph shape and structure and so testing exact paths is
+// reliable.
+
+function run_test() {
+  const path = ChromeUtils.saveHeapSnapshot({ runtime: true });
+  const snapshot = ChromeUtils.readHeapSnapshot(path);
+
+  const dominatorTree = snapshot.computeDominatorTree();
+  const dominatedByRoot = dominatorTree.getImmediatelyDominated(dominatorTree.root)
+                                       .slice(0, 10);
+  ok(dominatedByRoot);
+  ok(dominatedByRoot.length);
+
+  const targetSet = new Set(dominatedByRoot);
+
+  const shortestPaths = snapshot.computeShortestPaths(dominatorTree.root, dominatedByRoot, 2);
+  ok(shortestPaths);
+  ok(shortestPaths instanceof Map);
+  ok(shortestPaths.size === targetSet.size);
+
+  for (let [target, paths] of shortestPaths) {
+    ok(targetSet.has(target),
+       "We should only get paths for our targets");
+    targetSet.delete(target);
+
+    ok(paths.length > 0,
+       "We must have at least one path, since the target is dominated by the root");
+    ok(paths.length <= 2,
+       "Should not have recorded more paths than the max requested");
+
+    dumpn("---------------------");
+    dumpn("Shortest paths for 0x" + target.toString(16) + ":");
+    for (let path of paths) {
+      dumpn("    path =");
+      for (let part of path) {
+        dumpn("        predecessor: 0x" + part.predecessor.toString(16) +
+              "; edge: " + part.edge);
+      }
+    }
+    dumpn("---------------------");
+
+    for (let path of paths) {
+      ok(path.length > 0, "Cannot have zero length paths");
+      ok(path[0].predecessor === dominatorTree.root,
+         "The first predecessor is always our start node");
+
+      for (let part of path) {
+        ok(part.predecessor, "Each part of a path has a predecessor");
+        ok(!!snapshot.describeNode({ by: "count", count: true, bytes: true},
+                                   part.predecessor),
+           "The predecessor is in the heap snapshot");
+        ok("edge" in part, "Each part has an (potentially null) edge property");
+      }
+    }
+  }
+
+  ok(targetSet.size === 0,
+     "We found paths for all of our targets");
+
+  do_test_finished();
+}
diff --git a/devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_computeShortestPaths_02.js b/devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_computeShortestPaths_02.js
new file mode 100644
index 00000000000..04fe58733b2
--- /dev/null
+++ b/devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_computeShortestPaths_02.js
@@ -0,0 +1,47 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+// Test computing shortest paths with invalid arguments.
+
+function run_test() {
+  const path = ChromeUtils.saveHeapSnapshot({ runtime: true });
+  const snapshot = ChromeUtils.readHeapSnapshot(path);
+
+  const dominatorTree = snapshot.computeDominatorTree();
+  const target = dominatorTree.getImmediatelyDominated(dominatorTree.root).pop();
+  ok(target);
+
+  let threw = false;
+  try {
+    snapshot.computeShortestPaths(0, [target], 2);
+  } catch (_) {
+    threw = true;
+  }
+  ok(threw, "invalid start node should throw");
+
+  threw = false;
+  try {
+    snapshot.computeShortestPaths(dominatorTree.root, [0], 2);
+  } catch (_) {
+    threw = true;
+  }
+  ok(threw, "invalid target nodes should throw");
+
+  threw = false;
+  try {
+    snapshot.computeShortestPaths(dominatorTree.root, [], 2);
+  } catch (_) {
+    threw = true;
+  }
+  ok(threw, "empty target nodes should throw");
+
+  threw = false;
+  try {
+    snapshot.computeShortestPaths(dominatorTree.root, [target], 0);
+  } catch (_) {
+    threw = true;
+  }
+  ok(threw, "0 max paths should throw");
+
+  do_test_finished();
+}
diff --git a/devtools/shared/heapsnapshot/tests/unit/xpcshell.ini b/devtools/shared/heapsnapshot/tests/unit/xpcshell.ini
index c79371e0f68..1969ce5ec38 100644
--- a/devtools/shared/heapsnapshot/tests/unit/xpcshell.ini
+++ b/devtools/shared/heapsnapshot/tests/unit/xpcshell.ini
@@ -66,6 +66,8 @@ support-files =
 [test_HeapSnapshot_creationTime_01.js]
 [test_HeapSnapshot_deepStack_01.js]
 [test_HeapSnapshot_describeNode_01.js]
+[test_HeapSnapshot_computeShortestPaths_01.js]
+[test_HeapSnapshot_computeShortestPaths_02.js]
 [test_HeapSnapshot_takeCensus_01.js]
 [test_HeapSnapshot_takeCensus_02.js]
 [test_HeapSnapshot_takeCensus_03.js]
diff --git a/dom/webidl/HeapSnapshot.webidl b/dom/webidl/HeapSnapshot.webidl
index bec4503648b..f1418dc2821 100644
--- a/dom/webidl/HeapSnapshot.webidl
+++ b/dom/webidl/HeapSnapshot.webidl
@@ -75,4 +75,31 @@ interface HeapSnapshot {
    */
   [Throws]
   DominatorTree computeDominatorTree();
+
+  /**
+   * Find the shortest retaining paths from the node associated with the ID
+   * `start` to each node associated with the IDs in `targets`. Find at most
+   * `maxNumPaths` retaining paths for each target node.
+   *
+   * The return value is a Map object mapping from each target node ID to an
+   * array of retaining paths. The array may be empty if we did not find any
+   * retaining paths.
+   *
+   * A path is an array of objects of the form:
+   *
+   *     {
+   *         predecessor: <node ID>,
+   *         edge: <string or null>,
+   *     }
+   *
+   * The first `predecessor` will always be `start`. The last edge in the path
+   * leads to the `target` node that is mapped to the path; the `target` does
+   * not appear as a `predecessor` in the path.
+   *
+   * Throws when `start` or any of the elements of `targets` are not an ID of a
+   * node in the snapshot, or if we encounter an out of memory exception.
+   */
+  [Throws]
+  object computeShortestPaths(NodeId start, sequence<NodeId> targets,
+                              unsigned long long maxNumPaths);
 };

From ec4be39d423acb54c2775b2dce1b864b34eaccd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A3o=20Gottwald?= <dao@mozilla.com>
Date: Tue, 16 Feb 2016 12:05:47 +0100
Subject: [PATCH 16/45] Bug 1248266 - Make recently added bookmarks
 keyboard-accessible by not using a vbox container. r=mak

---
 browser/base/content/browser-menubar.inc | 2 +-
 browser/base/content/browser-places.js   | 9 +++++----
 browser/base/content/browser.xul         | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/browser/base/content/browser-menubar.inc b/browser/base/content/browser-menubar.inc
index f85031c233f..f6c2c16ae69 100644
--- a/browser/base/content/browser-menubar.inc
+++ b/browser/base/content/browser-menubar.inc
@@ -453,8 +453,8 @@
                 key="bookmarkAllTabsKb"/>
       <menuseparator/>
       <menuitem label="&recentBookmarks.label;"
+                id="menu_recentBookmarks"
                 disabled="true"/>
-      <vbox id="menu_recentBookmarks"/>
       <menuseparator id="bookmarksToolbarSeparator"/>
       <menu id="bookmarksToolbarFolderMenu"
             class="menu-iconic bookmark-item"
diff --git a/browser/base/content/browser-places.js b/browser/base/content/browser-places.js
index 7672bededff..e4f85e14db7 100644
--- a/browser/base/content/browser-places.js
+++ b/browser/base/content/browser-places.js
@@ -1341,7 +1341,7 @@ var BookmarkingUI = {
     });
   },
 
-  _updateRecentBookmarks: function(container, extraCSSClass = "") {
+  _updateRecentBookmarks: function(aHeaderItem, extraCSSClass = "") {
     const kMaxResults = 5;
 
     let options = PlacesUtils.history.getNewQueryOptions();
@@ -1351,8 +1351,9 @@ var BookmarkingUI = {
     options.maxResults = kMaxResults;
     let query = PlacesUtils.history.getNewQuery();
 
-    while (container.firstChild) {
-      container.firstChild.remove();
+    while (aHeaderItem.nextSibling &&
+           aHeaderItem.nextSibling.localName == "menuitem") {
+      aHeaderItem.nextSibling.remove();
     }
 
     PlacesUtils.history.QueryInterface(Ci.nsPIPlacesDatabase)
@@ -1385,7 +1386,7 @@ var BookmarkingUI = {
           }
           fragment.appendChild(item);
         }
-        container.appendChild(fragment);
+        aHeaderItem.parentNode.insertBefore(fragment, aHeaderItem.nextSibling);
       },
       handleError: function (aError) {
         Cu.reportError("Error while attempting to show recent bookmarks: " + aError);
diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index 83ab38eac26..0cb5c50d94d 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -813,9 +813,9 @@
                       key="manBookmarkKb"/>
             <menuseparator/>
             <menuitem label="&recentBookmarks.label;"
+                      id="BMB_recentBookmarks"
                       disabled="true"
                       class="subviewbutton"/>
-            <vbox id="BMB_recentBookmarks"/>
             <menuseparator/>
             <menu id="BMB_bookmarksToolbar"
                   class="menu-iconic bookmark-item subviewbutton"

From f691bf71c19669144d67c246389257f56e30011d Mon Sep 17 00:00:00 2001
From: Allasso Travesser <allassopraise@gmail.com>
Date: Tue, 16 Feb 2016 16:34:38 +0100
Subject: [PATCH 17/45] Bug 1241837 - Use proxy for browsers property in
 tabbrowser instead of explicit array. r=dao

---
 browser/base/content/tabbrowser.xml           | 45 ++++++++++++-------
 .../components/sessionstore/SessionStore.jsm  |  5 +--
 2 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/browser/base/content/tabbrowser.xml b/browser/base/content/tabbrowser.xml
index e6c6455c0db..bde9c75e6f9 100644
--- a/browser/base/content/tabbrowser.xml
+++ b/browser/base/content/tabbrowser.xml
@@ -1863,8 +1863,7 @@
               }, 0, this.tabContainer);
             }
 
-            // invalidate caches
-            this._browsers = null;
+            // invalidate cache
             this._visibleTabs = null;
 
             this.tabContainer.appendChild(t);
@@ -2379,10 +2378,6 @@
 
             var wasPinned = aTab.pinned;
 
-            // Invalidate browsers cache, as the tab is removed from the
-            // tab container.
-            this._browsers = null;
-
             // Remove the tab ...
             this.tabContainer.removeChild(aTab);
 
@@ -2860,15 +2855,32 @@
                 onget="return this.mCurrentBrowser;"
                 readonly="true"/>
 
-      <property name="browsers" readonly="true">
-       <getter>
-          <![CDATA[
-            return this._browsers ||
-                   (this._browsers = Array.map(this.tabs, tab => tab.linkedBrowser));
-          ]]>
-        </getter>
-      </property>
-      <field name="_browsers">null</field>
+      <field name="browsers" readonly="true">
+        <![CDATA[
+          // This defines a proxy which allows us to access browsers by
+          // index without actually creating a full array of browsers.
+          new Proxy([], {
+            has: (target, name) => {
+              if (typeof name == "string" && Number.isInteger(parseInt(name))) {
+                return (name in this.tabs);
+              }
+              return false;
+            },
+            get: (target, name) => {
+              if (name == "length") {
+                return this.tabs.length;
+              }
+              if (typeof name == "string" && Number.isInteger(parseInt(name))) {
+                if (!(name in this.tabs)) {
+                  return undefined;
+                }
+                return this.tabs[name].linkedBrowser;
+              }
+              return target[name];
+            }
+          });
+        ]]>
+      </field>
 
       <!-- Moves a tab to a new browser window, unless it's already the only tab
            in the current window, in which case this will do nothing. -->
@@ -2929,8 +2941,7 @@
           this.mCurrentTab._logicallySelected = false;
           this.mCurrentTab._visuallySelected = false;
 
-          // invalidate caches
-          this._browsers = null;
+          // invalidate cache
           this._visibleTabs = null;
 
           // use .item() instead of [] because dragging to the end of the strip goes out of
diff --git a/browser/components/sessionstore/SessionStore.jsm b/browser/components/sessionstore/SessionStore.jsm
index 2d619afefe8..5abdfc9b0dc 100644
--- a/browser/components/sessionstore/SessionStore.jsm
+++ b/browser/components/sessionstore/SessionStore.jsm
@@ -1236,9 +1236,7 @@ var SessionStoreInternal = {
 
     var tabbrowser = aWindow.gBrowser;
 
-    // The tabbrowser binding will go away once the window is closed,
-    // so we'll hold a reference to the browsers in the closure here.
-    let browsers = tabbrowser.browsers;
+    let browsers = Array.from(tabbrowser.browsers);
 
     TAB_EVENTS.forEach(function(aEvent) {
       tabbrowser.tabContainer.removeEventListener(aEvent, this, true);
@@ -1320,7 +1318,6 @@ var SessionStoreInternal = {
         // access any DOM elements from aWindow within this callback unless
         // you're holding on to them in the closure.
 
-        // We can still access tabbrowser.browsers, thankfully.
         for (let browser of browsers) {
           if (this._closedWindowTabs.has(browser.permanentKey)) {
             let tabData = this._closedWindowTabs.get(browser.permanentKey);

From 7f69186f8e6c8d402a71ac5d88f8ebb263220240 Mon Sep 17 00:00:00 2001
From: Eric Hu <hu.eric@gmail.com>
Date: Fri, 12 Feb 2016 20:23:25 +0700
Subject: [PATCH 18/45] Bug 920169 - Remove references to C++ constants in
 Histograms.json. r=gfritzsche

---
 toolkit/components/telemetry/Histograms.json    |  8 ++++----
 toolkit/components/telemetry/Telemetry.cpp      | 17 +++++++++++++++++
 .../components/telemetry/bucket-whitelist.json  |  5 ++++-
 3 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/toolkit/components/telemetry/Histograms.json b/toolkit/components/telemetry/Histograms.json
index 01e74397265..5f7157069f4 100644
--- a/toolkit/components/telemetry/Histograms.json
+++ b/toolkit/components/telemetry/Histograms.json
@@ -307,7 +307,7 @@
     "alert_emails": ["dev-telemetry-gc-alerts@mozilla.org"],
     "expires_in_version": "never",
     "kind": "enumerated",
-    "n_values": "JS::gcreason::NUM_TELEMETRY_REASONS",
+    "n_values": 100,
     "description": "Reason (enum value) for initiating a GC"
   },
   "GC_IS_COMPARTMENTAL": {
@@ -449,14 +449,14 @@
     "alert_emails": ["dev-telemetry-gc-alerts@mozilla.org"],
     "expires_in_version": "never",
     "kind": "enumerated",
-    "n_values": "JS::gcreason::NUM_TELEMETRY_REASONS",
+    "n_values": 100,
     "description": "Reason (enum value) for initiating a minor GC"
   },
   "GC_MINOR_REASON_LONG": {
     "alert_emails": ["dev-telemetry-gc-alerts@mozilla.org"],
     "expires_in_version": "never",
     "kind": "enumerated",
-    "n_values": "JS::gcreason::NUM_TELEMETRY_REASONS",
+    "n_values": 100,
     "description": "Reason (enum value) that caused a long (>1ms) minor GC"
   },
   "GC_MINOR_US": {
@@ -3083,7 +3083,7 @@
   "STARTUP_MEASUREMENT_ERRORS": {
     "expires_in_version": "default",
     "kind": "enumerated",
-    "n_values": "mozilla::StartupTimeline::MAX_EVENT_ID",
+    "n_values": 16,
     "description": "Flags errors in startup calculation()"
   },
   "NETWORK_DISK_CACHE_OPEN": {
diff --git a/toolkit/components/telemetry/Telemetry.cpp b/toolkit/components/telemetry/Telemetry.cpp
index b3e575ec172..ac699e22950 100644
--- a/toolkit/components/telemetry/Telemetry.cpp
+++ b/toolkit/components/telemetry/Telemetry.cpp
@@ -1960,6 +1960,23 @@ mFailedLockCount(0)
   // histograms) using InitHistogramRecordingEnabled() will happen after instantiating
   // sTelemetry since it depends on the static GetKeyedHistogramById(...) - which
   // uses the singleton instance at sTelemetry.
+
+  // Some Telemetry histograms depend on the value of C++ constants and hardcode
+  // their values in Histograms.json.
+  // We add static asserts here for those values to match so that future changes
+  // don't go unnoticed.
+  // TODO: Compare explicitly with gHistograms[<histogram id>].bucketCount here
+  // once we can make gHistograms constexpr (requires VS2015).
+  static_assert((JS::gcreason::NUM_TELEMETRY_REASONS == 100),
+      "NUM_TELEMETRY_REASONS is assumed to be a fixed value in Histograms.json."
+      " If this was an intentional change, update this assert with its value "
+      "and update the n_values for the following in Histograms.json: "
+      "GC_MINOR_REASON, GC_MINOR_REASON_LONG, GC_REASON_2");
+  static_assert((mozilla::StartupTimeline::MAX_EVENT_ID == 16),
+      "MAX_EVENT_ID is assumed to be a fixed value in Histograms.json.  If this"
+      " was an intentional change, update this assert with its value and update"
+      " the n_values for the following in Histograms.json:"
+      " STARTUP_MEASUREMENT_ERRORS");
 }
 
 TelemetryImpl::~TelemetryImpl() {
diff --git a/toolkit/components/telemetry/bucket-whitelist.json b/toolkit/components/telemetry/bucket-whitelist.json
index afed5f30b9b..7cc352ec07b 100644
--- a/toolkit/components/telemetry/bucket-whitelist.json
+++ b/toolkit/components/telemetry/bucket-whitelist.json
@@ -182,5 +182,8 @@
   "LOOP_VIDEO_QUALITY_OUTBOUND_RTT",
   "LOOP_AUDIO_QUALITY_OUTBOUND_RTT",
   "LOOP_CALL_DURATION",
-  "GFX_CRASH"
+  "GFX_CRASH",
+  "GC_REASON_2",
+  "GC_MINOR_REASON",
+  "GC_MINOR_REASON_LONG"
 ]

From 58500c66b3d5bd8d644fe225736a154ce7e6298b Mon Sep 17 00:00:00 2001
From: Giorgos Logiotatidis <giorgos@mozilla.com>
Date: Mon, 15 Feb 2016 15:28:49 +0200
Subject: [PATCH 19/45] Bug 1248388 - Use snippets cdn. r=margaret

---
 mobile/android/app/mobile.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mobile/android/app/mobile.js b/mobile/android/app/mobile.js
index df30af46af5..9740bce9a29 100644
--- a/mobile/android/app/mobile.js
+++ b/mobile/android/app/mobile.js
@@ -860,7 +860,7 @@ pref("snav.enabled", true);
 // This url, if changed, MUST continue to point to an https url. Pulling arbitrary content to inject into
 // this page over http opens us up to a man-in-the-middle attack that we'd rather not face. If you are a downstream
 // repackager of this code using an alternate snippet url, please keep your users safe
-pref("browser.snippets.updateUrl", "https://snippets.mozilla.com/json/%SNIPPETS_VERSION%/%NAME%/%VERSION%/%APPBUILDID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/");
+pref("browser.snippets.updateUrl", "https://snippets.cdn.mozilla.net/json/%SNIPPETS_VERSION%/%NAME%/%VERSION%/%APPBUILDID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/");
 
 // How frequently we check for new snippets, in seconds (1 day)
 pref("browser.snippets.updateInterval", 86400);

From a5a294d01cfdde0d4b636b36f0b523401fcb22fc Mon Sep 17 00:00:00 2001
From: Johann Hofmann <mail@johann-hofmann.com>
Date: Tue, 24 Nov 2015 17:40:08 +0100
Subject: [PATCH 20/45] Bug 1225743 - Implement chrome.bookmarks.search. r=mak

---
 .../components/extensions/ext-bookmarks.js    |   4 +-
 .../extensions/schemas/bookmarks.json         |   2 +-
 .../test/mochitest/test_ext_bookmarks.html    | 151 ++++++++++++
 toolkit/components/places/Bookmarks.jsm       | 104 ++++++++
 .../tests/bookmarks/test_bookmarks_search.js  | 223 ++++++++++++++++++
 .../places/tests/bookmarks/xpcshell.ini       |   1 +
 6 files changed, 483 insertions(+), 2 deletions(-)
 create mode 100644 toolkit/components/places/tests/bookmarks/test_bookmarks_search.js

diff --git a/browser/components/extensions/ext-bookmarks.js b/browser/components/extensions/ext-bookmarks.js
index c1d759dd0b2..04f97d43528 100644
--- a/browser/components/extensions/ext-bookmarks.js
+++ b/browser/components/extensions/ext-bookmarks.js
@@ -111,7 +111,9 @@ extensions.registerSchemaAPI("bookmarks", "bookmarks", (extension, context) => {
         return getTree(id, false);
       },
 
-      // search
+      search: function(query) {
+        return Bookmarks.search(query).then(result => result.map(convert));
+      },
 
       create: function(bookmark) {
         let info = {
diff --git a/browser/components/extensions/schemas/bookmarks.json b/browser/components/extensions/schemas/bookmarks.json
index 09f67c26363..867bb76715c 100644
--- a/browser/components/extensions/schemas/bookmarks.json
+++ b/browser/components/extensions/schemas/bookmarks.json
@@ -234,7 +234,6 @@
       },
       {
         "name": "search",
-        "unsupported": true,
         "type": "function",
         "description": "Searches for BookmarkTreeNodes matching the given query. Queries specified with an object produce BookmarkTreeNodes matching all specified properties.",
         "async": "callback",
@@ -258,6 +257,7 @@
                   },
                   "url": {
                     "type": "string",
+                    "format": "url",
                     "optional": true,
                     "description": "The URL of the bookmark; matches verbatim. Note that folders have no URL."
                   },
diff --git a/toolkit/components/extensions/test/mochitest/test_ext_bookmarks.html b/toolkit/components/extensions/test/mochitest/test_ext_bookmarks.html
index 4d4a294d365..15ec4840e5a 100644
--- a/toolkit/components/extensions/test/mochitest/test_ext_bookmarks.html
+++ b/toolkit/components/extensions/test/mochitest/test_ext_bookmarks.html
@@ -87,6 +87,157 @@ function backgroundScript() {
   }).then(() => {
     browser.test.assertEq(5, failures, "Expected failures");
 
+  // test bookmarks.search
+  }).then(() => {
+    return Promise.all([
+      browser.bookmarks.create({title: "MØzillä", url: "http://møzîllä.örg"}),
+      browser.bookmarks.create({title: "Example", url: "http://example.org"}),
+      browser.bookmarks.create({title: "Mozilla Folder"}),
+      browser.bookmarks.create({title: "EFF", url: "http://eff.org"}),
+      browser.bookmarks.create({title: "Menu Item", url: "http://menu.org", parentId: "menu________"}),
+      browser.bookmarks.create({title: "Toolbar Item", url: "http://toolbar.org", parentId: "toolbar_____"}),
+    ]);
+  }).then(results => {
+    return Promise.all([
+      browser.bookmarks.create({title: "Mozilla", url: "http://allizom.org", parentId: results[1].id}),
+      browser.bookmarks.create({title: "Mozilla Corporation", url: "http://allizom.com", parentId: results[1].id}),
+      browser.bookmarks.create({title: "Firefox", url: "http://allizom.org/firefox", parentId: results[1].id}),
+    ]);
+  }).then(() => {
+  // returns all items on empty object
+
+    return browser.bookmarks.search({});
+  }).then(results => {
+    browser.test.assertTrue(results.length >= 9);
+
+  // throws an error for invalid query objects
+    return browser.bookmarks.search();
+  }).catch(error => {
+    browser.test.assertTrue(error.message.includes("Incorrect argument types for bookmarks.search"));
+
+    return browser.bookmarks.search(null);
+  }).catch(error => {
+    browser.test.assertTrue(error.message.includes("Incorrect argument types for bookmarks.search"));
+
+    return browser.bookmarks.search(function() {});
+  }).catch(error => {
+    browser.test.assertTrue(error.message.includes("Incorrect argument types for bookmarks.search"));
+
+    return browser.bookmarks.search({banana: "banana"});
+  }).catch(error => {
+    browser.test.assertTrue(error.message.includes("banana"));
+    browser.test.assertTrue(error.message.includes("bookmarks.search"));
+
+    return browser.bookmarks.search({url: "spider-man vs. batman"});
+  }).catch(error => {
+    browser.test.assertTrue(error.message.includes("spider-man vs. batman"));
+    browser.test.assertTrue(error.message.includes("not a valid URL"));
+    browser.test.assertTrue(error.message.includes("bookmarks.search"));
+
+  // queries the url
+    return browser.bookmarks.search("example.org");
+  }).then(results => {
+    browser.test.assertEq(1, results.length);
+    browser.test.assertEq("Example", results[0].title);
+    browser.test.assertEq("http://example.org/", results[0].url);
+    browser.test.assertEq(2, results[0].index);
+
+  // queries the title
+    return browser.bookmarks.search("EFF");
+  }).then(results => {
+    browser.test.assertEq(1, results.length);
+    browser.test.assertEq("EFF", results[0].title);
+    browser.test.assertEq("http://eff.org/", results[0].url);
+    browser.test.assertEq("unfiled_____", results[0].parentId);
+    browser.test.assertEq(0, results[0].index);
+
+  // finds menu items
+    return browser.bookmarks.search("Menu Item");
+  }).then(results => {
+    browser.test.assertEq(1, results.length);
+    browser.test.assertEq("Menu Item", results[0].title);
+    browser.test.assertEq("http://menu.org/", results[0].url);
+    browser.test.assertEq("menu________", results[0].parentId);
+
+  // finds toolbar items
+    return browser.bookmarks.search("Toolbar Item");
+  }).then(results => {
+    browser.test.assertEq(1, results.length);
+    browser.test.assertEq("Toolbar Item", results[0].title);
+    browser.test.assertEq("http://toolbar.org/", results[0].url);
+    browser.test.assertEq("toolbar_____", results[0].parentId);
+
+  // finds folders
+    return browser.bookmarks.search("Mozilla Folder");
+  }).then(results => {
+    browser.test.assertEq(1, results.length);
+    browser.test.assertEq("Mozilla Folder", results[0].title);
+
+  // is case-insensitive
+    return browser.bookmarks.search("corporation");
+  }).then(results => {
+    browser.test.assertEq(1, results.length);
+    browser.test.assertEq("Mozilla Corporation", results[0].title);
+
+  // is case-insensitive for non-ascii
+    return browser.bookmarks.search("MøZILLÄ");
+  }).then(results => {
+    browser.test.assertEq(1, results.length);
+    browser.test.assertEq("MØzillä", results[0].title);
+
+  // returns multiple results
+    return browser.bookmarks.search("allizom");
+  }).then(results => {
+    browser.test.assertEq(3, results.length);
+    browser.test.assertEq("Mozilla", results[0].title);
+    browser.test.assertEq("Mozilla Corporation", results[1].title);
+    browser.test.assertEq("Firefox", results[2].title);
+
+  // accepts a url field
+    return browser.bookmarks.search({url: "http://allizom.com/"});
+  }).then(results => {
+    browser.test.assertEq(1, results.length);
+    browser.test.assertEq("Mozilla Corporation", results[0].title);
+    browser.test.assertEq("http://allizom.com/", results[0].url);
+
+  // normalizes urls
+    return browser.bookmarks.search({url: "http://allizom.com"});
+  }).then(results => {
+    browser.test.assertEq(results.length, 1);
+    browser.test.assertEq("Mozilla Corporation", results[0].title);
+    browser.test.assertEq("http://allizom.com/", results[0].url);
+
+  // normalizes urls even more
+    return browser.bookmarks.search({url: "http:allizom.com"});
+  }).then(results => {
+    browser.test.assertEq(results.length, 1);
+    browser.test.assertEq("Mozilla Corporation", results[0].title);
+    browser.test.assertEq("http://allizom.com/", results[0].url);
+
+  // accepts a title field
+    return browser.bookmarks.search({title: "Mozilla"});
+  }).then(results => {
+    browser.test.assertEq(results.length, 1);
+    browser.test.assertEq("Mozilla", results[0].title);
+    browser.test.assertEq("http://allizom.org/", results[0].url);
+
+  // can combine title and query
+    return browser.bookmarks.search({title: "Mozilla", query: "allizom"});
+  }).then(results => {
+    browser.test.assertEq(1, results.length);
+    browser.test.assertEq("Mozilla", results[0].title);
+    browser.test.assertEq("http://allizom.org/", results[0].url);
+
+  // uses AND conditions
+    return browser.bookmarks.search({title: "EFF", query: "allizom"});
+  }).then(results => {
+    browser.test.assertEq(0, results.length);
+
+  // returns an empty array on item not found
+    return browser.bookmarks.search("microsoft");
+  }).then(results => {
+    browser.test.assertEq(0, results.length);
+
     browser.test.notifyPass("bookmarks");
   }).catch(error => {
     browser.test.fail(`Error: ${String(error)} :: ${error.stack}`);
diff --git a/toolkit/components/places/Bookmarks.jsm b/toolkit/components/places/Bookmarks.jsm
index 145f463b7f2..93a910ec60b 100644
--- a/toolkit/components/places/Bookmarks.jsm
+++ b/toolkit/components/places/Bookmarks.jsm
@@ -82,6 +82,9 @@ XPCOMUtils.defineLazyModuleGetter(this, "PlacesUtils",
 const DB_URL_LENGTH_MAX = 65536;
 const DB_TITLE_LENGTH_MAX = 4096;
 
+const MATCH_BOUNDARY = Ci.mozIPlacesAutoComplete.MATCH_BOUNDARY;
+const BEHAVIOR_BOOKMARK = Ci.mozIPlacesAutoComplete.BEHAVIOR_BOOKMARK;
+
 var Bookmarks = Object.freeze({
   /**
    * Item's type constants.
@@ -446,6 +449,57 @@ var Bookmarks = Object.freeze({
     );
   },
 
+  /**
+   * Searches a list of bookmark-items by a search term, url or title.
+   *
+   * @param query
+   *        Either a string to use as search term, or an object
+   *        containing any of these keys: query, title or url with the
+   *        corresponding string to match as value.
+   *        The url property can be either a string or an nsIURI.
+   *
+   * @return {Promise} resolved when the search is complete.
+   * @resolves to an array of found bookmark-items.
+   * @rejects if an error happens while searching.
+   * @throws if the arguments are invalid.
+   *
+   * @note Any unknown property in the query object is ignored.
+   *       Known properties may be overwritten.
+   */
+  search(query) {
+    if (!query) {
+      throw new Error("Query object is required");
+    }
+    if (typeof query === "string") {
+      query = { query: query };
+    }
+    if (typeof query !== "object") {
+      throw new Error("Query must be an object or a string");
+    }
+    if (query.query && typeof query.query !== "string") {
+      throw new Error("Query option must be a string");
+    }
+    if (query.title && typeof query.title !== "string") {
+      throw new Error("Title option must be a string");
+    }
+
+    if (query.url) {
+      if (typeof query.url === "string" || (query.url instanceof URL)) {
+        query.url = new URL(query.url).href;
+      } else if (query.url instanceof Ci.nsIURI) {
+        query.url = query.url.spec;
+      } else {
+        throw new Error("Url option must be a string or a URL object");
+      }
+    }
+
+    return Task.spawn(function* () {
+      let results = yield queryBookmarks(query);
+
+      return results;
+    });
+  },
+
   /**
    * Fetches information about a bookmark-item.
    *
@@ -823,6 +877,56 @@ function insertBookmark(item, parent) {
   }));
 }
 
+////////////////////////////////////////////////////////////////////////////////
+// Query implementation.
+
+function queryBookmarks(info) {
+  let queryParams = {tags_folder: PlacesUtils.tagsFolderId};
+  // we're searching for bookmarks, so exclude tags
+  let queryString = "WHERE p.parent <> :tags_folder";
+
+  if (info.title) {
+    queryString += " AND b.title = :title";
+    queryParams.title = info.title;
+  }
+
+  if (info.url) {
+    queryString += " AND h.url = :url";
+    queryParams.url = info.url;
+  }
+
+  if (info.query) {
+    queryString += " AND AUTOCOMPLETE_MATCH(:query, h.url, b.title, NULL, NULL, 1, 1, NULL, :matchBehavior, :searchBehavior) ";
+    queryParams.query = info.query;
+    queryParams.matchBehavior = MATCH_BOUNDARY;
+    queryParams.searchBehavior = BEHAVIOR_BOOKMARK;
+  }
+
+  return PlacesUtils.withConnectionWrapper("Bookmarks.jsm: queryBookmarks",
+    Task.async(function*(db) {
+
+    // _id, _childCount, _grandParentId and _parentId fields
+    // are required to be in the result by the converting function
+    // hence setting them to NULL
+    let rows = yield db.executeCached(
+      `SELECT b.guid, IFNULL(p.guid, "") AS parentGuid, b.position AS 'index',
+              b.dateAdded, b.lastModified, b.type, b.title,
+              h.url AS url, b.parent, p.parent,
+              NULL AS _id,
+              NULL AS _childCount,
+              NULL AS _grandParentId,
+              NULL AS _parentId
+       FROM moz_bookmarks b
+       LEFT JOIN moz_bookmarks p ON p.id = b.parent
+       LEFT JOIN moz_places h ON h.id = b.fk
+       ${queryString}
+      `, queryParams);
+
+    return rowsToItemsArray(rows);
+  }));
+}
+
+
 ////////////////////////////////////////////////////////////////////////////////
 // Fetch implementation.
 
diff --git a/toolkit/components/places/tests/bookmarks/test_bookmarks_search.js b/toolkit/components/places/tests/bookmarks/test_bookmarks_search.js
new file mode 100644
index 00000000000..59f6eac4a95
--- /dev/null
+++ b/toolkit/components/places/tests/bookmarks/test_bookmarks_search.js
@@ -0,0 +1,223 @@
+add_task(function* invalid_input_throws() {
+  Assert.throws(() => PlacesUtils.bookmarks.search(),
+                /Query object is required/);
+  Assert.throws(() => PlacesUtils.bookmarks.search(null),
+                /Query object is required/);
+  Assert.throws(() => PlacesUtils.bookmarks.search({title: 50}),
+                /Title option must be a string/);
+  Assert.throws(() => PlacesUtils.bookmarks.search({url: {url: "wombat"}}),
+                /Url option must be a string or a URL object/);
+  Assert.throws(() => PlacesUtils.bookmarks.search(50),
+                /Query must be an object or a string/);
+  Assert.throws(() => PlacesUtils.bookmarks.search(true),
+                /Query must be an object or a string/);
+});
+
+add_task(function* search_bookmark() {
+  yield PlacesUtils.bookmarks.eraseEverything();
+
+  let bm1 = yield PlacesUtils.bookmarks.insert({ parentGuid: PlacesUtils.bookmarks.unfiledGuid,
+                                                 url: "http://example.com/",
+                                                 title: "a bookmark" });
+  let bm2 = yield PlacesUtils.bookmarks.insert({ parentGuid: PlacesUtils.bookmarks.unfiledGuid,
+                                                 url: "http://example.org/",
+                                                 title: "another bookmark" });
+  let bm3 = yield PlacesUtils.bookmarks.insert({ parentGuid: PlacesUtils.bookmarks.menuGuid,
+                                                 url: "http://menu.org/",
+                                                 title: "a menu bookmark" });
+  let bm4 = yield PlacesUtils.bookmarks.insert({ parentGuid: PlacesUtils.bookmarks.toolbarGuid,
+                                                 url: "http://toolbar.org/",
+                                                 title: "a toolbar bookmark" });
+  checkBookmarkObject(bm1);
+  checkBookmarkObject(bm2);
+  checkBookmarkObject(bm3);
+  checkBookmarkObject(bm4);
+
+  // finds a result by query
+  let results = yield PlacesUtils.bookmarks.search("example.com");
+  Assert.equal(results.length, 1);
+  checkBookmarkObject(results[0]);
+  Assert.deepEqual(bm1, results[0]);
+
+  // finds multiple results
+  results = yield PlacesUtils.bookmarks.search("example");
+  Assert.equal(results.length, 2);
+  checkBookmarkObject(results[0]);
+  checkBookmarkObject(results[1]);
+
+  // finds menu bookmarks
+  results = yield PlacesUtils.bookmarks.search("a menu bookmark");
+  Assert.equal(results.length, 1);
+  checkBookmarkObject(results[0]);
+  Assert.deepEqual(bm3, results[0]);
+
+  // finds toolbar bookmarks
+  results = yield PlacesUtils.bookmarks.search("a toolbar bookmark");
+  Assert.equal(results.length, 1);
+  checkBookmarkObject(results[0]);
+  Assert.deepEqual(bm4, results[0]);
+
+  yield PlacesUtils.bookmarks.eraseEverything();
+});
+
+add_task(function* search_bookmark_by_query_object() {
+  let bm1 = yield PlacesUtils.bookmarks.insert({ parentGuid: PlacesUtils.bookmarks.unfiledGuid,
+                                                 url: "http://example.com/",
+                                                 title: "a bookmark" });
+  let bm2 = yield PlacesUtils.bookmarks.insert({ parentGuid: PlacesUtils.bookmarks.unfiledGuid,
+                                                 url: "http://example.org/",
+                                                 title: "another bookmark" });
+  checkBookmarkObject(bm1);
+  checkBookmarkObject(bm2);
+
+  let results = yield PlacesUtils.bookmarks.search({query: "example.com"});
+  Assert.equal(results.length, 1);
+  checkBookmarkObject(results[0]);
+
+  Assert.deepEqual(bm1, results[0]);
+
+  results = yield PlacesUtils.bookmarks.search({query: "example"});
+  Assert.equal(results.length, 2);
+  checkBookmarkObject(results[0]);
+  checkBookmarkObject(results[1]);
+
+  yield PlacesUtils.bookmarks.eraseEverything();
+});
+
+add_task(function* search_bookmark_by_url() {
+  let bm1 = yield PlacesUtils.bookmarks.insert({ parentGuid: PlacesUtils.bookmarks.unfiledGuid,
+                                                 url: "http://example.com/",
+                                                 title: "a bookmark" });
+  let bm2 = yield PlacesUtils.bookmarks.insert({ parentGuid: PlacesUtils.bookmarks.unfiledGuid,
+                                                 url: "http://example.org/path",
+                                                 title: "another bookmark" });
+  let bm3 = yield PlacesUtils.bookmarks.insert({ parentGuid: PlacesUtils.bookmarks.unfiledGuid,
+                                                 url: "http://example.org/path",
+                                                 title: "third bookmark" });
+  checkBookmarkObject(bm1);
+  checkBookmarkObject(bm2);
+  checkBookmarkObject(bm3);
+
+  // finds the correct result by url
+  let results = yield PlacesUtils.bookmarks.search({url: "http://example.com/"});
+  Assert.equal(results.length, 1);
+  checkBookmarkObject(results[0]);
+  Assert.deepEqual(bm1, results[0]);
+
+  // normalizes the url
+  results = yield PlacesUtils.bookmarks.search({url: "http:/example.com"});
+  Assert.equal(results.length, 1);
+  checkBookmarkObject(results[0]);
+  Assert.deepEqual(bm1, results[0]);
+
+  // returns multiple matches
+  results = yield PlacesUtils.bookmarks.search({url: "http://example.org/path"});
+  Assert.equal(results.length, 2);
+
+  // requires exact match
+  results = yield PlacesUtils.bookmarks.search({url: "http://example.org/"});
+  Assert.equal(results.length, 0);
+
+  yield PlacesUtils.bookmarks.eraseEverything();
+});
+
+add_task(function* search_bookmark_by_title() {
+  let bm1 = yield PlacesUtils.bookmarks.insert({ parentGuid: PlacesUtils.bookmarks.unfiledGuid,
+                                                 url: "http://example.com/",
+                                                 title: "a bookmark" });
+  let bm2 = yield PlacesUtils.bookmarks.insert({ parentGuid: PlacesUtils.bookmarks.unfiledGuid,
+                                                 url: "http://example.org/path",
+                                                 title: "another bookmark" });
+  let bm3 = yield PlacesUtils.bookmarks.insert({ parentGuid: PlacesUtils.bookmarks.unfiledGuid,
+                                                 url: "http://example.net/",
+                                                 title: "another bookmark" });
+  checkBookmarkObject(bm1);
+  checkBookmarkObject(bm2);
+  checkBookmarkObject(bm3);
+
+  // finds the correct result by title
+  let results = yield PlacesUtils.bookmarks.search({title: "a bookmark"});
+  Assert.equal(results.length, 1);
+  checkBookmarkObject(results[0]);
+  Assert.deepEqual(bm1, results[0]);
+
+  // returns multiple matches
+  results = yield PlacesUtils.bookmarks.search({title: "another bookmark"});
+  Assert.equal(results.length, 2);
+
+  // requires exact match
+  results = yield PlacesUtils.bookmarks.search({title: "bookmark"});
+  Assert.equal(results.length, 0);
+
+  yield PlacesUtils.bookmarks.eraseEverything();
+});
+
+add_task(function* search_bookmark_combinations() {
+  let bm1 = yield PlacesUtils.bookmarks.insert({ parentGuid: PlacesUtils.bookmarks.unfiledGuid,
+                                                 url: "http://example.com/",
+                                                 title: "a bookmark" });
+  let bm2 = yield PlacesUtils.bookmarks.insert({ parentGuid: PlacesUtils.bookmarks.unfiledGuid,
+                                                 url: "http://example.org/path",
+                                                 title: "another bookmark" });
+  let bm3 = yield PlacesUtils.bookmarks.insert({ parentGuid: PlacesUtils.bookmarks.unfiledGuid,
+                                                 url: "http://example.net/",
+                                                 title: "third bookmark" });
+  checkBookmarkObject(bm1);
+  checkBookmarkObject(bm2);
+  checkBookmarkObject(bm3);
+
+  // finds the correct result if title and url match
+  let results = yield PlacesUtils.bookmarks.search({url: "http://example.com/", title: "a bookmark"});
+  Assert.equal(results.length, 1);
+  checkBookmarkObject(results[0]);
+  Assert.deepEqual(bm1, results[0]);
+
+  // does not match if query is not matching but url and title match
+  results = yield PlacesUtils.bookmarks.search({url: "http://example.com/", title: "a bookmark", query: "nonexistent"});
+  Assert.equal(results.length, 0);
+
+  // does not match if one parameter is not matching
+  results = yield PlacesUtils.bookmarks.search({url: "http://what.ever", title: "a bookmark"});
+  Assert.equal(results.length, 0);
+
+  // query only matches if other fields match as well
+  results = yield PlacesUtils.bookmarks.search({query: "bookmark", url: "http://example.net/"});
+  Assert.equal(results.length, 1);
+  checkBookmarkObject(results[0]);
+  Assert.deepEqual(bm3, results[0]);
+
+  // non-matching query will also return no results
+  results = yield PlacesUtils.bookmarks.search({query: "nonexistent", url: "http://example.net/"});
+  Assert.equal(results.length, 0);
+
+  yield PlacesUtils.bookmarks.eraseEverything();
+});
+
+add_task(function* search_folder() {
+  let folder = yield PlacesUtils.bookmarks.insert({ parentGuid: PlacesUtils.bookmarks.menuGuid,
+                                                 type: PlacesUtils.bookmarks.TYPE_FOLDER,
+                                                 title: "a test folder" });
+  let bm = yield PlacesUtils.bookmarks.insert({ parentGuid: folder.guid,
+                                                 url: "http://example.com/",
+                                                 title: "a bookmark" });
+  checkBookmarkObject(folder);
+  checkBookmarkObject(bm);
+
+  // also finds folders
+  let results = yield PlacesUtils.bookmarks.search("a test folder");
+  Assert.equal(results.length, 1);
+  checkBookmarkObject(results[0]);
+  Assert.equal(folder.title, results[0].title);
+  Assert.equal(folder.type, results[0].type);
+  Assert.equal(folder.parentGuid, results[0].parentGuid);
+
+  // finds elements in folders
+  results = yield PlacesUtils.bookmarks.search("example.com");
+  Assert.equal(results.length, 1);
+  checkBookmarkObject(results[0]);
+  Assert.deepEqual(bm, results[0]);
+  Assert.equal(folder.guid, results[0].parentGuid);
+
+  yield PlacesUtils.bookmarks.eraseEverything();
+});
+
diff --git a/toolkit/components/places/tests/bookmarks/xpcshell.ini b/toolkit/components/places/tests/bookmarks/xpcshell.ini
index 3a38934ed42..5410686832d 100644
--- a/toolkit/components/places/tests/bookmarks/xpcshell.ini
+++ b/toolkit/components/places/tests/bookmarks/xpcshell.ini
@@ -37,6 +37,7 @@ skip-if = toolkit == 'android' || toolkit == 'gonk'
 [test_bookmarks_notifications.js]
 [test_bookmarks_remove.js]
 [test_bookmarks_reorder.js]
+[test_bookmarks_search.js]
 [test_bookmarks_update.js]
 [test_changeBookmarkURI.js]
 [test_getBookmarkedURIFor.js]

From 4142d7a3ea95a29c4c1b580e0f565364ad445f2e Mon Sep 17 00:00:00 2001
From: Sebastian Kaspari <s.kaspari@gmail.com>
Date: Tue, 16 Feb 2016 16:43:27 +0000
Subject: [PATCH 21/45] Bug 1233799 - Enable DownloadContentService (and
 exclude fonts) in Nightly. r=rnewman

MozReview-Commit-ID: G7zDhHVt67C
---
 mobile/android/confvars.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/mobile/android/confvars.sh b/mobile/android/confvars.sh
index 4156bff85d4..497aa26e92e 100644
--- a/mobile/android/confvars.sh
+++ b/mobile/android/confvars.sh
@@ -116,3 +116,9 @@ MOZ_ADDON_SIGNING=1
 # Note: The framework is always included in the app. This flag controls
 # usage of the framework.
 MOZ_SWITCHBOARD=1
+
+# Enable DLC background service and stop shipping fonts in Nightly
+if test "$NIGHTLY_BUILD"; then
+  MOZ_ANDROID_DOWNLOAD_CONTENT_SERVICE=1
+  MOZ_ANDROID_EXCLUDE_FONTS=1
+fi
\ No newline at end of file

From c3646973230d4e5b4f54d13214cacf1db952e62f Mon Sep 17 00:00:00 2001
From: Nick Alexander <nalexander@mozilla.com>
Date: Tue, 16 Feb 2016 11:11:34 -0800
Subject: [PATCH 22/45] Bug 1247170 - Part 1: Add "android-gradle-build" Docker
 image. r=dustin,sebastian

We can't run Docker-in-Docker, so this is a clone of
https://hub.docker.com/r/sonatype/nexus, modified to run additional
commands.  Sonatype Nexus officially supports the Oracle JDK but the
OpenJDK appears to work as well, so we use it.

This bakes a build.sh and Gradle-specific dependencies into the docker
image.  This makes sense in a future where the dependencies this
fetches are baked into the image used to build Fennec.  It makes less
sense right now, when the dependencies are uploaded to tooltool and
subsequently consumed.  It's not critical that we get this right
immediately.

The actual build.sh script runs the Gradle wrapper for a special
dependency project.  The wrapper installs Gradle itself, downloads a
large number of Gradle dependencies, and uses Jake Wharton's
https://github.com/JakeWharton/sdk-manager-plugin/ to download and
install the Android SDK.  (We could use |mach bootstrap|, but that
doesn't (yet) support non-interactive use, and I want to try to use
the SDK Manager more generally.)  These outputs are then packaged for
further use: right now, they're exposed as artifacts, but eventually
we'll upload them directly to tooltool.

MozReview-Commit-ID: 7upsk1ANuxN
---
 .../docker/android-gradle-build/Dockerfile    |  57 +++++++
 testing/docker/android-gradle-build/README.md |   2 +
 testing/docker/android-gradle-build/REGISTRY  |   1 +
 testing/docker/android-gradle-build/VERSION   |   1 +
 testing/docker/android-gradle-build/build.sh  |  62 +++++++
 .../android-gradle-build/project/README.md    |   6 +
 .../android-gradle-build/project/build.gradle |  73 ++++++++
 .../project/gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 53637 bytes
 .../gradle/wrapper/gradle-wrapper.properties  |   7 +
 .../android-gradle-build/project/gradlew      | 160 ++++++++++++++++++
 .../android-gradle-build/project/gradlew.bat  |  90 ++++++++++
 .../project/src/main/AndroidManifest.xml      |   6 +
 12 files changed, 465 insertions(+)
 create mode 100644 testing/docker/android-gradle-build/Dockerfile
 create mode 100644 testing/docker/android-gradle-build/README.md
 create mode 100644 testing/docker/android-gradle-build/REGISTRY
 create mode 100644 testing/docker/android-gradle-build/VERSION
 create mode 100644 testing/docker/android-gradle-build/build.sh
 create mode 100644 testing/docker/android-gradle-build/project/README.md
 create mode 100644 testing/docker/android-gradle-build/project/build.gradle
 create mode 100644 testing/docker/android-gradle-build/project/gradle/wrapper/gradle-wrapper.jar
 create mode 100644 testing/docker/android-gradle-build/project/gradle/wrapper/gradle-wrapper.properties
 create mode 100755 testing/docker/android-gradle-build/project/gradlew
 create mode 100644 testing/docker/android-gradle-build/project/gradlew.bat
 create mode 100644 testing/docker/android-gradle-build/project/src/main/AndroidManifest.xml

diff --git a/testing/docker/android-gradle-build/Dockerfile b/testing/docker/android-gradle-build/Dockerfile
new file mode 100644
index 00000000000..6a2a569f9f8
--- /dev/null
+++ b/testing/docker/android-gradle-build/Dockerfile
@@ -0,0 +1,57 @@
+FROM          centos:centos7
+MAINTAINER    Nick Alexander <nalexander@mozilla.com>
+
+# Reset user/workdir from parent image so we can install software.
+WORKDIR /
+USER root
+
+# Update base.
+RUN yum upgrade -y
+
+# Install JDK and Sonatype Nexus.  Cribbed directly from
+# https://github.com/sonatype/docker-nexus/blob/fffd2c61b2368292040910c055cf690c8e76a272/oss/Dockerfile.
+
+RUN yum install -y \
+  createrepo \
+  curl \
+  java-1.7.0-openjdk-devel \
+  java-1.7.0-openjdk \
+  sudo \
+  tar \
+  unzip \
+  wget \
+  zip \
+  && yum clean all
+
+ENV NEXUS_VERSION 2.12.0-01
+
+RUN mkdir -p /opt/sonatype/nexus
+
+WORKDIR /tmp
+RUN curl --fail --silent --location --retry 3 \
+    https://download.sonatype.com/nexus/oss/nexus-${NEXUS_VERSION}-bundle.tar.gz \
+    -o /tmp/nexus-${NEXUS_VERSION}-bundle.tar.gz
+RUN curl --fail --silent --location --retry 3 \
+    https://download.sonatype.com/nexus/oss/nexus-${NEXUS_VERSION}-bundle.tar.gz.sha1 \
+    -o /tmp/nexus-${NEXUS_VERSION}-bundle.tar.gz.sha1
+
+RUN echo $(cat nexus-${NEXUS_VERSION}-bundle.tar.gz.sha1) nexus-${NEXUS_VERSION}-bundle.tar.gz | sha1sum -c
+
+RUN tar zxf nexus-${NEXUS_VERSION}-bundle.tar.gz \
+  && mv /tmp/nexus-${NEXUS_VERSION}/* /opt/sonatype/nexus/ \
+  && rm -rf /tmp/nexus-${NEXUS_VERSION} \
+  && rm -rf /tmp/nexus-${NEXUS_VERSION}-bundle.tar.gz
+
+# Install tooltool directly from github.
+RUN mkdir /build
+ADD https://raw.githubusercontent.com/mozilla/build-tooltool/master/tooltool.py /build/tooltool.py
+RUN chmod +rx /build/tooltool.py
+
+# Add build scripts.
+ADD             build.sh /build/
+RUN             chmod +x /build/*
+
+ADD project /project
+
+# Invoke our build scripts by default, but allow other commands.
+CMD /build/build.sh
diff --git a/testing/docker/android-gradle-build/README.md b/testing/docker/android-gradle-build/README.md
new file mode 100644
index 00000000000..6096b083689
--- /dev/null
+++ b/testing/docker/android-gradle-build/README.md
@@ -0,0 +1,2 @@
+This is a docker script for fetching Android Gradle dependenices for
+use in Mozilla's build clusters.
diff --git a/testing/docker/android-gradle-build/REGISTRY b/testing/docker/android-gradle-build/REGISTRY
new file mode 100644
index 00000000000..cb1e1bb482a
--- /dev/null
+++ b/testing/docker/android-gradle-build/REGISTRY
@@ -0,0 +1 @@
+taskcluster
diff --git a/testing/docker/android-gradle-build/VERSION b/testing/docker/android-gradle-build/VERSION
new file mode 100644
index 00000000000..8acdd82b765
--- /dev/null
+++ b/testing/docker/android-gradle-build/VERSION
@@ -0,0 +1 @@
+0.0.1
diff --git a/testing/docker/android-gradle-build/build.sh b/testing/docker/android-gradle-build/build.sh
new file mode 100644
index 00000000000..3db216e5042
--- /dev/null
+++ b/testing/docker/android-gradle-build/build.sh
@@ -0,0 +1,62 @@
+#!/bin/bash -vex
+
+set -x -e
+
+: WORKSPACE ${WORKSPACE:=/workspace}
+: GRADLE_VERSION ${GRADLE_VERSION:=2.7}
+
+set -v
+
+# Frowned upon, but simplest.
+RUN_AS_USER=root NEXUS_WORK=${WORKSPACE}/nexus /opt/sonatype/nexus/bin/nexus start
+
+# Wait "a while" for Nexus to actually start.  Don't fail if this fails.
+wget --quiet --retry-connrefused --waitretry=2 --tries=100 \
+  http://localhost:8081/nexus/service/local/status || true
+rm -rf status
+
+# Verify Nexus has actually started.  Fail if this fails.
+curl --fail --silent --location http://localhost:8081/nexus/service/local/status | grep '<state>STARTED</state>'
+
+export JAVA_HOME=/usr/lib/jvm/jre-1.7.0-openjdk
+
+pushd /project
+./gradlew tasks
+popd
+
+# Package everything up.
+pushd ${WORKSPACE}
+# Not yet.  See notes on tooltool below.
+# cp -R /root/.android-sdk android-sdk-linux
+# tar cJf android-sdk-linux.tar.xz android-sdk-linux
+
+cp -R /workspace/nexus/storage/central jcentral
+tar cJf jcentral.tar.xz jcentral
+
+# The Gradle wrapper will have downloaded and verified the hash of exactly one
+# Gradle distribution.  It will be located at
+# ~/.gradle/wrapper/dists/gradle-2.7-all/$PROJECT_HASH/gradle-2.7-all.zip.  We
+# want to remove the version from the internal directory for use via tooltool
+# in a mozconfig.
+cp ~/.gradle/wrapper/dists/gradle-${GRADLE_VERSION}-all/*/gradle-${GRADLE_VERSION}-all.zip gradle-${GRADLE_VERSION}-all.zip
+unzip -q gradle-${GRADLE_VERSION}-all.zip
+mv gradle-${GRADLE_VERSION} gradle
+tar cJf gradle.tar.xz gradle
+
+mkdir -p /artifacts
+# We can't redistribute the Android SDK publicly just yet.  We'll
+# upload to (internal) tooltool eventually.  mv
+# android-sdk-linux.tar.xz /artifacts
+mv jcentral.tar.xz /artifacts
+mv gradle.tar.xz /artifacts
+popd
+
+# Bug 1245170: at some point in the future, we'll be able to upload
+# things directly to tooltool.
+# pushd /artifacts
+# /build/tooltool.py add --visibility=public jcentral.tar.xz
+# /build/tooltool.py add --visibility=public gradle.tar.xz
+# /build/tooltool.py add --visibility=internal android-sdk-linux.tar.xz
+# /build/tooltool.py upload -v --url=http://relengapi/tooltool/ \
+#   --message="No message - Gradle and jcentral archives uploaded from taskcluster."
+# popd
diff --git a/testing/docker/android-gradle-build/project/README.md b/testing/docker/android-gradle-build/project/README.md
new file mode 100644
index 00000000000..07411b3ea21
--- /dev/null
+++ b/testing/docker/android-gradle-build/project/README.md
@@ -0,0 +1,6 @@
+This Gradle project exists only to list dependencies used to build Firefox for
+Android.  Eventually, this definition will live in ``mobile/android``, or it
+will just *be* ``mobile/android/app/build.gradle``.
+
+Until we determine the best Docker and Taskcluster patterns for dependency
+gathering and toolchain producing like this, this can live here.
\ No newline at end of file
diff --git a/testing/docker/android-gradle-build/project/build.gradle b/testing/docker/android-gradle-build/project/build.gradle
new file mode 100644
index 00000000000..0029a0f271d
--- /dev/null
+++ b/testing/docker/android-gradle-build/project/build.gradle
@@ -0,0 +1,73 @@
+buildscript {
+  repositories {
+    maven {
+        url 'http://localhost:8081/nexus/content/repositories/central/'
+    }
+
+    maven {
+        url 'https://jitpack.io'
+    }
+  }
+
+  dependencies {
+    classpath 'com.android.tools.build:gradle:1.3.0'
+    classpath('com.stanfy.spoon:spoon-gradle-plugin:1.0.4') {
+        // Without these, we get errors linting.
+        exclude module: 'guava'
+    }
+
+    // See
+    // https://github.com/JakeWharton/sdk-manager-plugin/issues/73#issuecomment-106747867
+    // and
+    // https://github.com/JakeWharton/sdk-manager-plugin/issues/99#issuecomment-166438751.
+    classpath 'com.github.JakeWharton:sdk-manager-plugin:220bf7a88a7072df3ed16dc8466fb144f2817070'
+  }
+}
+
+allprojects {
+    repositories {
+        maven {
+            url 'http://localhost:8081/nexus/content/repositories/central/'
+        }
+    }
+}
+
+apply plugin: 'android-sdk-manager'
+
+// Optionally, require an emulator.
+// sdkManager {
+//   emulatorVersion 'android-19'
+//   emulatorArchitecture 'armeabi-v7a' // Optional, defaults to ARM.
+// }
+
+apply plugin: 'com.android.application'
+
+android {
+    compileSdkVersion 23
+    buildToolsVersion "23.0.1"
+
+    defaultConfig {
+        targetSdkVersion 23
+        minSdkVersion 15
+    }
+}
+
+// These are extracted from mobile/android/**/*.gradle.
+dependencies {
+    compile 'com.android.support:appcompat-v7:23.0.1'
+    compile 'com.android.support:design:23.0.1'
+    compile 'com.android.support:mediarouter-v7:23.0.1'
+    compile 'com.android.support:recyclerview-v7:23.0.1'
+    compile 'com.android.support:support-v4:23.0.1'
+    compile 'com.google.android.gms:play-services-base:8.1.0'
+    compile 'com.google.android.gms:play-services-basement:8.1.0'
+    compile 'com.google.android.gms:play-services-cast:8.1.0'
+    compile 'com.google.android.gms:play-services-gcm:8.1.0'
+    compile 'com.squareup.leakcanary:leakcanary-android-no-op:1.4-beta1'
+    compile 'com.squareup.leakcanary:leakcanary-android:1.4-beta1'
+    testCompile 'junit:junit:4.12'
+    testCompile 'org.mockito:mockito-core:1.10.19'
+    testCompile 'org.robolectric:robolectric:3.0'
+    testCompile 'org.simpleframework:simple-http:6.0.1'
+    androidTestCompile 'com.jayway.android.robotium:robotium-solo:4.3.1'
+}
diff --git a/testing/docker/android-gradle-build/project/gradle/wrapper/gradle-wrapper.jar b/testing/docker/android-gradle-build/project/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000000000000000000000000000000000000..05ef575b0cd0173fc735f2857ce4bd594ce4f6bd
GIT binary patch
literal 53637
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
Gum1;HWJz!U

literal 0
HcmV?d00001

diff --git a/testing/docker/android-gradle-build/project/gradle/wrapper/gradle-wrapper.properties b/testing/docker/android-gradle-build/project/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 00000000000..1a895dc00df
--- /dev/null
+++ b/testing/docker/android-gradle-build/project/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,7 @@
+#Tue Jan 26 20:42:06 PST 2016
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.7-all.zip
+distributionSha256Sum=2ba0aaa11a3e96ec0af31d532d808e1f09cc6dcad0954e637902a1ab544b9e60
diff --git a/testing/docker/android-gradle-build/project/gradlew b/testing/docker/android-gradle-build/project/gradlew
new file mode 100755
index 00000000000..9d82f789151
--- /dev/null
+++ b/testing/docker/android-gradle-build/project/gradlew
@@ -0,0 +1,160 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+    echo "$*"
+}
+
+die ( ) {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+esac
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/testing/docker/android-gradle-build/project/gradlew.bat b/testing/docker/android-gradle-build/project/gradlew.bat
new file mode 100644
index 00000000000..aec99730b4e
--- /dev/null
+++ b/testing/docker/android-gradle-build/project/gradlew.bat
@@ -0,0 +1,90 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/testing/docker/android-gradle-build/project/src/main/AndroidManifest.xml b/testing/docker/android-gradle-build/project/src/main/AndroidManifest.xml
new file mode 100644
index 00000000000..decb23df4fd
--- /dev/null
+++ b/testing/docker/android-gradle-build/project/src/main/AndroidManifest.xml
@@ -0,0 +1,6 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="org.mozilla.gecko">
+<!-- THIS IS NOT THE REAL MANIFEST!  This is for Gradle only.  See
+     AndroidManifest.xml.in. -->
+
+</manifest>

From 1486d49a182cfa6893ebc425d4b46bc531b0fb2c Mon Sep 17 00:00:00 2001
From: Nick Alexander <nalexander@mozilla.com>
Date: Tue, 16 Feb 2016 11:11:42 -0800
Subject: [PATCH 23/45] Bug 1247170 - Part 2: Add
 "android-gradle-build-dependencies" TaskCluster job. r=dustin

MozReview-Commit-ID: I6rgyqci67J
---
 .../android-gradle-build-dependencies.yml     | 66 +++++++++++++++++++
 1 file changed, 66 insertions(+)
 create mode 100644 testing/taskcluster/tasks/android-gradle-build-dependencies.yml

diff --git a/testing/taskcluster/tasks/android-gradle-build-dependencies.yml b/testing/taskcluster/tasks/android-gradle-build-dependencies.yml
new file mode 100644
index 00000000000..b69bc3d385c
--- /dev/null
+++ b/testing/taskcluster/tasks/android-gradle-build-dependencies.yml
@@ -0,0 +1,66 @@
+# A task to fetch Android Gradle dependencies from jcentral and package them
+# for consumption by tooltool users.  Normally invoked manually.
+---
+taskId: {{build_slugid}}
+
+task:
+  created: '{{now}}'
+  deadline: '{{#from_now}}24 hours{{/from_now}}'
+  metadata:
+    name: '[TC] - Android Gradle build dependencies'
+    description: 'Fetch and package Android Gradle build dependencies'
+    owner: nalexander@mozilla.com
+    source: http://todo.com/soon
+
+  tags:
+    createdForUser: {{owner}}
+
+  workerType: b2gtest
+  provisionerId: aws-provisioner-v1
+  schedulerId: task-graph-scheduler
+
+  routes:
+    - 'index.gecko.v1.{{project}}.revision.linux.{{head_rev}}.{{build_name}}.{{build_type}}'
+    - 'index.gecko.v1.{{project}}.latest.linux.{{build_name}}.{{build_type}}'
+
+  scopes:
+    - 'docker-worker:cache:level-{{level}}-{{project}}-tc-vcs'
+
+  payload:
+    image:
+      type: 'task-image'
+      path: 'public/image.tar'
+      taskId: '{{#task_id_for_image}}android-gradle-build{{/task_id_for_image}}'
+
+    command:
+      - bash
+      - /build/build.sh
+
+    maxRunTime: 1800
+
+    cache:
+      level-{{level}}-{{project}}-tc-vcs: '/home/worker/.tc-vcs'
+
+    artifacts:
+      'public/build':
+        type: directory
+        path: '/artifacts/'
+        expires: '{{#from_now}}1 year{{/from_now}}'
+
+  extra:
+    build_product: '{{build_product}}'
+    build_name: '{{build_name}}'
+    build_type: '{{build_type}}'
+    index:
+      rank: {{pushlog_id}}
+    locations:
+        build: null
+        tests: null
+    treeherder:
+        machine:
+            platform: lint
+        groupSymbol: tc
+        symbol: AG
+    treeherderEnv:
+        - production
+        - staging

From c3d8dfd0626b09617bdac74e83585977865b38bf Mon Sep 17 00:00:00 2001
From: Nick Alexander <nalexander@mozilla.com>
Date: Tue, 2 Feb 2016 18:09:44 -0800
Subject: [PATCH 24/45] Bug 1247375 - Part 1: Add TaskCluster job building
 Fennec with --disable-compile-environment. r=dustin

MozReview-Commit-ID: 4FDevhlYnUC
---
 .../android-api-15-frontend/nightly           | 36 +++++++++++
 .../android-frontend/releng.manifest          | 26 ++++++++
 .../64_api_15_frontend.py                     |  8 +++
 .../mozharness/mozilla/building/buildbase.py  |  1 +
 .../tasks/builds/android_api_15_frontend.yml  | 60 +++++++++++++++++++
 5 files changed, 131 insertions(+)
 create mode 100644 mobile/android/config/mozconfigs/android-api-15-frontend/nightly
 create mode 100644 mobile/android/config/tooltool-manifests/android-frontend/releng.manifest
 create mode 100644 testing/mozharness/configs/builds/releng_sub_android_configs/64_api_15_frontend.py
 create mode 100644 testing/taskcluster/tasks/builds/android_api_15_frontend.yml

diff --git a/mobile/android/config/mozconfigs/android-api-15-frontend/nightly b/mobile/android/config/mozconfigs/android-api-15-frontend/nightly
new file mode 100644
index 00000000000..40d055dc1fb
--- /dev/null
+++ b/mobile/android/config/mozconfigs/android-api-15-frontend/nightly
@@ -0,0 +1,36 @@
+# Many things aren't appropriate for a frontend-only build.
+MOZ_AUTOMATION_BUILD_SYMBOLS=0
+MOZ_AUTOMATION_INSTALLER=0
+MOZ_AUTOMATION_L10N_CHECK=0
+MOZ_AUTOMATION_PACKAGE=0
+MOZ_AUTOMATION_PACKAGE_TESTS=0
+MOZ_AUTOMATION_SDK=0
+MOZ_AUTOMATION_UPDATE_PACKAGING=0
+MOZ_AUTOMATION_UPLOAD=0
+MOZ_AUTOMATION_UPLOAD_SYMBOLS=0
+
+. "$topsrcdir/mobile/android/config/mozconfigs/common"
+
+ac_add_options --disable-compile-environment
+ac_add_options --disable-tests
+
+# From here on, like ../android-api-15/nightly.
+
+ac_add_options --enable-profiling
+
+# Android
+ac_add_options --with-android-min-sdk=15
+ac_add_options --target=arm-linux-androideabi
+
+ac_add_options --with-branding=mobile/android/branding/nightly
+
+# This will overwrite the default of stripping everything and keep the symbol table.
+# This is useful for profiling with eideticker. See bug 788680
+STRIP_FLAGS="--strip-debug"
+
+export MOZILLA_OFFICIAL=1
+export MOZ_TELEMETRY_REPORTING=1
+
+MOZ_ANDROID_GECKOLIBS_AAR=1
+
+. "$topsrcdir/mobile/android/config/mozconfigs/common.override"
diff --git a/mobile/android/config/tooltool-manifests/android-frontend/releng.manifest b/mobile/android/config/tooltool-manifests/android-frontend/releng.manifest
new file mode 100644
index 00000000000..454bc56ccd7
--- /dev/null
+++ b/mobile/android/config/tooltool-manifests/android-frontend/releng.manifest
@@ -0,0 +1,26 @@
+[
+{
+"size": 535625068,
+"visibility": "internal",
+"digest": "0627515046a23c1d109e2782865b1b3b546c1d552955e4156317f76cbb195eb630aa25feea3f4edd1c685f129da0c2a5169d4d6349c1c31d8a95158a4569a478",
+"algorithm": "sha512",
+"filename": "android-sdk-linux.tar.xz",
+"unpack": true
+},
+{
+"size": 167175,
+"visibility": "public",
+"digest": "0b71a936edf5bd70cf274aaa5d7abc8f77fe8e7b5593a208f805cc9436fac646b9c4f0b43c2b10de63ff3da671497d35536077ecbc72dba7f8159a38b580f831",
+"algorithm": "sha512",
+"filename": "sccache.tar.bz2",
+"unpack": true
+},
+{
+"size": 31013068,
+"visibility": "public",
+"digest": "e30a26f98a3448064857491aee1a7a26f98494f86a89113de9be17c37c8181ed60250706fed881ec1f035002fcdaf8b9b4a7d9ae70ce40acff2f1acfbb40f8d9",
+"algorithm": "sha512",
+"filename": "java_home-1.7.0-openjdk-1.7.0.85.x86_64.tar.xz",
+"unpack": true
+}
+]
diff --git a/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_15_frontend.py b/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_15_frontend.py
new file mode 100644
index 00000000000..fd131edd769
--- /dev/null
+++ b/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_15_frontend.py
@@ -0,0 +1,8 @@
+config = {
+    'base_name': 'Android armv7 API 15+ frontend %(branch)s',
+    'stage_platform': 'android-api-15-frontend',
+    'build_type': 'api-15-opt',
+    'src_mozconfig': 'mobile/android/config/mozconfigs/android-api-15-frontend/nightly',
+    'tooltool_manifest_src': 'mobile/android/config/tooltool-manifests/android-frontend/releng.manifest',
+    'multi_locale_config_platform': 'android',
+}
diff --git a/testing/mozharness/mozharness/mozilla/building/buildbase.py b/testing/mozharness/mozharness/mozilla/building/buildbase.py
index bee671ccbcd..58f89e03202 100755
--- a/testing/mozharness/mozharness/mozilla/building/buildbase.py
+++ b/testing/mozharness/mozharness/mozilla/building/buildbase.py
@@ -357,6 +357,7 @@ class BuildOptionParser(object):
         'source': 'builds/releng_sub_%s_configs/%s_source.py',
         'api-9': 'builds/releng_sub_%s_configs/%s_api_9.py',
         'api-11': 'builds/releng_sub_%s_configs/%s_api_11.py',
+        'api-15-frontend': 'builds/releng_sub_%s_configs/%s_api_15_frontend.py',
         'api-15': 'builds/releng_sub_%s_configs/%s_api_15.py',
         'api-9-debug': 'builds/releng_sub_%s_configs/%s_api_9_debug.py',
         'api-11-debug': 'builds/releng_sub_%s_configs/%s_api_11_debug.py',
diff --git a/testing/taskcluster/tasks/builds/android_api_15_frontend.yml b/testing/taskcluster/tasks/builds/android_api_15_frontend.yml
new file mode 100644
index 00000000000..7cdc5f5d590
--- /dev/null
+++ b/testing/taskcluster/tasks/builds/android_api_15_frontend.yml
@@ -0,0 +1,60 @@
+$inherits:
+  from: 'tasks/builds/mobile_base.yml'
+  variables:
+    build_name: 'android-api-15-frontend'
+    build_type: 'opt'
+task:
+  metadata:
+      name: '[TC] Android armv7 API 15+ frontend'
+      description: 'Android armv7 API 15+ frontend'
+
+  workerType: android-api-15
+
+  routes:
+    - 'index.buildbot.branches.{{project}}.android-api-15-frontend'
+    - 'index.buildbot.revisions.{{head_rev}}.{{project}}.android-api-15-frontend'
+
+  scopes:
+    - 'docker-worker:cache:level-{{level}}-{{project}}-build-android-api-15-frontend-workspace'
+    - 'docker-worker:cache:tooltool-cache'
+    - 'docker-worker:relengapi-proxy:tooltool.download.internal'
+    - 'docker-worker:relengapi-proxy:tooltool.download.public'
+
+  payload:
+    cache:
+      level-{{level}}-{{project}}-build-android-api-15-frontend-workspace: '/home/worker/workspace'
+      tooltool-cache: '/home/worker/tooltool-cache'
+
+    features:
+      relengAPIProxy: true
+
+    env:
+      # inputs to mozharness
+      MOZHARNESS_SCRIPT: 'mozharness/scripts/fx_desktop_build.py'
+      # TODO: make these additional configuration files go away
+      MOZHARNESS_CONFIG: >
+          builds/releng_base_android_64_builds.py
+          disable_signing.py
+          platform_supports_post_upload_to_latest.py
+      MH_CUSTOM_BUILD_VARIANT_CFG: api-15-frontend
+      MH_BRANCH: {{project}}
+      MH_BUILD_POOL: taskcluster
+
+    maxRunTime: 36000
+
+    command: ["/bin/bash", "bin/build.sh"]
+
+  extra:
+    treeherderEnv:
+      - production
+      - staging
+    treeherder:
+      machine:
+        # see https://github.com/mozilla/treeherder/blob/master/ui/js/values.js
+        platform: android-4-0-armv7-api15-frontend
+    # Rather then enforcing particular conventions we require that all build
+    # tasks provide the "build" extra field to specify where the build and tests
+    # files are located.
+    locations:
+      build: 'public/build/target.linux-x86_64.tar.bz2'
+      tests: 'public/build/target.tests.zip'

From 2c22b05675d510b89bb77bcc6decdea7d17d3825 Mon Sep 17 00:00:00 2001
From: Nick Alexander <nalexander@mozilla.com>
Date: Wed, 10 Feb 2016 19:29:27 -0800
Subject: [PATCH 25/45] Bug 1247375 - Part 2: Add build system Gradle defines
 for Fennec. r=glandium

Enable building with Gradle using --with-gradle.  Configure the
location of Gradle with --with-gradle=/path/to/gradle.  For local
developers, this is always the in tree Gradle wrapper, which downloads
and installs the correct Gradle version automatically.  In automation,
this will be a version of Gradle fetched from tooltool.

Configure the location to use to download Gradle Maven dependencies
(including the Android-Gradle plugin) by setting
GRADLE_MAVEN_REPOSITORY in your mozconfig. For local developers, this
defaults to the jcenter repository.  In automation, this will be an
archived directory fetched from tooltool.

Android-specific Maven dependencies are shipped as "extras" with the
Android SDK, and should be found automatically by the Android-Gradle
plugin.

MozReview-Commit-ID: Hrkn88Vig5H
---
 build.gradle                    |  9 ++++--
 configure.in                    | 54 ++++++++++++++++++++++++++++++---
 mobile/android/mach_commands.py |  2 +-
 3 files changed, 56 insertions(+), 9 deletions(-)

diff --git a/build.gradle b/build.gradle
index 94d92b8f55b..68922a84930 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,7 +9,9 @@ allprojects {
     }
 
     repositories {
-        jcenter()
+        maven {
+            url gradle.mozconfig.substs.GRADLE_MAVEN_REPOSITORY
+        }
     }
 }
 
@@ -17,8 +19,9 @@ buildDir "${topobjdir}/gradle/build"
 
 buildscript {
     repositories {
-        jcenter()
-
+        maven {
+            url gradle.mozconfig.substs.GRADLE_MAVEN_REPOSITORY
+        }
     }
 
     dependencies {
diff --git a/configure.in b/configure.in
index 1b6b5fb6e13..00c1b910885 100644
--- a/configure.in
+++ b/configure.in
@@ -5374,12 +5374,56 @@ if test -n "$MOZ_OMX_PLUGIN"; then
 fi
 
 dnl ========================================================
-dnl = Enable building mobile/android with Gradle
+dnl Gradle support
+dnl
+dnl If --with-gradle is specified, build mobile/android with Gradle.
+dnl
+dnl If no Gradle binary is specified, use the in tree Gradle wrapper.
+dnl The wrapper downloads and installs Gradle, which is good for local
+dnl developers but not good in automation.
 dnl ========================================================
-MOZ_ARG_ENABLE_BOOL(gradle-mobile-android-builds,
-[  --enable-gradle-mobile-android-builds      Enable building mobile/android with Gradle],
-    MOZ_BUILD_MOBILE_ANDROID_WITH_GRADLE=1,
-    MOZ_BUILD_MOBILE_ANDROID_WITH_GRADLE=)
+
+GRADLE=
+MOZ_ARG_WITH_STRING(gradle,
+[  --with-gradle=/path/to/bin/gradle
+                          Enable building mobile/android with Gradle (argument: location of binary or wrapper (gradle/gradlew))],
+    if test "$withval" = "no" ; then
+        dnl --without-gradle => use the wrapper in |mach gradle|, don't build
+        dnl with Gradle by default.
+        GRADLE=$srcdir/gradlew
+        MOZ_BUILD_MOBILE_ANDROID_WITH_GRADLE=
+    elif test "$withval" = "yes" ; then
+        dnl --with-gradle => use the wrapper in |mach gradle|, build with
+        dnl Gradle by default.
+        GRADLE=$srcdir/gradlew
+        MOZ_BUILD_MOBILE_ANDROID_WITH_GRADLE=1
+    else
+        dnl --with-gradle=/path/to/gradle => use the given binary in |mach
+        dnl gradle|, build with Gradle by default.
+        GRADLE=$withval
+        MOZ_BUILD_MOBILE_ANDROID_WITH_GRADLE=1
+    fi
+    ,
+    dnl No --with{out}-gradle => use the wrapper in |mach gradle|, don't build
+    dnl with Gradle by default.
+    GRADLE=$srcdir/gradlew
+    MOZ_BUILD_MOBILE_ANDROID_WITH_GRADLE=
+    )
+
+if test "$OS_TARGET" = Android -a x"$MOZ_WIDGET_TOOLKIT" != x"gonk" ; then
+    if test -z "$GRADLE" -o ! -x "$GRADLE" ; then
+        AC_MSG_ERROR([The program gradlew/gradle was not found.  Use --with-gradle=/path/to/bin/gradle}])
+    fi
+fi
+AC_SUBST(GRADLE)
+
+dnl Path to Maven repository containing Gradle dependencies.  Automation will
+dnl set this to file:///path/to/local via the mozconfig.  Local developer
+dnl default is jcenter.
+if test -z "$GRADLE_MAVEN_REPOSITORY" ; then
+    GRADLE_MAVEN_REPOSITORY=https://jcenter.bintray.com/
+fi
+AC_SUBST(GRADLE_MAVEN_REPOSITORY)
 
 if test -n "$MOZ_BUILD_MOBILE_ANDROID_WITH_GRADLE"; then
     if test "$OS_TARGET" = "Android" -a x"$MOZ_WIDGET_TOOLKIT" != x"gonk"; then
diff --git a/mobile/android/mach_commands.py b/mobile/android/mach_commands.py
index 11cafbdcbbb..108a03cb727 100644
--- a/mobile/android/mach_commands.py
+++ b/mobile/android/mach_commands.py
@@ -57,7 +57,7 @@ class MachCommands(MachCommandBase):
         # Avoid logging the command
         self.log_manager.terminal_handler.setLevel(logging.CRITICAL)
 
-        return self.run_process(['./gradlew'] + args,
+        return self.run_process([self.substs['GRADLE']] + args,
             pass_thru=True, # Allow user to run gradle interactively.
             ensure_exit_code=False, # Don't throw on non-zero exit code.
             cwd=mozpath.join(self.topsrcdir))

From 133c3b89c5aba08b2bd0122211a66b5cad479608 Mon Sep 17 00:00:00 2001
From: Nick Alexander <nalexander@mozilla.com>
Date: Fri, 12 Feb 2016 10:07:11 -0800
Subject: [PATCH 26/45] Bug 1247375 - Part 3: Use Gradle to build Fennec with
 --disable-compile-environment. r=glandium

MozReview-Commit-ID: 3oolQKHxkBs
---
 .../mozconfigs/android-api-15-frontend/nightly   |  3 +++
 .../android-frontend/releng.manifest             | 16 ++++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/mobile/android/config/mozconfigs/android-api-15-frontend/nightly b/mobile/android/config/mozconfigs/android-api-15-frontend/nightly
index 40d055dc1fb..fdff461d200 100644
--- a/mobile/android/config/mozconfigs/android-api-15-frontend/nightly
+++ b/mobile/android/config/mozconfigs/android-api-15-frontend/nightly
@@ -11,6 +11,9 @@ MOZ_AUTOMATION_UPLOAD_SYMBOLS=0
 
 . "$topsrcdir/mobile/android/config/mozconfigs/common"
 
+ac_add_options --with-gradle="$topsrcdir/gradle/bin/gradle"
+export GRADLE_MAVEN_REPOSITORY="file://$topsrcdir/jcentral"
+
 ac_add_options --disable-compile-environment
 ac_add_options --disable-tests
 
diff --git a/mobile/android/config/tooltool-manifests/android-frontend/releng.manifest b/mobile/android/config/tooltool-manifests/android-frontend/releng.manifest
index 454bc56ccd7..72f8bb970a6 100644
--- a/mobile/android/config/tooltool-manifests/android-frontend/releng.manifest
+++ b/mobile/android/config/tooltool-manifests/android-frontend/releng.manifest
@@ -22,5 +22,21 @@
 "algorithm": "sha512",
 "filename": "java_home-1.7.0-openjdk-1.7.0.85.x86_64.tar.xz",
 "unpack": true
+},
+{
+"algorithm": "sha512",
+"visibility": "public",
+"filename": "jcentral.tar.xz",
+"unpack": true,
+"digest": "b5d85a917785e1c034318f7495fef27a6274b04d8640245726b0cf1331b7ac374f5757868901c3fadd930bf10603173a706be653d769dde8ddfdb8673b143363",
+"size": 38596168
+},
+{
+"algorithm": "sha512",
+"visibility": "public",
+"filename": "gradle.tar.xz",
+"unpack": true,
+"digest": "ef1d0038da879cc6840fced87671f8f6a18c51375498804f64d21fa48d7089ded4da2be36bd06a1457083e9110e59c0884f1e074dc609d29617c131caea8f234",
+"size": 50542140
 }
 ]

From 88693264ac7760ac52317d7e12c6be967fb16e23 Mon Sep 17 00:00:00 2001
From: Tim Taubert <tim@timtaubert.de>
Date: Thu, 11 Feb 2016 17:14:29 +0100
Subject: [PATCH 27/45] Bug 529899 - Purge cookies on clean shutdown with "Keep
 cookies until I close Firefox" r=Yoric

---
 browser/components/sessionstore/SessionSaver.jsm | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/browser/components/sessionstore/SessionSaver.jsm b/browser/components/sessionstore/SessionSaver.jsm
index 98c2ca12ad2..02149c966ff 100644
--- a/browser/components/sessionstore/SessionSaver.jsm
+++ b/browser/components/sessionstore/SessionSaver.jsm
@@ -21,6 +21,8 @@ XPCOMUtils.defineLazyModuleGetter(this, "console",
   "resource://gre/modules/Console.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "PrivacyFilter",
   "resource:///modules/sessionstore/PrivacyFilter.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "RunState",
+  "resource:///modules/sessionstore/RunState.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "SessionStore",
   "resource:///modules/sessionstore/SessionStore.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "SessionFile",
@@ -209,6 +211,19 @@ var SessionSaverInternal = {
       }
     }
 
+    // If this is the final write on a clean shutdown, and the user changed
+    // their cookie preferences to "Keep until I close Firefox", then we
+    // should remove all cookies. Check "resume_session_once" so we keep
+    // cookies when restarting due to a Firefox update.
+    if (RunState.isClosing &&
+        Services.prefs.getIntPref("network.cookie.lifetimePolicy") ==
+          Services.cookies.ACCEPT_SESSION &&
+        !Services.prefs.getBoolPref("browser.sessionstore.resume_session_once")) {
+      for (let window of state.windows) {
+        delete window.cookies;
+      }
+    }
+
     stopWatchFinish("COLLECT_DATA_MS", "COLLECT_DATA_LONGEST_OP_MS");
     return this._writeState(state);
   },

From 46ff855561c9291a73fed053ca9e528ae612d1e2 Mon Sep 17 00:00:00 2001
From: Lin Clark <lclark@mozilla.com>
Date: Tue, 16 Feb 2016 14:37:45 -0800
Subject: [PATCH 28/45] Bug 1241707 - [e10s] Web Console should restore focus
 to proper place when closed. r=jryans,r=bgrins

MozReview-Commit-ID: JlcJPGygm5F
---
 devtools/client/webconsole/hudservice.js |  8 ++++----
 devtools/server/actors/webbrowser.js     | 11 +++++++++++
 devtools/shared/client/main.js           |  7 +++++++
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/devtools/client/webconsole/hudservice.js b/devtools/client/webconsole/hudservice.js
index 34828bc629a..3dd2f138535 100644
--- a/devtools/client/webconsole/hudservice.js
+++ b/devtools/client/webconsole/hudservice.js
@@ -12,6 +12,7 @@ var WebConsoleUtils = require("devtools/shared/webconsole/utils").Utils;
 var Heritage = require("sdk/core/heritage");
 var {TargetFactory} = require("devtools/client/framework/target");
 var {Tools} = require("devtools/client/definitions");
+const { Task } = require("resource://gre/modules/Task.jsm");
 var promise = require("promise");
 
 loader.lazyImporter(this, "Services", "resource://gre/modules/Services.jsm");
@@ -587,10 +588,9 @@ WebConsole.prototype = {
       }
     }
 
-    let onDestroy = function WC_onDestroyUI() {
+    let onDestroy = Task.async(function*() {
       try {
-        let tabWindow = this.target.isLocalTab ? this.target.window : null;
-        tabWindow && tabWindow.focus();
+        yield this.target.activeTab.focus()
       }
       catch (ex) {
         // Tab focus can fail if the tab or target is closed.
@@ -599,7 +599,7 @@ WebConsole.prototype = {
       let id = WebConsoleUtils.supportsString(this.hudId);
       Services.obs.notifyObservers(id, "web-console-destroyed", null);
       this._destroyer.resolve(null);
-    }.bind(this);
+    }.bind(this));
 
     if (this.ui) {
       this.ui.destroy().then(onDestroy);
diff --git a/devtools/server/actors/webbrowser.js b/devtools/server/actors/webbrowser.js
index 8d309eaed51..196ea8c6757 100644
--- a/devtools/server/actors/webbrowser.js
+++ b/devtools/server/actors/webbrowser.js
@@ -1399,6 +1399,16 @@ TabActor.prototype = {
     return { type: "detached" };
   },
 
+  /**
+   * Bring the tab's window to front.
+   */
+  onFocus: function() {
+    if (this.window) {
+      this.window.focus();
+    }
+    return {};
+  },
+
   /**
    * Reload the page in this tab.
    */
@@ -1900,6 +1910,7 @@ TabActor.prototype = {
 TabActor.prototype.requestTypes = {
   "attach": TabActor.prototype.onAttach,
   "detach": TabActor.prototype.onDetach,
+  "focus": TabActor.prototype.onFocus,
   "reload": TabActor.prototype.onReload,
   "navigateTo": TabActor.prototype.onNavigateTo,
   "reconfigure": TabActor.prototype.onReconfigure,
diff --git a/devtools/shared/client/main.js b/devtools/shared/client/main.js
index bad301d3805..03fbda5d933 100644
--- a/devtools/shared/client/main.js
+++ b/devtools/shared/client/main.js
@@ -1315,6 +1315,13 @@ TabClient.prototype = {
     telemetry: "TABDETACH"
   }),
 
+  /**
+   * Bring the window to the front.
+   */
+  focus: DebuggerClient.requester({
+    type: "focus"
+  }, {}),
+
   /**
    * Reload the page in this tab.
    *

From 8f4413a55a786f91f6ffac2562a251203d5b9f75 Mon Sep 17 00:00:00 2001
From: Kit Cambridge <kcambridge@mozilla.com>
Date: Thu, 7 Jan 2016 13:15:55 -0700
Subject: [PATCH 29/45] Bug 1224785, Part 1 - Implement alert favicons backend.
 r=wchen

MozReview-Commit-ID: Day8Hj8lT1f
---
 .../components/alerts/AlertNotification.cpp   |  10 ++
 toolkit/components/alerts/nsAlertsService.cpp | 114 +++++++++++++++++-
 .../components/alerts/nsIAlertsService.idl    |  36 +++++-
 3 files changed, 156 insertions(+), 4 deletions(-)

diff --git a/toolkit/components/alerts/AlertNotification.cpp b/toolkit/components/alerts/AlertNotification.cpp
index ef443f714a8..b72e5746adb 100644
--- a/toolkit/components/alerts/AlertNotification.cpp
+++ b/toolkit/components/alerts/AlertNotification.cpp
@@ -117,6 +117,16 @@ AlertNotification::GetPrincipal(nsIPrincipal** aPrincipal)
   return NS_OK;
 }
 
+NS_IMETHODIMP
+AlertNotification::GetURI(nsIURI** aURI)
+{
+  if (!nsAlertsUtils::IsActionablePrincipal(mPrincipal)) {
+    *aURI = nullptr;
+    return NS_OK;
+  }
+  return mPrincipal->GetURI(aURI);
+}
+
 NS_IMETHODIMP
 AlertNotification::GetInPrivateBrowsing(bool* aInPrivateBrowsing)
 {
diff --git a/toolkit/components/alerts/nsAlertsService.cpp b/toolkit/components/alerts/nsAlertsService.cpp
index d6765770ecb..345f6075406 100644
--- a/toolkit/components/alerts/nsAlertsService.cpp
+++ b/toolkit/components/alerts/nsAlertsService.cpp
@@ -22,10 +22,118 @@
 
 #endif // !MOZ_WIDGET_ANDROID
 
+#ifdef MOZ_PLACES
+#include "mozIAsyncFavicons.h"
+#include "nsIFaviconService.h"
+#endif // MOZ_PLACES
+
 using namespace mozilla;
 
 using mozilla::dom::ContentChild;
 
+namespace {
+
+#ifdef MOZ_PLACES
+
+class IconCallback final : public nsIFaviconDataCallback
+{
+public:
+  NS_DECL_ISUPPORTS
+
+  IconCallback(nsIAlertsService* aBackend,
+               nsIAlertNotification* aAlert,
+               nsIObserver* aAlertListener)
+    : mBackend(aBackend)
+    , mAlert(aAlert)
+    , mAlertListener(aAlertListener)
+  {}
+
+  NS_IMETHOD
+  OnComplete(nsIURI *aIconURI, uint32_t aIconSize, const uint8_t *aIconData,
+             const nsACString &aMimeType) override
+  {
+    nsresult rv = NS_ERROR_FAILURE;
+    if (aIconSize > 0) {
+      nsCOMPtr<nsIAlertsIconData> alertsIconData(do_QueryInterface(mBackend));
+      if (alertsIconData) {
+        rv = alertsIconData->ShowAlertWithIconData(mAlert, mAlertListener,
+                                                   aIconSize, aIconData);
+      }
+    } else if (aIconURI) {
+      nsCOMPtr<nsIAlertsIconURI> alertsIconURI(do_QueryInterface(mBackend));
+      if (alertsIconURI) {
+        rv = alertsIconURI->ShowAlertWithIconURI(mAlert, mAlertListener,
+                                                 aIconURI);
+      }
+    }
+    if (NS_FAILED(rv)) {
+      rv = mBackend->ShowAlert(mAlert, mAlertListener);
+    }
+    return rv;
+  }
+
+private:
+  virtual ~IconCallback() {}
+
+  nsCOMPtr<nsIAlertsService> mBackend;
+  nsCOMPtr<nsIAlertNotification> mAlert;
+  nsCOMPtr<nsIObserver> mAlertListener;
+};
+
+NS_IMPL_ISUPPORTS(IconCallback, nsIFaviconDataCallback)
+
+#endif // MOZ_PLACES
+
+nsresult
+ShowWithIconBackend(nsIAlertsService* aBackend, nsIAlertNotification* aAlert,
+                    nsIObserver* aAlertListener)
+{
+#ifdef MOZ_PLACES
+  nsCOMPtr<nsIURI> uri;
+  nsresult rv = aAlert->GetURI(getter_AddRefs(uri));
+  if (NS_FAILED(rv) || !uri) {
+    return NS_ERROR_FAILURE;
+  }
+
+  // Ensure the backend supports favicons.
+  nsCOMPtr<nsIAlertsIconData> alertsIconData(do_QueryInterface(aBackend));
+  nsCOMPtr<nsIAlertsIconURI> alertsIconURI;
+  if (!alertsIconData) {
+    alertsIconURI = do_QueryInterface(aBackend);
+  }
+  if (!alertsIconData && !alertsIconURI) {
+    return NS_ERROR_NOT_IMPLEMENTED;
+  }
+
+  nsCOMPtr<mozIAsyncFavicons> favicons(do_GetService(
+    "@mozilla.org/browser/favicon-service;1"));
+  NS_ENSURE_TRUE(favicons, NS_ERROR_FAILURE);
+
+  nsCOMPtr<nsIFaviconDataCallback> callback =
+    new IconCallback(aBackend, aAlert, aAlertListener);
+  if (alertsIconData) {
+    return favicons->GetFaviconDataForPage(uri, callback);
+  }
+  return favicons->GetFaviconURLForPage(uri, callback);
+#else
+  return NS_ERROR_NOT_IMPLEMENTED;
+#endif // !MOZ_PLACES
+}
+
+nsresult
+ShowWithBackend(nsIAlertsService* aBackend, nsIAlertNotification* aAlert,
+                nsIObserver* aAlertListener)
+{
+  nsresult rv = ShowWithIconBackend(aBackend, aAlert, aAlertListener);
+  if (NS_SUCCEEDED(rv)) {
+    return rv;
+  }
+  // If the backend doesn't support favicons, show the alert without one.
+  return aBackend->ShowAlert(aAlert, aAlertListener);
+}
+
+} // anonymous namespace
+
 NS_IMPL_ISUPPORTS(nsAlertsService, nsIAlertsService, nsIAlertsDoNotDisturb, nsIAlertsProgressListener)
 
 nsAlertsService::nsAlertsService() :
@@ -66,7 +174,7 @@ bool nsAlertsService::ShouldShowAlert()
   return result;
 }
 
-NS_IMETHODIMP nsAlertsService::ShowAlertNotification(const nsAString & aImageUrl, const nsAString & aAlertTitle, 
+NS_IMETHODIMP nsAlertsService::ShowAlertNotification(const nsAString & aImageUrl, const nsAString & aAlertTitle,
                                                      const nsAString & aAlertText, bool aAlertTextClickable,
                                                      const nsAString & aAlertCookie,
                                                      nsIObserver * aAlertListener,
@@ -135,7 +243,7 @@ NS_IMETHODIMP nsAlertsService::ShowAlert(nsIAlertNotification * aAlert,
 #else
   // Check if there is an optional service that handles system-level notifications
   if (mBackend) {
-    rv = mBackend->ShowAlert(aAlert, aAlertListener);
+    rv = ShowWithBackend(mBackend, aAlert, aAlertListener);
     if (NS_SUCCEEDED(rv)) {
       return rv;
     }
@@ -154,7 +262,7 @@ NS_IMETHODIMP nsAlertsService::ShowAlert(nsIAlertNotification * aAlert,
   // Use XUL notifications as a fallback if above methods have failed.
   nsCOMPtr<nsIAlertsService> xulBackend(nsXULAlerts::GetInstance());
   NS_ENSURE_TRUE(xulBackend, NS_ERROR_FAILURE);
-  return xulBackend->ShowAlert(aAlert, aAlertListener);
+  return ShowWithBackend(xulBackend, aAlert, aAlertListener);
 #endif // !MOZ_WIDGET_ANDROID
 }
 
diff --git a/toolkit/components/alerts/nsIAlertsService.idl b/toolkit/components/alerts/nsIAlertsService.idl
index f11848f566e..d34061ff21b 100644
--- a/toolkit/components/alerts/nsIAlertsService.idl
+++ b/toolkit/components/alerts/nsIAlertsService.idl
@@ -7,12 +7,13 @@
 #include "nsIObserver.idl"
 
 interface nsIPrincipal;
+interface nsIURI;
 
 %{C++
 #define ALERT_NOTIFICATION_CONTRACTID "@mozilla.org/alert-notification;1"
 %}
 
-[scriptable, uuid(9e87fc34-8dbb-4b14-a724-b27be6822ec8)]
+[scriptable, uuid(1650a064-79d5-4eb6-8c9e-57dd6522b6ac)]
 interface nsIAlertNotification : nsISupports
 {
   /** Initializes an alert notification. */
@@ -85,6 +86,12 @@ interface nsIAlertNotification : nsISupports
    */
   readonly attribute nsIPrincipal principal;
 
+  /**
+   * The URI of the page that created the alert. |null| if the alert is not
+   * actionable.
+   */
+  readonly attribute nsIURI URI;
+
   /**
    * Controls the image loading behavior. If true, the image URL will be loaded
    * in private browsing mode.
@@ -224,3 +231,30 @@ interface nsIAlertsProgressListener : nsISupports
   void onCancel(in AString name);
 };
 
+[scriptable, uuid(fc6d7f0a-0cf6-4268-8c71-ab640842b9b1)]
+interface nsIAlertsIconData : nsISupports
+{
+  /**
+   * Shows an alert with an icon. Web notifications use the favicon of the
+   * page that created the alert. If the favicon is not in the Places database,
+   * |iconSize| will be zero.
+  */
+  void showAlertWithIconData(in nsIAlertNotification alert,
+                             [optional] in nsIObserver alertListener,
+                             [optional] in uint32_t iconSize,
+                             [const, array, size_is(iconSize)] in uint8_t
+                                                               iconData);
+};
+
+[scriptable, uuid(f3c82915-bf60-41ea-91ce-6c46b22e381a)]
+interface nsIAlertsIconURI : nsISupports
+{
+  /**
+   * Shows an alert with an icon URI. Web notifications use |moz-anno:|
+   * URIs to reference favicons from Places. If the page doesn't have a
+   * favicon, |iconURI| will be |null|.
+   */
+  void showAlertWithIconURI(in nsIAlertNotification alert,
+                            [optional] in nsIObserver alertListener,
+                            [optional] in nsIURI iconURI);
+};

From c3bb67a66fb438ee3bdfe3a2cbf2f0945961e25e Mon Sep 17 00:00:00 2001
From: Kit Cambridge <kcambridge@mozilla.com>
Date: Thu, 7 Jan 2016 13:16:54 -0700
Subject: [PATCH 30/45] Bug 1224785, Part 2 - Show the site favicon in OS X
 notifications. r=mstange

MozReview-Commit-ID: L7d00xEY6Ka
---
 widget/cocoa/OSXNotificationCenter.h  |  4 +++-
 widget/cocoa/OSXNotificationCenter.mm | 24 +++++++++++++++++++++++-
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/widget/cocoa/OSXNotificationCenter.h b/widget/cocoa/OSXNotificationCenter.h
index 3ae5df5b448..f56ddd2762e 100644
--- a/widget/cocoa/OSXNotificationCenter.h
+++ b/widget/cocoa/OSXNotificationCenter.h
@@ -25,13 +25,15 @@ class OSXNotificationInfo;
 
 class OSXNotificationCenter : public nsIAlertsService,
                               public imgINotificationObserver,
-                              public nsITimerCallback
+                              public nsITimerCallback,
+                              public nsIAlertsIconData
 {
 public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSIALERTSSERVICE
   NS_DECL_IMGINOTIFICATIONOBSERVER
   NS_DECL_NSITIMERCALLBACK
+  NS_DECL_NSIALERTSICONDATA
 
   OSXNotificationCenter();
 
diff --git a/widget/cocoa/OSXNotificationCenter.mm b/widget/cocoa/OSXNotificationCenter.mm
index 54e51886f62..2fee40b40d6 100644
--- a/widget/cocoa/OSXNotificationCenter.mm
+++ b/widget/cocoa/OSXNotificationCenter.mm
@@ -218,7 +218,8 @@ OSXNotificationCenter::~OSXNotificationCenter()
   NS_OBJC_END_TRY_ABORT_BLOCK;
 }
 
-NS_IMPL_ISUPPORTS(OSXNotificationCenter, nsIAlertsService, imgINotificationObserver, nsITimerCallback)
+NS_IMPL_ISUPPORTS(OSXNotificationCenter, nsIAlertsService, nsITimerCallback,
+                  imgINotificationObserver, nsIAlertsIconData)
 
 nsresult OSXNotificationCenter::Init()
 {
@@ -255,6 +256,15 @@ OSXNotificationCenter::ShowAlertNotification(const nsAString & aImageUrl, const
 NS_IMETHODIMP
 OSXNotificationCenter::ShowAlert(nsIAlertNotification* aAlert,
                                  nsIObserver* aAlertListener)
+{
+  return ShowAlertWithIconData(aAlert, aAlertListener, 0, nullptr);
+}
+
+NS_IMETHODIMP
+OSXNotificationCenter::ShowAlertWithIconData(nsIAlertNotification* aAlert,
+                                             nsIObserver* aAlertListener,
+                                             uint32_t aIconSize,
+                                             const uint8_t* aIconData)
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
 
@@ -348,6 +358,18 @@ OSXNotificationCenter::ShowAlert(nsIAlertNotification* aAlert,
 
   OSXNotificationInfo *osxni = new OSXNotificationInfo(alertName, aAlertListener, cookie);
 
+  // Show the favicon if supported on this version of OS X.
+  if (aIconSize > 0 &&
+      [notification respondsToSelector:@selector(set_identityImage:)] &&
+      [notification respondsToSelector:@selector(set_identityImageHasBorder:)]) {
+
+    NSData *iconData = [NSData dataWithBytes:aIconData length:aIconSize];
+    NSImage *icon = [[[NSImage alloc] initWithData:iconData] autorelease];
+
+    [(NSObject*)notification setValue:icon forKey:@"_identityImage"];
+    [(NSObject*)notification setValue:@(NO) forKey:@"_identityImageHasBorder"];
+  }
+
   nsAutoString imageUrl;
   rv = aAlert->GetImageURL(imageUrl);
   NS_ENSURE_SUCCESS(rv, rv);

From c2e5068f987d0fbb9b1e6daa5dc362f759ec9510 Mon Sep 17 00:00:00 2001
From: Kit Cambridge <kcambridge@mozilla.com>
Date: Fri, 8 Jan 2016 12:53:34 -0700
Subject: [PATCH 31/45] Bug 1206560 - Show the site favicon in XUL
 notifications. r=jaws

MozReview-Commit-ID: Fe3R91icOuc
---
 .../test/alerts/browser_notification_close.js |  2 ++
 .../test/alerts/file_dom_notifications.html   |  1 +
 toolkit/components/alerts/nsXULAlerts.cpp     | 21 ++++++++++++++++++-
 toolkit/components/alerts/nsXULAlerts.h       |  4 +++-
 .../alerts/resources/content/alert.css        |  6 ++++++
 .../alerts/resources/content/alert.js         | 10 +++++++++
 .../alerts/resources/content/alert.xul        |  1 +
 toolkit/themes/shared/alert-common.css        | 16 ++++++++++++++
 8 files changed, 59 insertions(+), 2 deletions(-)

diff --git a/browser/base/content/test/alerts/browser_notification_close.js b/browser/base/content/test/alerts/browser_notification_close.js
index 82e1f314fac..3d4660dbb4a 100644
--- a/browser/base/content/test/alerts/browser_notification_close.js
+++ b/browser/base/content/test/alerts/browser_notification_close.js
@@ -29,6 +29,8 @@ add_task(function* test_notificationClose() {
     is(alertTitleLabel.value, "Test title", "Title text of notification should be present");
     let alertTextLabel = alertWindow.document.getElementById("alertTextLabel");
     is(alertTextLabel.textContent, "Test body", "Body text of notification should be present");
+    let alertIcon = alertWindow.document.getElementById("alertIcon");
+    ok(alertIcon.src, "Icon of notification should be present");
 
     let alertCloseButton = alertWindow.document.querySelector(".alertCloseButton");
     is(alertCloseButton.localName, "toolbarbutton", "close button found");
diff --git a/browser/base/content/test/alerts/file_dom_notifications.html b/browser/base/content/test/alerts/file_dom_notifications.html
index 8f5c6f2fd57..e5a2be2d3f4 100644
--- a/browser/base/content/test/alerts/file_dom_notifications.html
+++ b/browser/base/content/test/alerts/file_dom_notifications.html
@@ -1,6 +1,7 @@
 <html>
 <head>
 <meta charset="utf-8">
+<link rel="icon" type="image/png" href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAADElEQVQI12P4//8/AAX+Av7czFnnAAAAAElFTkSuQmCC">
 <script>
 "use strict";
 
diff --git a/toolkit/components/alerts/nsXULAlerts.cpp b/toolkit/components/alerts/nsXULAlerts.cpp
index f28c4501c8d..f85c67662dd 100644
--- a/toolkit/components/alerts/nsXULAlerts.cpp
+++ b/toolkit/components/alerts/nsXULAlerts.cpp
@@ -48,7 +48,7 @@ nsXULAlertObserver::Observe(nsISupports* aSubject, const char* aTopic,
   return rv;
 }
 
-NS_IMPL_ISUPPORTS(nsXULAlerts, nsIAlertsService, nsIAlertsDoNotDisturb)
+NS_IMPL_ISUPPORTS(nsXULAlerts, nsIAlertsService, nsIAlertsDoNotDisturb, nsIAlertsIconURI)
 
 /* static */ already_AddRefed<nsXULAlerts>
 nsXULAlerts::GetInstance()
@@ -83,6 +83,14 @@ nsXULAlerts::ShowAlertNotification(const nsAString& aImageUrl, const nsAString&
 NS_IMETHODIMP
 nsXULAlerts::ShowAlert(nsIAlertNotification* aAlert,
                        nsIObserver* aAlertListener)
+{
+  return ShowAlertWithIconURI(aAlert, aAlertListener, nullptr);
+}
+
+NS_IMETHODIMP
+nsXULAlerts::ShowAlertWithIconURI(nsIAlertNotification* aAlert,
+                                  nsIObserver* aAlertListener,
+                                  nsIURI* aIconURI)
 {
   bool inPrivateBrowsing;
   nsresult rv = aAlert->GetInPrivateBrowsing(&inPrivateBrowsing);
@@ -240,6 +248,17 @@ nsXULAlerts::ShowAlert(nsIAlertNotification* aAlert,
   rv = argsArray->AppendElement(scriptableAlertSource);
   NS_ENSURE_SUCCESS(rv, rv);
 
+  nsCOMPtr<nsISupportsCString> scriptableIconURL (do_CreateInstance(NS_SUPPORTS_CSTRING_CONTRACTID));
+  NS_ENSURE_TRUE(scriptableIconURL, NS_ERROR_FAILURE);
+  if (aIconURI) {
+    nsAutoCString iconURL;
+    rv = aIconURI->GetSpec(iconURL);
+    NS_ENSURE_SUCCESS(rv, rv);
+    scriptableIconURL->SetData(iconURL);
+  }
+  rv = argsArray->AppendElement(scriptableIconURL);
+  NS_ENSURE_SUCCESS(rv, rv);
+
   nsCOMPtr<mozIDOMWindowProxy> newWindow;
   nsAutoCString features("chrome,dialog=yes,titlebar=no,popup=yes");
   if (inPrivateBrowsing) {
diff --git a/toolkit/components/alerts/nsXULAlerts.h b/toolkit/components/alerts/nsXULAlerts.h
index c317ea80bae..698d29397e5 100644
--- a/toolkit/components/alerts/nsXULAlerts.h
+++ b/toolkit/components/alerts/nsXULAlerts.h
@@ -13,10 +13,12 @@
 #include "nsIObserver.h"
 
 class nsXULAlerts : public nsIAlertsService,
-                    public nsIAlertsDoNotDisturb
+                    public nsIAlertsDoNotDisturb,
+                    public nsIAlertsIconURI
 {
   friend class nsXULAlertObserver;
 public:
+  NS_DECL_NSIALERTSICONURI
   NS_DECL_NSIALERTSDONOTDISTURB
   NS_DECL_NSIALERTSSERVICE
   NS_DECL_ISUPPORTS
diff --git a/toolkit/components/alerts/resources/content/alert.css b/toolkit/components/alerts/resources/content/alert.css
index 54a54c3fd83..236d7612662 100644
--- a/toolkit/components/alerts/resources/content/alert.css
+++ b/toolkit/components/alerts/resources/content/alert.css
@@ -13,10 +13,16 @@
 }
 
 #alertBox:not([hasOrigin]) > box > #alertTextBox > #alertFooter,
+#alertBox:not([hasIcon]) > box > #alertIcon,
 #alertImage:not([src]) {
   display: none;
 }
 
+#alertTitleBox {
+  -moz-box-pack: center;
+  -moz-box-align: center;
+}
+
 .alertText {
   white-space: pre-wrap;
 }
diff --git a/toolkit/components/alerts/resources/content/alert.js b/toolkit/components/alerts/resources/content/alert.js
index 684ceb39207..b67cb7783c4 100644
--- a/toolkit/components/alerts/resources/content/alert.js
+++ b/toolkit/components/alerts/resources/content/alert.js
@@ -37,9 +37,19 @@ function prefillAlertInfo() {
   // arguments[8] --> replaced alert window (nsIDOMWindow)
   // arguments[9] --> an optional callback listener (nsIObserver)
   // arguments[10] -> the nsIURI.hostPort of the origin, optional
+  // arguments[11] -> the alert icon URL, optional
 
   switch (window.arguments.length) {
     default:
+    case 12: {
+      if (window.arguments[11]) {
+        let alertBox = document.getElementById("alertBox");
+        alertBox.setAttribute("hasIcon", true);
+
+        let icon = document.getElementById("alertIcon");
+        icon.src = window.arguments[11];
+      }
+    }
     case 11: {
       if (window.arguments[10]) {
         let alertBox = document.getElementById("alertBox");
diff --git a/toolkit/components/alerts/resources/content/alert.xul b/toolkit/components/alerts/resources/content/alert.xul
index c4c2771cb7e..8597d9954d8 100644
--- a/toolkit/components/alerts/resources/content/alert.xul
+++ b/toolkit/components/alerts/resources/content/alert.xul
@@ -25,6 +25,7 @@
 
   <vbox id="alertBox" class="alertBox">
     <box id="alertTitleBox">
+      <image id="alertIcon"/>
       <label id="alertTitleLabel" class="alertTitle plain" crop="end"/>
       <vbox class="alertCloseBox">
         <toolbarbutton class="alertCloseButton close-icon"
diff --git a/toolkit/themes/shared/alert-common.css b/toolkit/themes/shared/alert-common.css
index 20d9e7b00cf..a58388e56a3 100644
--- a/toolkit/themes/shared/alert-common.css
+++ b/toolkit/themes/shared/alert-common.css
@@ -53,6 +53,22 @@
   }
 }
 
+#alertIcon {
+  margin-top: 6px;
+  margin-inline-start: 8px;
+  margin-inline-end: 0;
+  margin-bottom: 0;
+  width: 16px;
+  min-height: 16px;
+  max-height: 16px;
+}
+
+@media (resolution: 2dppx) {
+  #alertIcon {
+    image-rendering: -moz-crisp-edges;
+  }
+}
+
 #alertImage {
   width: 80px;
   height: 80px;

From b2422a25f167223f04d8f6da9965bb8b30a48c0b Mon Sep 17 00:00:00 2001
From: Dave Townsend <dtownsend@oxymoronical.com>
Date: Fri, 5 Feb 2016 11:37:50 -0800
Subject: [PATCH 32/45] Bug 1245916: Unify eslint global discovery rules.
 r=pbrosset

While working on turning on no-undef I discovered that the various rules we
have for defining globals are a little inconsistent in whether the files they
load recurse through import-globals-from directives and none of them imported
eslint globals directives.

I think we're better off putting all this global parsing code in a single place
rather than spread across multiple rules. Have one rule to turn it on for
parsed files and one function to load globals from other files and make them
share most of the code so we won't get inconsistent. If we find us needing to
turn on/off individual features we can figure out a way to do that in the
future.

This patch does that, the globals.js file does all global parsing with a shared
object that receives events from the AST, either through from an ESlint rule
or from a simple AST walker using estraverse.

MozReview-Commit-ID: 9KQZwsNNOUl
---
 .eslintrc                                     |   4 +-
 .../docs/components-imports.rst               |  21 --
 .../docs/import-globals-from.rst              |  18 --
 .../docs/import-globals.rst                   |  20 ++
 .../docs/this-top-level-scope.rst             |  11 -
 testing/eslint-plugin-mozilla/lib/globals.js  | 187 +++++++++++++
 testing/eslint-plugin-mozilla/lib/helpers.js  | 254 +++++++-----------
 testing/eslint-plugin-mozilla/lib/index.js    |   8 +-
 .../lib/rules/components-imports.js           |  33 ---
 .../lib/rules/import-browserjs-globals.js     |   8 +-
 .../lib/rules/import-globals-from.js          |  33 ---
 .../lib/rules/import-globals.js               |  15 ++
 .../lib/rules/import-headjs-globals.js        |  10 +-
 .../lib/rules/no-cpows-in-tests.js            |   2 +-
 .../lib/rules/this-top-level-scope.js         |  33 ---
 .../lib/rules/var-only-at-top-level.js        |   2 +-
 toolkit/components/extensions/.eslintrc       |   2 -
 17 files changed, 327 insertions(+), 334 deletions(-)
 delete mode 100644 testing/eslint-plugin-mozilla/docs/components-imports.rst
 delete mode 100644 testing/eslint-plugin-mozilla/docs/import-globals-from.rst
 create mode 100644 testing/eslint-plugin-mozilla/docs/import-globals.rst
 delete mode 100644 testing/eslint-plugin-mozilla/docs/this-top-level-scope.rst
 create mode 100644 testing/eslint-plugin-mozilla/lib/globals.js
 delete mode 100644 testing/eslint-plugin-mozilla/lib/rules/components-imports.js
 delete mode 100644 testing/eslint-plugin-mozilla/lib/rules/import-globals-from.js
 create mode 100644 testing/eslint-plugin-mozilla/lib/rules/import-globals.js
 delete mode 100644 testing/eslint-plugin-mozilla/lib/rules/this-top-level-scope.js

diff --git a/.eslintrc b/.eslintrc
index 19fdb0b55df..491de0d4f26 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -4,9 +4,7 @@
     "mozilla"
   ],
   "rules": {
-    "mozilla/components-imports": 1,
-    "mozilla/import-globals-from": 1,
-    "mozilla/this-top-level-scope": 1,
+    "mozilla/import-globals": 1,
   },
   "env": {
     "es6": true
diff --git a/testing/eslint-plugin-mozilla/docs/components-imports.rst b/testing/eslint-plugin-mozilla/docs/components-imports.rst
deleted file mode 100644
index b923f2a9166..00000000000
--- a/testing/eslint-plugin-mozilla/docs/components-imports.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-.. _components-imports:
-
-==================
-components-imports
-==================
-
-Rule Details
-------------
-
-Adds the filename of imported files e.g.
-``Cu.import("some/path/Blah.jsm")`` adds Blah to the global scope.
-
-The following patterns are supported:
-
--  ``Cu.import("resource://devtools/client/shared/widgets/ViewHelpers.jsm");``
--  ``loader.lazyImporter(this, "name1");``
--  ``loader.lazyRequireGetter(this, "name2"``
--  ``loader.lazyServiceGetter(this, "name3"``
--  ``XPCOMUtils.defineLazyModuleGetter(this, "setNamedTimeout", ...)``
--  ``loader.lazyGetter(this, "toolboxStrings"``
--  ``XPCOMUtils.defineLazyGetter(this, "clipboardHelper"``
diff --git a/testing/eslint-plugin-mozilla/docs/import-globals-from.rst b/testing/eslint-plugin-mozilla/docs/import-globals-from.rst
deleted file mode 100644
index fcd32b301bc..00000000000
--- a/testing/eslint-plugin-mozilla/docs/import-globals-from.rst
+++ /dev/null
@@ -1,18 +0,0 @@
-.. _import-globals-from:
-
-===================
-import-globals-from
-===================
-
-Rule Details
-------------
-
-When the "import-globals-from <path>" comment is found in a file, then all
-globals from the file at <path> will be imported in the current scope.
-
-This is useful for tests that rely on globals defined in head.js files, or for
-scripts that are loaded as <script> tag in a window in rely on eachother's
-globals.
-
-If <path> is a relative path, then it must be relative to the file being
-checked by the rule.
diff --git a/testing/eslint-plugin-mozilla/docs/import-globals.rst b/testing/eslint-plugin-mozilla/docs/import-globals.rst
new file mode 100644
index 00000000000..6e01a67658b
--- /dev/null
+++ b/testing/eslint-plugin-mozilla/docs/import-globals.rst
@@ -0,0 +1,20 @@
+.. _import-globals:
+
+==============
+import-globals
+==============
+
+Rule Details
+------------
+
+Parses a file for globals defined in various unique Mozilla ways.
+
+When a "import-globals-from <path>" comment is found in a file, then all globals
+from the file at <path> will be imported in the current scope. This will also
+operate recursively.
+
+This is useful for scripts that are loaded as <script> tag in a window and rely
+on each other's globals.
+
+If <path> is a relative path, then it must be relative to the file being
+checked by the rule.
diff --git a/testing/eslint-plugin-mozilla/docs/this-top-level-scope.rst b/testing/eslint-plugin-mozilla/docs/this-top-level-scope.rst
deleted file mode 100644
index 0982e15283d..00000000000
--- a/testing/eslint-plugin-mozilla/docs/this-top-level-scope.rst
+++ /dev/null
@@ -1,11 +0,0 @@
-.. _this-top-level-scope:
-
-====================
-this-top-level-scope
-====================
-
-Rule Details
-------------
-
-Treat top-level assignments like ``this.mumble = value`` as declaring
-a global.
diff --git a/testing/eslint-plugin-mozilla/lib/globals.js b/testing/eslint-plugin-mozilla/lib/globals.js
new file mode 100644
index 00000000000..3958b311b69
--- /dev/null
+++ b/testing/eslint-plugin-mozilla/lib/globals.js
@@ -0,0 +1,187 @@
+/**
+ * @fileoverview functions for scanning an AST for globals including
+ *               traversing referenced scripts.
+ * 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 path = require("path");
+const fs = require("fs");
+const helpers = require("./helpers");
+const escope = require("escope");
+const estraverse = require("estraverse");
+
+/**
+ * Parses a list of "name:boolean_value" or/and "name" options divided by comma or
+ * whitespace.
+ *
+ * This function was copied from eslint.js
+ *
+ * @param {string} string The string to parse.
+ * @param {Comment} comment The comment node which has the string.
+ * @returns {Object} Result map object of names and boolean values
+ */
+function parseBooleanConfig(string, comment) {
+  let items = {};
+
+  // Collapse whitespace around : to make parsing easier
+  string = string.replace(/\s*:\s*/g, ":");
+  // Collapse whitespace around ,
+  string = string.replace(/\s*,\s*/g, ",");
+
+  string.split(/\s|,+/).forEach(function(name) {
+    if (!name) {
+      return;
+    }
+
+    let pos = name.indexOf(":");
+    let value = undefined;
+    if (pos !== -1) {
+      value = name.substring(pos + 1, name.length);
+      name = name.substring(0, pos);
+    }
+
+    items[name] = {
+      value: (value === "true"),
+      comment: comment
+    };
+  });
+
+  return items;
+}
+
+/**
+ * Global discovery can require parsing many files. This map of
+ * {String} => {Object} caches what globals were discovered for a file path.
+ */
+const globalCache = new Map();
+
+/**
+ * An object that returns found globals for given AST node types. Each prototype
+ * property should be named for a node type and accepts a node parameter and a
+ * parents parameter which is a list of the parent nodes of the current node.
+ * Each returns an array of globals found.
+ *
+ * @param  {String} path
+ *         The absolute path of the file being parsed.
+ */
+function GlobalsForNode(path) {
+  this.path = path;
+}
+
+GlobalsForNode.prototype = {
+  BlockComment(node, parents) {
+    let value = node.value.trim();
+    let match = /^import-globals-from\s+(.+)$/.exec(value);
+    if (!match) {
+      return [];
+    }
+
+    let filePath = match[1].trim();
+
+    if (!path.isAbsolute(filePath)) {
+      let dirName = path.dirname(this.path);
+      filePath = path.resolve(dirName, filePath);
+    }
+
+    return module.exports.getGlobalsForFile(filePath);
+  },
+
+  ExpressionStatement(node, parents) {
+    let isGlobal = helpers.getIsGlobalScope(parents);
+    let name = helpers.convertExpressionToGlobal(node, isGlobal);
+    return name ? [{ name, writable: true}] : [];
+  },
+};
+
+module.exports = {
+  /**
+   * Returns all globals for a given file. Recursively searches through
+   * import-globals-from directives and also includes globals defined by
+   * standard eslint directives.
+   *
+   * @param  {String} path
+   *         The absolute path of the file to be parsed.
+   */
+  getGlobalsForFile(path) {
+    if (globalCache.has(path)) {
+      return globalCache.get(path);
+    }
+
+    let content = fs.readFileSync(path, "utf8");
+
+    // Parse the content into an AST
+    let ast = helpers.getAST(content);
+
+    // Discover global declarations
+    let scopeManager = escope.analyze(ast);
+    let globalScope = scopeManager.acquire(ast);
+
+    let globals = Object.keys(globalScope.variables).map(v => ({
+      name: globalScope.variables[v].name,
+      writable: true,
+    }));
+
+    // Walk over the AST to find any of our custom globals
+    let handler = new GlobalsForNode(path);
+
+    helpers.walkAST(ast, (type, node, parents) => {
+      // We have to discover any globals that ESLint would have defined through
+      // comment directives
+      if (type == "BlockComment") {
+        let value = node.value.trim();
+        let match = /^globals?\s+(.+)$/.exec(value);
+        if (match) {
+          let values = parseBooleanConfig(match[1].trim(), node);
+          for (let name of Object.keys(values)) {
+            globals.push({
+              name,
+              writable: values[name].value
+            })
+          }
+        }
+      }
+
+      if (type in handler) {
+        let newGlobals = handler[type](node, parents);
+        globals.push.apply(globals, newGlobals);
+      }
+    });
+
+    globalCache.set(path, globals);
+
+    return globals;
+  },
+
+  /**
+   * Intended to be used as-is for an ESLint rule that parses for globals in
+   * the current file and recurses through import-globals-from directives.
+   *
+   * @param  {Object} context
+   *         The ESLint parsing context.
+   */
+  getESLintGlobalParser(context) {
+    let globalScope;
+
+    let parser = {
+      Program(node) {
+        globalScope = context.getScope();
+      }
+    };
+
+    // Install thin wrappers around GlobalsForNode
+    let handler = new GlobalsForNode(helpers.getAbsoluteFilePath(context));
+
+    for (let type of Object.keys(GlobalsForNode.prototype)) {
+      parser[type] = function(node) {
+        let globals = handler[type](node, context.getAncestors());
+        helpers.addGlobals(globals, globalScope);
+      }
+    }
+
+    return parser;
+  }
+};
diff --git a/testing/eslint-plugin-mozilla/lib/helpers.js b/testing/eslint-plugin-mozilla/lib/helpers.js
index 958d78840d6..c8af64713d5 100644
--- a/testing/eslint-plugin-mozilla/lib/helpers.js
+++ b/testing/eslint-plugin-mozilla/lib/helpers.js
@@ -26,6 +26,7 @@ var definitions = [
   /^Object\.defineProperty\(this, "(\w+)"/,
   /^Reflect\.defineProperty\(this, "(\w+)"/,
   /^this\.__defineGetter__\("(\w+)"/,
+  /^this\.(\w+) =/
 ];
 
 var imports = [
@@ -83,17 +84,81 @@ module.exports = {
         return "function() {}";
       case "ArrowFunctionExpression":
         return "() => {}";
+      case "AssignmentExpression":
+        return this.getASTSource(node.left) + " = " + this.getASTSource(node.right);
       default:
         throw new Error("getASTSource unsupported node type: " + node.type);
     }
   },
 
+  /**
+   * This walks an AST in a manner similar to ESLint passing node and comment
+   * events to the listener. The listener is expected to be a simple function
+   * which accepts node type, node and parents arguments.
+   *
+   * @param  {Object} ast
+   *         The AST to walk.
+   * @param  {Function} listener
+   *         A callback function to call for the nodes. Passed three arguments,
+   *         event type, node and an array of parent nodes for the current node.
+   */
+  walkAST(ast, listener) {
+    let parents = [];
+
+    let seenComments = new Set();
+    function sendCommentEvents(comments) {
+      if (!comments) {
+        return;
+      }
+
+      for (let comment of comments) {
+        if (seenComments.has(comment)) {
+          return;
+        }
+        seenComments.add(comment);
+
+        listener(comment.type + "Comment", comment, parents);
+      }
+    }
+
+    estraverse.traverse(ast, {
+      enter(node, parent) {
+        // Comments are held in node.comments for empty programs
+        let leadingComments = node.leadingComments;
+        if (node.type === "Program" && node.body.length == 0) {
+          leadingComments = node.comments;
+        }
+
+        sendCommentEvents(leadingComments);
+        listener(node.type, node, parents);
+        sendCommentEvents(node.trailingComments);
+
+        parents.push(node);
+      },
+
+      leave(node, parent) {
+        // TODO send comment exit events
+        listener(node.type + ":exit", node, parents);
+
+        if (parents.length == 0) {
+          throw new Error("Left more nodes than entered.");
+        }
+        parents.pop();
+      }
+    });
+    if (parents.length) {
+      throw new Error("Entered more nodes than left.");
+    }
+  },
+
   /**
    * Attempts to convert an ExpressionStatement to a likely global variable
    * definition.
    *
    * @param  {Object} node
    *         The AST node to convert.
+   * @param  {boolean} isGlobal
+   *         True if the current node is in the global scope
    *
    * @return {String or null}
    *         The variable name defined.
@@ -133,90 +198,29 @@ module.exports = {
     return null;
   },
 
-  /**
-   * Walks over an AST and calls a callback for every ExpressionStatement found.
-   *
-   * @param  {Object} ast
-   *         The AST to traverse.
-   *
-   * @return {Function}
-   *         The callback to call for each ExpressionStatement.
-   */
-  expressionTraverse: function(ast, callback) {
-    var helpers = this;
-    var parents = new Map();
-
-    // Walk the parents of a node to see if any are functions
-    function isGlobal(node) {
-      var parent = parents.get(node);
-      while (parent) {
-        if (parent.type == "FunctionExpression" ||
-            parent.type == "FunctionDeclaration") {
-          return false;
-        }
-        parent = parents.get(parent);
-      }
-      return true;
-    }
-
-    estraverse.traverse(ast, {
-      enter: function(node, parent) {
-        parents.set(node, parent);
-
-        if (node.type == "ExpressionStatement") {
-          callback(node, isGlobal(node));
-        }
-      }
-    });
-  },
-
-  /**
-   * Get an array of globals from an AST.
-   *
-   * @param  {Object} ast
-   *         The AST for which the globals are to be returned.
-   *
-   * @return {Array}
-   *         An array of variable names.
-   */
-  getGlobals: function(ast) {
-    var scopeManager = escope.analyze(ast);
-    var globalScope = scopeManager.acquire(ast);
-    var result = [];
-
-    for (var variable in globalScope.variables) {
-      var name = globalScope.variables[variable].name;
-      result.push(name);
-    }
-
-    var helpers = this;
-    this.expressionTraverse(ast, function(node, isGlobal) {
-      var name = helpers.convertExpressionToGlobal(node, isGlobal);
-
-      if (name) {
-        result.push(name);
-      }
-    });
-
-    return result;
-  },
-
   /**
    * Add a variable to the current scope.
    * HACK: This relies on eslint internals so it could break at any time.
    *
    * @param {String} name
-   *        The variable name to add to the current scope.
-   * @param {ASTContext} context
-   *        The current context.
+   *        The variable name to add to the scope.
+   * @param {ASTScope} scope
+   *        The scope to add to.
+   * @param {boolean} writable
+   *        Whether the global can be overwritten.
    */
-  addVarToScope: function(name, context) {
-    var scope = context.getScope();
+  addVarToScope: function(name, scope, writable) {
+    // If the variable is already defined then skip it
+    if (scope.set && scope.set.has(name)) {
+      return;
+    }
+
+    writable = writable === undefined ? true : writable;
     var variables = scope.variables;
     var variable = new escope.Variable(name, scope);
 
     variable.eslintExplicitGlobal = false;
-    variable.writeable = true;
+    variable.writeable = writable;
     variables.push(variable);
 
     // Since eslint 1.10.3, scope variables are now duplicated in the scope.set
@@ -227,88 +231,16 @@ module.exports = {
     }
   },
 
-  // Caches globals found in a file so we only have to parse a file once.
-  globalCache: new Map(),
-
   /**
-   * Finds all the globals defined in a given file.
-   *
-   * @param {String} fileName
-   *        The file to parse for globals.
-   */
-  getGlobalsForFile: function(fileName) {
-    // If the file can't be found, let the error go up to the caller so it can
-    // be logged as an error in the current file.
-    var content = fs.readFileSync(fileName, "utf8");
-
-    if (this.globalCache.has(fileName)) {
-      return this.globalCache.get(fileName);
-    }
-
-    // Parse the content and get the globals from the ast.
-    var ast = this.getAST(content);
-    var globalVars = this.getGlobals(ast);
-    this.globalCache.set(fileName, globalVars);
-
-    return globalVars;
-  },
-
-  /**
-   * Adds a set of globals to a context.
+   * Adds a set of globals to a scope.
    *
    * @param {Array} globalVars
    *        An array of global variable names.
-   * @param {ASTContext} context
-   *        The current context.
+   * @param {ASTScope} scope
+   *        The scope.
    */
-  addGlobals: function(globalVars, context) {
-    for (var i = 0; i < globalVars.length; i++) {
-      var varName = globalVars[i];
-      this.addVarToScope(varName, context);
-    }
-  },
-
-  /**
-   * Process comments looking for import-globals-from statements.  Add globals
-   * from those files, if any.
-   *
-   * @param {String} currentFilePath
-   *        Absolute path to the file containing the comments.
-   * @param {Array} comments
-   *        The comments to be processed.
-   * @param {Object} node
-   *        The AST node for error reporting.
-   * @param {ASTContext} context
-   *        The current context.
-   */
-  addGlobalsFromComments: function(currentFilePath, comments, node, context) {
-    comments.forEach(comment => {
-      var value = comment.value.trim();
-      var match = /^import-globals-from\s+(.*)$/.exec(value);
-
-      if (match) {
-        var filePath = match[1];
-
-        if (!path.isAbsolute(filePath)) {
-          var dirName = path.dirname(currentFilePath);
-          filePath = path.resolve(dirName, filePath);
-        }
-
-        try {
-          let globals = this.getGlobalsForFile(filePath);
-          this.addGlobals(globals, context);
-        } catch (e) {
-          context.report(
-            node,
-            "Could not load globals from file {{filePath}}: {{error}}",
-            {
-              filePath: filePath,
-              error: e
-            }
-          );
-        }
-      }
-    });
+  addGlobals: function(globalVars, scope) {
+    globalVars.forEach(v => this.addVarToScope(v.name, scope, v.writable));
   },
 
   /**
@@ -321,6 +253,7 @@ module.exports = {
   getPermissiveConfig: function() {
     return {
       comment: true,
+      attachComment: true,
       range: true,
       loc: true,
       tolerant: true,
@@ -354,21 +287,20 @@ module.exports = {
   /**
    * Check whether the context is the global scope.
    *
-   * @param {ASTContext} context
-   *        The current context.
+   * @param {Array} ancestors
+   *        The parents of the current node.
    *
    * @return {Boolean}
    *         True or false
    */
-  getIsGlobalScope: function(context) {
-    var ancestors = context.getAncestors();
-    var parent = ancestors.pop();
-
-    if (parent.type == "ExpressionStatement") {
-      parent = ancestors.pop();
+  getIsGlobalScope: function(ancestors) {
+    for (let parent of ancestors) {
+      if (parent.type == "FunctionExpression" ||
+          parent.type == "FunctionDeclaration") {
+        return false;
+      }
     }
-
-    return parent.type == "Program";
+    return true;
   },
 
   /**
diff --git a/testing/eslint-plugin-mozilla/lib/index.js b/testing/eslint-plugin-mozilla/lib/index.js
index 810f5e2f53e..5864f627580 100644
--- a/testing/eslint-plugin-mozilla/lib/index.js
+++ b/testing/eslint-plugin-mozilla/lib/index.js
@@ -18,28 +18,24 @@ module.exports = {
   },
   rules: {
     "balanced-listeners": require("../lib/rules/balanced-listeners"),
-    "components-imports": require("../lib/rules/components-imports"),
-    "import-globals-from": require("../lib/rules/import-globals-from"),
+    "import-globals": require("../lib/rules/import-globals"),
     "import-headjs-globals": require("../lib/rules/import-headjs-globals"),
     "import-browserjs-globals": require("../lib/rules/import-browserjs-globals"),
     "mark-test-function-used": require("../lib/rules/mark-test-function-used"),
     "no-aArgs": require("../lib/rules/no-aArgs"),
     "no-cpows-in-tests": require("../lib/rules/no-cpows-in-tests"),
     "reject-importGlobalProperties": require("../lib/rules/reject-importGlobalProperties"),
-    "this-top-level-scope": require("../lib/rules/this-top-level-scope.js"),
     "var-only-at-top-level": require("../lib/rules/var-only-at-top-level")
   },
   rulesConfig: {
     "balanced-listeners": 0,
-    "components-imports": 0,
-    "import-globals-from": 0,
+    "import-globals": 0,
     "import-headjs-globals": 0,
     "import-browserjs-globals": 0,
     "mark-test-function-used": 0,
     "no-aArgs": 0,
     "no-cpows-in-tests": 0,
     "reject-importGlobalProperties": 0,
-    "this-top-level-scope": 0,
     "var-only-at-top-level": 0
   }
 };
diff --git a/testing/eslint-plugin-mozilla/lib/rules/components-imports.js b/testing/eslint-plugin-mozilla/lib/rules/components-imports.js
deleted file mode 100644
index 830b1797633..00000000000
--- a/testing/eslint-plugin-mozilla/lib/rules/components-imports.js
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * @fileoverview Adds the filename of imported files e.g.
- * Cu.import("some/path/Blah.jsm") adds Blah to the current scope.
- *
- * 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";
-
-// -----------------------------------------------------------------------------
-// Rule Definition
-// -----------------------------------------------------------------------------
-
-var helpers = require("../helpers");
-
-module.exports = function(context) {
-  // ---------------------------------------------------------------------------
-  // Public
-  // ---------------------------------------------------------------------------
-
-  return {
-    ExpressionStatement: function(node) {
-      var scope = context.getScope();
-      var name = helpers.convertExpressionToGlobal(node, scope.type == "global");
-
-      if (name) {
-        helpers.addVarToScope(name, context);
-      }
-    }
-  };
-};
diff --git a/testing/eslint-plugin-mozilla/lib/rules/import-browserjs-globals.js b/testing/eslint-plugin-mozilla/lib/rules/import-browserjs-globals.js
index a68a3c6febd..435f7b1fcf3 100644
--- a/testing/eslint-plugin-mozilla/lib/rules/import-browserjs-globals.js
+++ b/testing/eslint-plugin-mozilla/lib/rules/import-browserjs-globals.js
@@ -15,6 +15,7 @@
 var fs = require("fs");
 var path = require("path");
 var helpers = require("../helpers");
+var globals = require("../globals");
 
 const SCRIPTS = [
   "toolkit/components/printing/content/printUtils.js",
@@ -60,10 +61,9 @@ module.exports = function(context) {
       for (let script of SCRIPTS) {
         let fileName = path.join(root, script);
         try {
-          let globals = helpers.getGlobalsForFile(fileName);
-          helpers.addGlobals(globals, context);
-        }
-        catch (e) {
+          let newGlobals = globals.getGlobalsForFile(fileName);
+          helpers.addGlobals(newGlobals, context.getScope());
+        } catch (e) {
           context.report(
             node,
             "Could not load globals from file {{filePath}}: {{error}}",
diff --git a/testing/eslint-plugin-mozilla/lib/rules/import-globals-from.js b/testing/eslint-plugin-mozilla/lib/rules/import-globals-from.js
deleted file mode 100644
index 7a78e29589e..00000000000
--- a/testing/eslint-plugin-mozilla/lib/rules/import-globals-from.js
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * @fileoverview When the "import-globals-from: <path>" comment is found in a
- * file, then all globals from the file at <path> will be imported in the
- * current scope.
- *
- * 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";
-
-// -----------------------------------------------------------------------------
-// Rule Definition
-// -----------------------------------------------------------------------------
-
-var fs = require("fs");
-var helpers = require("../helpers");
-var path = require("path");
-
-module.exports = function(context) {
-  // ---------------------------------------------------------------------------
-  // Public
-  // ---------------------------------------------------------------------------
-
-  return {
-    Program: function(node) {
-      var comments = context.getSourceCode().getAllComments();
-      var currentFilePath = helpers.getAbsoluteFilePath(context);
-      helpers.addGlobalsFromComments(currentFilePath, comments, node, context);
-    }
-  };
-};
diff --git a/testing/eslint-plugin-mozilla/lib/rules/import-globals.js b/testing/eslint-plugin-mozilla/lib/rules/import-globals.js
new file mode 100644
index 00000000000..053a9e702fc
--- /dev/null
+++ b/testing/eslint-plugin-mozilla/lib/rules/import-globals.js
@@ -0,0 +1,15 @@
+/**
+ * @fileoverview Discovers all globals for the current file.
+ *
+ * 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";
+
+// -----------------------------------------------------------------------------
+// Rule Definition
+// -----------------------------------------------------------------------------
+
+module.exports = require("../globals").getESLintGlobalParser;
diff --git a/testing/eslint-plugin-mozilla/lib/rules/import-headjs-globals.js b/testing/eslint-plugin-mozilla/lib/rules/import-headjs-globals.js
index 900e79bd98e..34cfd6fa248 100644
--- a/testing/eslint-plugin-mozilla/lib/rules/import-headjs-globals.js
+++ b/testing/eslint-plugin-mozilla/lib/rules/import-headjs-globals.js
@@ -16,6 +16,7 @@
 var fs = require("fs");
 var path = require("path");
 var helpers = require("../helpers");
+var globals = require("../globals");
 
 module.exports = function(context) {
 
@@ -36,13 +37,8 @@ module.exports = function(context) {
         return;
       }
 
-      let globals = helpers.getGlobalsForFile(fullHeadjsPath);
-      helpers.addGlobals(globals, context);
-
-      // Also add any globals from import-globals-from comments
-      var content = fs.readFileSync(fullHeadjsPath, "utf8");
-      var comments = helpers.getAST(content).comments;
-      helpers.addGlobalsFromComments(fullHeadjsPath, comments, node, context);
+      let newGlobals = globals.getGlobalsForFile(fullHeadjsPath);
+      helpers.addGlobals(newGlobals, context.getScope());
     }
   };
 };
diff --git a/testing/eslint-plugin-mozilla/lib/rules/no-cpows-in-tests.js b/testing/eslint-plugin-mozilla/lib/rules/no-cpows-in-tests.js
index 98dbf938cf5..82a82302775 100644
--- a/testing/eslint-plugin-mozilla/lib/rules/no-cpows-in-tests.js
+++ b/testing/eslint-plugin-mozilla/lib/rules/no-cpows-in-tests.js
@@ -56,7 +56,7 @@ module.exports = function(context) {
         }
         return false;
       });
-      if (!someCpowFound && helpers.getIsGlobalScope(context)) {
+      if (!someCpowFound && helpers.getIsGlobalScope(context.getAncestors())) {
         if (/^content\./.test(expression)) {
           showError(node, expression);
           return;
diff --git a/testing/eslint-plugin-mozilla/lib/rules/this-top-level-scope.js b/testing/eslint-plugin-mozilla/lib/rules/this-top-level-scope.js
deleted file mode 100644
index e7efef46ef7..00000000000
--- a/testing/eslint-plugin-mozilla/lib/rules/this-top-level-scope.js
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * @fileoverview Marks "this.var = x" as top-level definition of "var".
- *
- * 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";
-
-// -----------------------------------------------------------------------------
-// Rule Definition
-// -----------------------------------------------------------------------------
-
-var helpers = require("../helpers");
-
-module.exports = function(context) {
-
-  // ---------------------------------------------------------------------------
-  // Public
-  //  --------------------------------------------------------------------------
-
-  return {
-    "AssignmentExpression": function(node) {
-      if (helpers.getIsGlobalScope(context) &&
-          node.left.type === "MemberExpression" &&
-          node.left.object.type === "ThisExpression" &&
-          node.left.property.type === "Identifier") {
-        helpers.addGlobals([node.left.property.name], context);
-      }
-    }
-  };
-};
diff --git a/testing/eslint-plugin-mozilla/lib/rules/var-only-at-top-level.js b/testing/eslint-plugin-mozilla/lib/rules/var-only-at-top-level.js
index 9fd5a9eb1dd..a1e14e1669a 100644
--- a/testing/eslint-plugin-mozilla/lib/rules/var-only-at-top-level.js
+++ b/testing/eslint-plugin-mozilla/lib/rules/var-only-at-top-level.js
@@ -23,7 +23,7 @@ module.exports = function(context) {
   return {
     "VariableDeclaration": function(node) {
       if (node.kind === "var") {
-        if (helpers.getIsGlobalScope(context)) {
+        if (helpers.getIsGlobalScope(context.getAncestors())) {
           return;
         }
 
diff --git a/toolkit/components/extensions/.eslintrc b/toolkit/components/extensions/.eslintrc
index 6615d18c901..2f4bf265a9f 100644
--- a/toolkit/components/extensions/.eslintrc
+++ b/toolkit/components/extensions/.eslintrc
@@ -29,8 +29,6 @@
   "rules": {
     // Rules from the mozilla plugin
     "mozilla/balanced-listeners": 2,
-    "mozilla/components-imports": 1,
-    "mozilla/import-headjs-globals": 1,
     "mozilla/mark-test-function-used": 1,
     "mozilla/no-aArgs": 1,
     "mozilla/no-cpows-in-tests": 1,

From 00ec37e011c54bc123e82feccdb18a9e45c023fc Mon Sep 17 00:00:00 2001
From: Dave Townsend <dtownsend@oxymoronical.com>
Date: Fri, 5 Feb 2016 12:13:34 -0800
Subject: [PATCH 33/45] Bug 1245916: XBL bindings should support global
 declarations in comments. r=miker

To properly lint XBL files we need to support things like import-globals-from
and other ESlint comment directives so we have to pass comments through to the
code blocks that ESlint parses. Unfortunately the way the XBL processor works
now is by passing a separate code block for every method/property/etc. in the
XBL and ESlint doesn't retain state across the blocks so we would have to prefix
every block with every comment. Instead this change makes us output just a
single block that roughly looks like this:

<comments>
var bindings = {
  "<binding-id>": {
    <binding-part-name>: function() { ... }
  }
}

This has some interesting bonuses. Defining the same ID twice will cause a lint
failure. Same for the same field in a binding. The line mapping is a little
harder and there are still a few lines that won't map directly back to the
original file but they should be rare cases. The only downside is that since
some bindings have the same binding declared differently for different platforms
we have to exclude those from linting for now.

MozReview-Commit-ID: CAsPt5dtf6T
---
 .eslintignore                                 |   1 +
 .../lib/processors/xbl-bindings.js            | 187 +++++++++++++-----
 2 files changed, 135 insertions(+), 53 deletions(-)

diff --git a/.eslintignore b/.eslintignore
index a706c0a2a1f..a198935e3c9 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -189,6 +189,7 @@ toolkit/components/passwordmgr/**
 # Uses preprocessing
 toolkit/content/contentAreaUtils.js
 toolkit/content/widgets/videocontrols.xml
+toolkit/content/widgets/wizard.xml
 toolkit/components/jsdownloads/src/DownloadIntegration.jsm
 toolkit/components/search/nsSearchService.js
 toolkit/components/url-classifier/**
diff --git a/testing/eslint-plugin-mozilla/lib/processors/xbl-bindings.js b/testing/eslint-plugin-mozilla/lib/processors/xbl-bindings.js
index f4628d30191..bdb504f826a 100644
--- a/testing/eslint-plugin-mozilla/lib/processors/xbl-bindings.js
+++ b/testing/eslint-plugin-mozilla/lib/processors/xbl-bindings.js
@@ -36,12 +36,15 @@ function XMLParser(parser) {
   parser.onopentag = this.onOpenTag.bind(this);
   parser.onclosetag = this.onCloseTag.bind(this);
   parser.ontext = this.onText.bind(this);
+  parser.onopencdata = this.onOpenCDATA.bind(this);
   parser.oncdata = this.onCDATA.bind(this);
+  parser.oncomment = this.onComment.bind(this);
 
   this.document = {
     local: "#document",
     uri: null,
     children: [],
+    comments: [],
   }
   this._currentNode = this.document;
 }
@@ -56,8 +59,11 @@ XMLParser.prototype = {
       namespace: tag.uri,
       attributes: {},
       children: [],
+      comments: [],
       textContent: "",
-      textStart: { line: this.parser.line, column: this.parser.column },
+      textLine: this.parser.line,
+      textColumn: this.parser.column,
+      textEndLine: this.parser.line
     }
 
     for (let attr of Object.keys(tag.attributes)) {
@@ -71,6 +77,7 @@ XMLParser.prototype = {
   },
 
   onCloseTag: function(tagname) {
+    this._currentNode.textEndLine = this.parser.line;
     this._currentNode = this._currentNode.parentNode;
   },
 
@@ -83,30 +90,61 @@ XMLParser.prototype = {
     this.addText(text.replace(entityRegex, "null"));
   },
 
-  onCDATA: function(text) {
+  onOpenCDATA: function() {
     // Turn the CDATA opening tag into whitespace for indent alignment
     this.addText(" ".repeat("<![CDATA[".length));
+  },
+
+  onCDATA: function(text) {
     this.addText(text);
+  },
+
+  onComment: function(text) {
+    this._currentNode.comments.push(text);
   }
 }
 
-// Strips the indentation from lines of text and adds a fixed two spaces indent
-function buildCodeBlock(tag, prefix, suffix, indent) {
-  prefix = prefix === undefined ? "" : prefix;
-  suffix = suffix === undefined ? "\n}" : suffix;
-  indent = indent === undefined ? 2 : indent;
+// -----------------------------------------------------------------------------
+// Processor Definition
+// -----------------------------------------------------------------------------
 
-  let text = tag.textContent;
-  let line = tag.textStart.line;
-  let column = tag.textStart.column;
+const INDENT_LEVEL = 2;
 
-  let lines = text.split("\n");
+function indent(count) {
+  return " ".repeat(count * INDENT_LEVEL);
+}
+
+// Stores any XML parse error
+let xmlParseError = null;
+
+// Stores the lines of JS code generated from the XBL
+let scriptLines = [];
+// Stores a map from the synthetic line number to the real line number
+// and column offset.
+let lineMap = [];
+
+function addSyntheticLine(line, linePos) {
+  lineMap[scriptLines.length] = { line: linePos, offset: null };
+  scriptLines.push(line);
+}
+
+/**
+ * Adds generated lines from an XBL node to the script to be passed back to eslint.
+ */
+function addNodeLines(node, reindent) {
+  let lines = node.textContent.split("\n");
+  let startLine = node.textLine;
+  let startColumn = node.textColumn;
+
+  // The case where there are no whitespace lines before the first text is
+  // treated differently for indentation
+  let indentFirst = false;
 
   // Strip off any preceeding whitespace only lines. These are often used to
   // format the XML and CDATA blocks.
   while (lines.length && lines[0].trim() == "") {
-    column = 0;
-    line++;
+    indentFirst = true;
+    startLine++;
     lines.shift();
   }
 
@@ -116,9 +154,13 @@ function buildCodeBlock(tag, prefix, suffix, indent) {
     lines.pop();
   }
 
-  // Indent the first line with the starting position of the text block
-  if (lines.length && column) {
-    lines[0] = " ".repeat(column) + lines[0];
+  if (!indentFirst) {
+    let firstLine = lines.shift();
+    firstLine = " ".repeat(reindent * INDENT_LEVEL) + firstLine;
+    // ESLint counts columns starting at 1 rather than 0
+    lineMap[scriptLines.length] = { line: startLine, offset: reindent * INDENT_LEVEL - (startColumn - 1) };
+    scriptLines.push(firstLine);
+    startLine++;
   }
 
   // Find the preceeding whitespace for all lines that aren't entirely whitespace
@@ -127,33 +169,26 @@ function buildCodeBlock(tag, prefix, suffix, indent) {
   // Find the smallest indent level in use
   let minIndent = Math.min.apply(null, indents);
 
-  // Strip off the found indent level and prepend the new indent level, but only
-  // if the string isn't already empty.
-  let indentstr = " ".repeat(indent);
-  lines = lines.map(s => s.length ? indentstr + s.substring(minIndent) : s);
+  for (let line of lines) {
+    if (line.trim().length == 0) {
+      // Don't offset lines that are only whitespace, the only possible JS error
+      // is trailing whitespace and we want it to point at the right place
+      lineMap[scriptLines.length] = { line: startLine, offset: 0 };
+    } else {
+      line = " ".repeat(reindent * INDENT_LEVEL) + line.substring(minIndent);
+      lineMap[scriptLines.length] = { line: startLine, offset: reindent * INDENT_LEVEL - (minIndent - 1) };
+    }
 
-  let block = {
-    script: prefix + lines.join("\n") + suffix + "\n",
-    line: line - prefix.split("\n").length,
-    indent: minIndent - indent
-  };
-  return block;
+    scriptLines.push(line);
+    startLine++;
+  }
 }
 
-// -----------------------------------------------------------------------------
-// Processor Definition
-// -----------------------------------------------------------------------------
-
-// Stores any XML parse error
-let xmlParseError = null;
-
-// Stores the code blocks
-let blocks = [];
-
 module.exports = {
   preprocess: function(text, filename) {
     xmlParseError = null;
-    blocks = [];
+    scriptLines = [];
+    lineMap = [];
 
     // Non-strict allows us to ignore many errors from entities and
     // preprocessing at the expense of failing to report some XML errors.
@@ -181,19 +216,33 @@ module.exports = {
       return [];
     }
 
-    let scripts = [];
+    for (let comment of document.comments) {
+      addSyntheticLine(`/*`, 0);
+      for (let line of comment.split("\n")) {
+        addSyntheticLine(`${line.trim()}`, 0);
+      }
+      addSyntheticLine(`*/`, 0);
+    }
+
+    addSyntheticLine(`var bindings = {`, bindings.textLine);
 
     for (let binding of bindings.children) {
       if (binding.local != "binding" || binding.namespace != NS_XBL) {
         continue;
       }
 
+      addSyntheticLine(indent(1) + `"${binding.attributes.id}": {`, binding.textLine);
+
       for (let part of binding.children) {
         if (part.namespace != NS_XBL) {
           continue;
         }
 
-        if (part.local != "implementation" && part.local != "handlers") {
+        if (part.local == "implementation") {
+          addSyntheticLine(indent(2) + `implementation: {`, part.textLine);
+        } else if (part.local == "handlers") {
+          addSyntheticLine(indent(2) + `handlers: [`, part.textLine);
+        } else {
           continue;
         }
 
@@ -204,28 +253,40 @@ module.exports = {
 
           switch (item.local) {
             case "field": {
-              // Fields get converted into variable declarations
+              // Fields are something like lazy getter functions
 
               // Ignore empty fields
               if (item.textContent.trim().length == 0) {
                 continue;
               }
-              blocks.push(buildCodeBlock(item, "", "", 0));
+
+              addSyntheticLine(indent(3) + `get ${item.attributes.name}() {`, item.textLine);
+              // TODO This will probably break some style rules when. We need
+              // to inject this next to the first non-whitespace character
+              addSyntheticLine(indent(4) + `return`, item.textLine);
+              addNodeLines(item, 4);
+              addSyntheticLine(indent(3) + `},`, item.textEndLine);
               break;
             }
             case "constructor":
             case "destructor": {
               // Constructors and destructors become function declarations
-              blocks.push(buildCodeBlock(item, `function ${item.local}() {\n`));
+              addSyntheticLine(indent(3) + `${item.local}() {`, item.textLine);
+              addNodeLines(item, 4);
+              addSyntheticLine(indent(3) + `},`, item.textEndLine);
               break;
             }
             case "method": {
               // Methods become function declarations with the appropriate params
+
               let params = item.children.filter(n => n.local == "parameter" && n.namespace == NS_XBL)
                                         .map(n => n.attributes.name)
                                         .join(", ");
               let body = item.children.filter(n => n.local == "body" && n.namespace == NS_XBL)[0];
-              blocks.push(buildCodeBlock(body, `function ${item.attributes.name}(${params}) {\n`));
+
+              addSyntheticLine(indent(3) + `${item.attributes.name}(${params}) {`, item.textLine);
+              addNodeLines(body, 4);
+              addSyntheticLine(indent(3) + `},`, item.textEndLine);
               break;
             }
             case "property": {
@@ -235,24 +296,38 @@ module.exports = {
                   continue;
                 }
 
-                let params = propdef.local == "setter" ? "val" : "";
-                blocks.push(buildCodeBlock(propdef, `function ${item.attributes.name}_${propdef.local}(${params}) {\n`));
+                if (propdef.local == "setter") {
+                  addSyntheticLine(indent(3) + `set ${item.attributes.name}(val) {`, propdef.textLine);
+                } else if (propdef.local == "getter") {
+                  addSyntheticLine(indent(3) + `get ${item.attributes.name}() {`, propdef.textLine);
+                } else {
+                  continue;
+                }
+                addNodeLines(propdef, 4);
+                addSyntheticLine(indent(3) + `},`, propdef.textEndLine);
               }
               break;
             }
             case "handler": {
               // Handlers become a function declaration with an `event` parameter
-              blocks.push(buildCodeBlock(item, `function onevent(event) {\n`));
+              addSyntheticLine(indent(3) + `function(event) {`, item.textLine);
+              addNodeLines(item, 4);
+              addSyntheticLine(indent(3) + `},`, item.textEndLine);
               break;
             }
             default:
               continue;
           }
         }
-      }
-    }
 
-    return blocks.map(b => b.script);
+        addSyntheticLine(indent(2) + (part.local == "implementation" ? `},` : `],`), part.textEndLine);
+      }
+      addSyntheticLine(indent(1) + `},`, binding.textEndLine);
+    }
+    addSyntheticLine(`};`, bindings.textEndLine);
+
+    let script = scriptLines.join("\n") + "\n";
+    return [script];
   },
 
   postprocess: function(messages, filename) {
@@ -265,11 +340,17 @@ module.exports = {
     // correct place.
     let errors = [];
     for (let i = 0; i < messages.length; i++) {
-      let block = blocks[i];
-
       for (let message of messages[i]) {
-        message.line += block.line + 1;
-        message.column += block.indent;
+        // ESLint indexes lines starting at 1 but our arrays start at 0
+        let mapped = lineMap[message.line - 1];
+
+        message.line = mapped.line + 1;
+        if (mapped.offset) {
+          message.column -= mapped.offset;
+        } else {
+          message.column = NaN;
+        }
+
         errors.push(message);
       }
     }

From 9d4c7a1cd439544db49627107c22b4eebd22619c Mon Sep 17 00:00:00 2001
From: Dave Townsend <dtownsend@oxymoronical.com>
Date: Fri, 5 Feb 2016 12:16:39 -0800
Subject: [PATCH 34/45] Bug 1245916: Add additional browser window scripts to
 eslint globals. r=felipe

This adds more of the scripts that browser.js relies on and also makes
browser-chrome head files import the browser.js globals.

The MOZ_JSDOWNLOADS block in contentAreaUtils only seems to hide a single
function, I don't see any need to keep hiding that now we're on by default.

MozReview-Commit-ID: 5zvF3JtJrZG
---
 .eslintignore                                 |  1 -
 browser/base/content/browser.js               |  1 +
 testing/eslint-plugin-mozilla/lib/helpers.js  | 16 +++++++++
 .../lib/rules/import-browserjs-globals.js     |  8 +++--
 toolkit/content/contentAreaUtils.js           | 35 +++++++++----------
 toolkit/content/jar.mn                        |  2 +-
 6 files changed, 41 insertions(+), 22 deletions(-)

diff --git a/.eslintignore b/.eslintignore
index a198935e3c9..c92509a3659 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -187,7 +187,6 @@ toolkit/components/osfile/**
 toolkit/components/passwordmgr/**
 
 # Uses preprocessing
-toolkit/content/contentAreaUtils.js
 toolkit/content/widgets/videocontrols.xml
 toolkit/content/widgets/wizard.xml
 toolkit/components/jsdownloads/src/DownloadIntegration.jsm
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index e394a0f3c4f..b9f5fe220db 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -83,6 +83,7 @@ if (AppConstants.platform != "macosx") {
   var gEditUIVisible = true;
 }
 
+/*globals gBrowser, gNavToolbox, gURLBar, gNavigatorBundle*/
 [
   ["gBrowser",            "content"],
   ["gNavToolbox",         "navigator-toolbox"],
diff --git a/testing/eslint-plugin-mozilla/lib/helpers.js b/testing/eslint-plugin-mozilla/lib/helpers.js
index c8af64713d5..55515e0654d 100644
--- a/testing/eslint-plugin-mozilla/lib/helpers.js
+++ b/testing/eslint-plugin-mozilla/lib/helpers.js
@@ -303,6 +303,22 @@ module.exports = {
     return true;
   },
 
+  /**
+   * Check whether we might be in a test head file.
+   *
+   * @param  {RuleContext} scope
+   *         You should pass this from within a rule
+   *         e.g. helpers.getIsBrowserMochitest(this)
+   *
+   * @return {Boolean}
+   *         True or false
+   */
+  getIsHeadFile: function(scope) {
+    var pathAndFilename = scope.getFilename();
+
+    return /.*[\\/]head(_.+)?\.js$/.test(pathAndFilename);
+  },
+
   /**
    * Check whether we are in a browser mochitest.
    *
diff --git a/testing/eslint-plugin-mozilla/lib/rules/import-browserjs-globals.js b/testing/eslint-plugin-mozilla/lib/rules/import-browserjs-globals.js
index 435f7b1fcf3..2a339c9ca5a 100644
--- a/testing/eslint-plugin-mozilla/lib/rules/import-browserjs-globals.js
+++ b/testing/eslint-plugin-mozilla/lib/rules/import-browserjs-globals.js
@@ -18,6 +18,9 @@ var helpers = require("../helpers");
 var globals = require("../globals");
 
 const SCRIPTS = [
+  //"browser/base/content/nsContextMenu.js",
+  "toolkit/content/contentAreaUtils.js",
+  "browser/components/places/content/editBookmarkOverlay.js",
   "toolkit/components/printing/content/printUtils.js",
   "toolkit/content/viewZoomOverlay.js",
   "browser/components/places/content/browserPlacesViews.js",
@@ -47,13 +50,14 @@ const SCRIPTS = [
   "browser/base/content/browser-thumbnails.js",
   "browser/base/content/browser-trackingprotection.js",
   "browser/base/content/browser-data-submission-info-bar.js",
-  "browser/base/content/browser-fxaccounts.js",
+  "browser/base/content/browser-fxaccounts.js"
 ];
 
 module.exports = function(context) {
   return {
     Program: function(node) {
-      if (!helpers.getIsBrowserMochitest(this)) {
+      if (!helpers.getIsBrowserMochitest(this) &&
+          !helpers.getIsHeadFile(this)) {
         return;
       }
 
diff --git a/toolkit/content/contentAreaUtils.js b/toolkit/content/contentAreaUtils.js
index 24b1961e2bb..759401a4114 100644
--- a/toolkit/content/contentAreaUtils.js
+++ b/toolkit/content/contentAreaUtils.js
@@ -1,7 +1,6 @@
-# -*- indent-tabs-mode: nil; js-indent-level: 2 -*- 
-# 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/.
+/* 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/. */
 
 Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
 
@@ -25,6 +24,8 @@ XPCOMUtils.defineLazyModuleGetter(this, "Task",
                                   "resource://gre/modules/Task.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "Deprecated",
                                   "resource://gre/modules/Deprecated.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "AppConstants",
+                                  "resource://gre/modules/AppConstants.jsm");
 
 var ContentAreaUtils = {
 
@@ -351,7 +352,7 @@ XPCOMUtils.defineConstant(this, "kSaveAsType_Text", kSaveAsType_Text);
  * @param aDocument
  *        The document to be saved
  * @param aDefaultFileName
- *        The caller-provided suggested filename if we don't 
+ *        The caller-provided suggested filename if we don't
  *        find a better one
  * @param aContentDisposition
  *        The caller-provided content-disposition header to use.
@@ -593,7 +594,7 @@ function AutoChosen(aFileAutoChosen, aUriAutoChosen) {
  * Structure for holding info about a URL and the target filename it should be
  * saved to. This structure is populated by initFileInfo(...).
  * @param aSuggestedFileName This is used by initFileInfo(...) when it
- *        cannot 'discover' the filename from the url 
+ *        cannot 'discover' the filename from the url
  * @param aFileName The target filename
  * @param aFileBaseName The filename without the file extension
  * @param aFileExt The extension of the filename
@@ -652,7 +653,7 @@ function initFileInfo(aFI, aURL, aURLCharset, aDocument,
   }
 }
 
-/** 
+/**
  * Given the Filepicker Parameters (aFpP), show the file picker dialog,
  * prompting the user to confirm (or change) the fileName.
  * @param aFpP
@@ -667,7 +668,7 @@ function initFileInfo(aFI, aURL, aURLCharset, aDocument,
  *        is set, but ask for the target explicitly.
  * @param aRelatedURI
  *        An nsIURI associated with the download. The last used
- *        directory of the picker is retrieved from/stored in the 
+ *        directory of the picker is retrieved from/stored in the
  *        Content Pref Service using this URI.
  * @return Promise
  * @resolve a boolean. When true, it indicates that the file picker dialog
@@ -675,7 +676,7 @@ function initFileInfo(aFI, aURL, aURLCharset, aDocument,
  */
 function promiseTargetFile(aFpP, /* optional */ aSkipPrompt, /* optional */ aRelatedURI)
 {
-  return Task.spawn(function() {
+  return Task.spawn(function*() {
     let downloadLastDir = new DownloadLastDir(window);
     let prefBranch = Services.prefs.getBranch("browser.download.");
     let useDownloadDir = prefBranch.getBoolPref("useDownloadDir");
@@ -693,7 +694,7 @@ function promiseTargetFile(aFpP, /* optional */ aSkipPrompt, /* optional */ aRel
       dir.append(getNormalizedLeafName(aFpP.fileInfo.fileName,
                                        aFpP.fileInfo.fileExt));
       aFpP.file = uniqueFile(dir);
-      throw new Task.Result(true);
+      return true;
     }
 
     // We must prompt for the file name explicitly.
@@ -748,7 +749,7 @@ function promiseTargetFile(aFpP, /* optional */ aSkipPrompt, /* optional */ aRel
     });
     let result = yield deferComplete.promise;
     if (result == Components.interfaces.nsIFilePicker.returnCancel || !fp.file) {
-      throw new Task.Result(false);
+      return false;
     }
 
     if (aFpP.saveMode != SAVEMODE_FILEONLY)
@@ -763,7 +764,7 @@ function promiseTargetFile(aFpP, /* optional */ aSkipPrompt, /* optional */ aRel
     aFpP.file = fp.file;
     aFpP.fileURL = fp.fileURL;
 
-    throw new Task.Result(true);
+    return true;
   });
 }
 
@@ -795,7 +796,6 @@ function uniqueFile(aLocalFile)
   return aLocalFile;
 }
 
-#ifdef MOZ_JSDOWNLOADS
 /**
  * Download a URL using the new jsdownloads API.
  *
@@ -841,7 +841,6 @@ function DownloadURL(aURL, aFileName, aInitiatingDocument) {
     list.add(download);
   }).then(null, Components.utils.reportError);
 }
-#endif
 
 // We have no DOM, and can only save the URL as is.
 const SAVEMODE_FILEONLY      = 0x00;
@@ -1157,10 +1156,10 @@ function getNormalizedLeafName(aFile, aDefaultExtension)
   if (!aDefaultExtension)
     return aFile;
 
-#ifdef XP_WIN
-  // Remove trailing dots and spaces on windows
-  aFile = aFile.replace(/[\s.]+$/, "");
-#endif
+  if (AppConstants.platform == "win") {
+    // Remove trailing dots and spaces on windows
+    aFile = aFile.replace(/[\s.]+$/, "");
+  }
 
   // Remove leading dots
   aFile = aFile.replace(/^\.+/, "");
diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
index 7d4feda4815..abe3335c56a 100644
--- a/toolkit/content/jar.mn
+++ b/toolkit/content/jar.mn
@@ -43,7 +43,7 @@ toolkit.jar:
    content/global/browser-child.js
    content/global/browser-content.js
 *   content/global/buildconfig.html
-*  content/global/contentAreaUtils.js
+   content/global/contentAreaUtils.js
 #ifndef MOZ_FENNEC
    content/global/customizeToolbar.css
    content/global/customizeToolbar.js

From 8872900b27ea1538415dbdcc9d8f25ab304c711c Mon Sep 17 00:00:00 2001
From: Dave Townsend <dtownsend@oxymoronical.com>
Date: Fri, 5 Feb 2016 12:12:30 -0800
Subject: [PATCH 35/45] Bug 1245916: Add additional default globals. r=felipe

This defines a few additional globals but also turns on the browser environment
for everything in browser and toolkit. This may lead to some false negatives
but we have lots of code that runs in a browser context so in the name of
getting rules turned on I think this is a useful step.

MozReview-Commit-ID: BdWouZGK6d
---
 testing/mochitest/browser.eslintrc | 10 +++++-----
 testing/xpcshell/xpcshell.eslintrc |  5 +++++
 toolkit/.eslintrc                  | 10 ++++++++++
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/testing/mochitest/browser.eslintrc b/testing/mochitest/browser.eslintrc
index 55e222326fb..1e4744c000a 100644
--- a/testing/mochitest/browser.eslintrc
+++ b/testing/mochitest/browser.eslintrc
@@ -14,11 +14,16 @@
     "add_task": false,
     "Assert": false,
     "BrowserTestUtils": false,
+    "content": false,
     "ContentTask": false,
+    "ContentTaskUtils": false,
     "EventUtils": false,
     "executeSoon": false,
+    "expectUncaughtException": false,
     "export_assertions": false,
+    "extractJarToTmp": false,
     "finish": false,
+    "getJar": false,
     "getRootDirectory": false,
     "getTestFilePath": false,
     "gTestPath": false,
@@ -37,10 +42,5 @@
     "waitForClipboard": false,
     "waitForExplicitFinish": false,
     "waitForFocus": false,
-    "gBrowser": false,
-    "gNavToolbox": false,
-    "gURLBar": false,
-    "gNavigatorBundle": false,
-    "content": false,
   }
 }
diff --git a/testing/xpcshell/xpcshell.eslintrc b/testing/xpcshell/xpcshell.eslintrc
index d4394fabc4e..3907d94c9aa 100644
--- a/testing/xpcshell/xpcshell.eslintrc
+++ b/testing/xpcshell/xpcshell.eslintrc
@@ -24,12 +24,14 @@
     "do_parse_document": false,
     "do_print": false,
     "do_register_cleanup": false,
+    "do_report_unexpected_exception": false,
     "do_test_finished": false,
     "do_test_pending": false,
     "do_throw": false,
     "do_timeout": false,
     "equal": false,
     "load": false,
+    "mozinfo": false,
     "notDeepEqual": false,
     "notEqual": false,
     "notStrictEqual": false,
@@ -37,5 +39,8 @@
     "run_next_test": false,
     "run_test": false,
     "strictEqual": false,
+    "todo": false,
+    "todo_check_false": false,
+    "todo_check_true": false,
   }
 }
diff --git a/toolkit/.eslintrc b/toolkit/.eslintrc
index 575ab58a424..7d5da475243 100644
--- a/toolkit/.eslintrc
+++ b/toolkit/.eslintrc
@@ -192,5 +192,15 @@
 
     // Only check typeof against valid results
     "valid-typeof": 2,
+  },
+  "env": {
+    "es6": true,
+    "browser": true,
+  },
+  "globals": {
+    "Components": false,
+    "dump": true,
+    "openDialog": false,
+    "sizeToContent": false,
   }
 }

From 9834fef4580d4f158c50c13bb4efe243aba1561a Mon Sep 17 00:00:00 2001
From: Dave Townsend <dtownsend@oxymoronical.com>
Date: Fri, 5 Feb 2016 13:23:40 -0800
Subject: [PATCH 36/45] Bug 1245916: Import more head files for xpcshell tests.
 r=pbrosset

xpcshell tests used to use head_*.js files so this adds those for global
discovery.

MozReview-Commit-ID: BOsoGIpwdgu
---
 testing/eslint-plugin-mozilla/lib/helpers.js  | 20 ++++++++++++--
 .../lib/rules/import-headjs-globals.js        | 27 ++++++++++++++++---
 2 files changed, 41 insertions(+), 6 deletions(-)

diff --git a/testing/eslint-plugin-mozilla/lib/helpers.js b/testing/eslint-plugin-mozilla/lib/helpers.js
index 55515e0654d..560a56b69ca 100644
--- a/testing/eslint-plugin-mozilla/lib/helpers.js
+++ b/testing/eslint-plugin-mozilla/lib/helpers.js
@@ -308,7 +308,7 @@ module.exports = {
    *
    * @param  {RuleContext} scope
    *         You should pass this from within a rule
-   *         e.g. helpers.getIsBrowserMochitest(this)
+   *         e.g. helpers.getIsHeadFile(this)
    *
    * @return {Boolean}
    *         True or false
@@ -319,6 +319,22 @@ module.exports = {
     return /.*[\\/]head(_.+)?\.js$/.test(pathAndFilename);
   },
 
+  /**
+   * Check whether we might be in an xpcshell test.
+   *
+   * @param  {RuleContext} scope
+   *         You should pass this from within a rule
+   *         e.g. helpers.getIsXpcshellTest(this)
+   *
+   * @return {Boolean}
+   *         True or false
+   */
+  getIsXpcshellTest: function(scope) {
+    var pathAndFilename = scope.getFilename();
+
+    return /.*[\\/]test_.+\.js$/.test(pathAndFilename);
+  },
+
   /**
    * Check whether we are in a browser mochitest.
    *
@@ -348,7 +364,7 @@ module.exports = {
   getIsTest: function(scope) {
     var pathAndFilename = scope.getFilename();
 
-    if (/.*[\\/]test_.+\.js$/.test(pathAndFilename)) {
+    if (this.getIsXpcshellTest(scope)) {
       return true;
     }
 
diff --git a/testing/eslint-plugin-mozilla/lib/rules/import-headjs-globals.js b/testing/eslint-plugin-mozilla/lib/rules/import-headjs-globals.js
index 34cfd6fa248..828eabe43cb 100644
--- a/testing/eslint-plugin-mozilla/lib/rules/import-headjs-globals.js
+++ b/testing/eslint-plugin-mozilla/lib/rules/import-headjs-globals.js
@@ -20,6 +20,20 @@ var globals = require("../globals");
 
 module.exports = function(context) {
 
+  function importHead(path, node) {
+    try {
+      let stats = fs.statSync(path);
+      if (!stats.isFile()) {
+        return;
+      }
+    } catch (e) {
+      return;
+    }
+
+    let newGlobals = globals.getGlobalsForFile(path);
+    helpers.addGlobals(newGlobals, context.getScope());
+  }
+
   // ---------------------------------------------------------------------------
   // Public
   // ---------------------------------------------------------------------------
@@ -32,13 +46,18 @@ module.exports = function(context) {
 
       var currentFilePath = helpers.getAbsoluteFilePath(context);
       var dirName = path.dirname(currentFilePath);
-      var fullHeadjsPath = path.resolve(dirName, "head.js");
-      if (!fs.existsSync(fullHeadjsPath)) {
+      importHead(path.resolve(dirName, "head.js"), node);
+
+      if (!helpers.getIsXpcshellTest(this)) {
         return;
       }
 
-      let newGlobals = globals.getGlobalsForFile(fullHeadjsPath);
-      helpers.addGlobals(newGlobals, context.getScope());
+      let names = fs.readdirSync(dirName);
+      for (let name of names) {
+        if (name.startsWith("head_") && name.endsWith(".js")) {
+          importHead(path.resolve(dirName, name), node);
+        }
+      }
     }
   };
 };

From 24f94cc579971520d70ff6784d632e50e6c11278 Mon Sep 17 00:00:00 2001
From: Dave Townsend <dtownsend@oxymoronical.com>
Date: Wed, 3 Feb 2016 22:48:48 -0800
Subject: [PATCH 37/45] Bug 1245916: Turn on no-undef in
 toolkit/mozapps/extensions. r=rhelmer

Mostly just declaring globals that Cu.imports defines but there are some actual
bugs here that have been fixed as well as one test that just never ran because
of a hidden exception.

MozReview-Commit-ID: J6uIpYp8ANx
---
 services/sync/tests/unit/head_appinfo.js      | 19 +++++++++++--------
 toolkit/mozapps/extensions/.eslintrc          |  6 ++++++
 toolkit/mozapps/extensions/AddonManager.jsm   |  4 ++--
 toolkit/mozapps/extensions/DeferredSave.jsm   |  1 +
 .../extensions/LightweightThemeManager.jsm    |  1 +
 toolkit/mozapps/extensions/addonManager.js    |  1 +
 toolkit/mozapps/extensions/content/about.js   |  2 ++
 .../mozapps/extensions/content/extensions.js  |  3 +++
 .../mozapps/extensions/content/extensions.xml |  2 ++
 .../mozapps/extensions/content/setting.xml    |  2 ++
 .../extensions/internal/AddonRepository.jsm   | 13 ++++++++-----
 .../AddonRepository_SQLiteMigrator.jsm        |  1 +
 .../internal/AddonUpdateChecker.jsm           |  3 ++-
 .../mozapps/extensions/internal/Content.js    |  2 ++
 .../extensions/internal/GMPProvider.jsm       |  3 +++
 .../LightweightThemeImageOptimizer.jsm        | 11 +----------
 .../extensions/internal/PluginProvider.jsm    |  1 +
 .../internal/ProductAddonChecker.jsm          |  2 ++
 .../extensions/internal/XPIProvider.jsm       |  6 ++++--
 .../extensions/internal/XPIProviderUtils.js   |  7 +++++++
 .../mozapps/extensions/nsBlocklistService.js  |  1 +
 .../test/addons/test_bug675371/test.js        |  2 +-
 .../test/browser/browser_bug593535.js         |  1 +
 .../test/browser/discovery_install.html       |  1 +
 .../mozapps/extensions/test/browser/head.js   |  3 ++-
 .../extensions/test/xpcshell/head_addons.js   | 12 ++++++------
 .../extensions/test/xpcshell/head_unpack.js   |  1 +
 .../test/xpcshell/test_DeferredSave.js        |  1 -
 .../test/xpcshell/test_bug393285.js           |  2 +-
 .../test/xpcshell/test_bug406118.js           |  2 +-
 .../test/xpcshell/test_bug675371.js           |  2 +-
 .../extensions/test/xpcshell/test_fuel.js     |  1 +
 .../test/xpcshell/test_gfxBlacklist_prefs.js  |  2 ++
 .../test/xpcshell/test_mapURIToAddonID.js     |  2 +-
 .../test/xpcshell/test_pluginchange.js        |  4 ++--
 .../test_provider_unsafe_access_shutdown.js   |  2 +-
 .../test_provider_unsafe_access_startup.js    |  2 +-
 .../extensions/test/xpcshell/test_seen.js     |  4 ++--
 .../test/xpcshell/test_undouninstall.js       |  2 +-
 .../test/xpcshell/test_updateCancel.js        |  1 -
 .../test/xpcshell/test_webextension_icons.js  |  2 +-
 .../test/xpcshell/xpcshell-shared.ini         |  2 ++
 .../test/xpinstall/browser_bug672485.js       |  2 +-
 .../xpinstall/browser_concurrent_installs.js  |  3 +--
 .../test/xpinstall/browser_whitelist3.js      |  4 ++--
 .../test/xpinstall/browser_whitelist4.js      |  6 +++---
 .../extensions/test/xpinstall/bug645699.html  |  1 +
 .../test/xpinstall/concurrent_installs.html   |  1 +
 .../extensions/test/xpinstall/enabled.html    |  1 +
 .../test/xpinstall/installchrome.html         |  1 +
 .../test/xpinstall/installtrigger.html        |  1 +
 .../test/xpinstall/startsoftwareupdate.html   |  1 +
 .../test/xpinstall/triggerredirect.html       |  1 +
 53 files changed, 106 insertions(+), 58 deletions(-)
 create mode 100644 toolkit/mozapps/extensions/.eslintrc

diff --git a/services/sync/tests/unit/head_appinfo.js b/services/sync/tests/unit/head_appinfo.js
index 3ade823f7b4..b4a48d02e50 100644
--- a/services/sync/tests/unit/head_appinfo.js
+++ b/services/sync/tests/unit/head_appinfo.js
@@ -18,13 +18,16 @@ fhs.observe(null, "profile-after-change", null);
 Services.prefs.setCharPref("identity.sync.tokenserver.uri", "http://token-server");
 
 // Make sure to provide the right OS so crypto loads the right binaries
-var OS = "XPCShell";
-if (mozinfo.os == "win")
-  OS = "WINNT";
-else if (mozinfo.os == "mac")
-  OS = "Darwin";
-else
-  OS = "Linux";
+function getOS() {
+  switch (mozinfo.os) {
+    case "win":
+      return "WINNT";
+    case "mac":
+      return "Darwin";
+    default:
+      return "Linux";
+  }
+}
 
 var XULAppInfo = {
   vendor: "Mozilla",
@@ -36,7 +39,7 @@ var XULAppInfo = {
   platformBuildID: "20100621",
   inSafeMode: false,
   logConsoleErrors: true,
-  OS: OS,
+  OS: getOS(),
   XPCOMABI: "noarch-spidermonkey",
   QueryInterface: XPCOMUtils.generateQI([Ci.nsIXULAppInfo, Ci.nsIXULRuntime]),
   invalidateCachesOnRestart: function invalidateCachesOnRestart() { }
diff --git a/toolkit/mozapps/extensions/.eslintrc b/toolkit/mozapps/extensions/.eslintrc
new file mode 100644
index 00000000000..7b630ad3b5a
--- /dev/null
+++ b/toolkit/mozapps/extensions/.eslintrc
@@ -0,0 +1,6 @@
+{
+  "rules": {
+    // No using undeclared variables
+    "no-undef": 2,
+  }
+}
diff --git a/toolkit/mozapps/extensions/AddonManager.jsm b/toolkit/mozapps/extensions/AddonManager.jsm
index 935cfb1c780..5a839b3600a 100644
--- a/toolkit/mozapps/extensions/AddonManager.jsm
+++ b/toolkit/mozapps/extensions/AddonManager.jsm
@@ -977,7 +977,7 @@ var AddonManagerInternal = {
 
       // Support for remote about:plugins. Note that this module isn't loaded
       // at the top because Services.appinfo is defined late in tests.
-      Cu.import("resource://gre/modules/RemotePageManager.jsm");
+      let { RemotePages } = Cu.import("resource://gre/modules/RemotePageManager.jsm", {});
 
       gPluginPageListener = new RemotePages("about:plugins");
       gPluginPageListener.addMessageListener("RequestPlugins", this.requestPlugins);
@@ -1145,7 +1145,7 @@ var AddonManagerInternal = {
           provider[aMethod].apply(provider, aArgs);
       }
       catch (e) {
-        reportProviderError(aProvider, aMethod, e);
+        reportProviderError(provider, aMethod, e);
       }
     }
   },
diff --git a/toolkit/mozapps/extensions/DeferredSave.jsm b/toolkit/mozapps/extensions/DeferredSave.jsm
index 0daa0fc6c79..90d3320c1df 100644
--- a/toolkit/mozapps/extensions/DeferredSave.jsm
+++ b/toolkit/mozapps/extensions/DeferredSave.jsm
@@ -9,6 +9,7 @@ const Cc = Components.classes;
 const Ci = Components.interfaces;
 
 Cu.import("resource://gre/modules/osfile.jsm");
+/*globals OS*/
 Cu.import("resource://gre/modules/Promise.jsm");
 
 // Make it possible to mock out timers for testing
diff --git a/toolkit/mozapps/extensions/LightweightThemeManager.jsm b/toolkit/mozapps/extensions/LightweightThemeManager.jsm
index 142666a9201..c041ed7a76b 100644
--- a/toolkit/mozapps/extensions/LightweightThemeManager.jsm
+++ b/toolkit/mozapps/extensions/LightweightThemeManager.jsm
@@ -11,6 +11,7 @@ const Ci = Components.interfaces;
 
 Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
 Components.utils.import("resource://gre/modules/AddonManager.jsm");
+/*globals AddonManagerPrivate*/
 Components.utils.import("resource://gre/modules/Services.jsm");
 
 const ID_SUFFIX              = "@personas.mozilla.org";
diff --git a/toolkit/mozapps/extensions/addonManager.js b/toolkit/mozapps/extensions/addonManager.js
index c1ad7345123..d51cb839af8 100644
--- a/toolkit/mozapps/extensions/addonManager.js
+++ b/toolkit/mozapps/extensions/addonManager.js
@@ -36,6 +36,7 @@ var gParentMM = null;
 
 function amManager() {
   Cu.import("resource://gre/modules/AddonManager.jsm");
+  /*globals AddonManagerPrivate*/
 
   let globalMM = Cc["@mozilla.org/globalmessagemanager;1"]
                  .getService(Ci.nsIMessageListenerManager);
diff --git a/toolkit/mozapps/extensions/content/about.js b/toolkit/mozapps/extensions/content/about.js
index 090b7bb4684..4f8fb353ebc 100644
--- a/toolkit/mozapps/extensions/content/about.js
+++ b/toolkit/mozapps/extensions/content/about.js
@@ -6,6 +6,8 @@
 
 "use strict";
 
+/* import-globals-from ../../../content/contentAreaUtils.js */
+
 var Cu = Components.utils;
 Cu.import("resource://gre/modules/AddonManager.jsm");
 
diff --git a/toolkit/mozapps/extensions/content/extensions.js b/toolkit/mozapps/extensions/content/extensions.js
index ffc68d6e280..3d65c48bc6c 100644
--- a/toolkit/mozapps/extensions/content/extensions.js
+++ b/toolkit/mozapps/extensions/content/extensions.js
@@ -4,6 +4,9 @@
 
 "use strict";
 
+/* import-globals-from ../../../content/contentAreaUtils.js */
+/*globals XMLStylesheetProcessingInstruction*/
+
 var Cc = Components.classes;
 var Ci = Components.interfaces;
 var Cu = Components.utils;
diff --git a/toolkit/mozapps/extensions/content/extensions.xml b/toolkit/mozapps/extensions/content/extensions.xml
index 43fe4450f07..1ef99c0abe2 100644
--- a/toolkit/mozapps/extensions/content/extensions.xml
+++ b/toolkit/mozapps/extensions/content/extensions.xml
@@ -9,6 +9,8 @@
 %extensionsDTD;
 ]>
 
+<!-- import-globals-from extensions.js -->
+
 <bindings id="addonBindings"
           xmlns="http://www.mozilla.org/xbl"
           xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
diff --git a/toolkit/mozapps/extensions/content/setting.xml b/toolkit/mozapps/extensions/content/setting.xml
index 5afdbbb0718..6101934e8d9 100644
--- a/toolkit/mozapps/extensions/content/setting.xml
+++ b/toolkit/mozapps/extensions/content/setting.xml
@@ -8,6 +8,8 @@
 %extensionsDTD;
 ]>
 
+<!-- import-globals-from extensions.js -->
+
 <bindings xmlns="http://www.mozilla.org/xbl"
           xmlns:xbl="http://www.mozilla.org/xbl"
           xmlns:html="http://www.w3.org/1999/xhtml"
diff --git a/toolkit/mozapps/extensions/internal/AddonRepository.jsm b/toolkit/mozapps/extensions/internal/AddonRepository.jsm
index 0faffb65e17..b5572744f5e 100644
--- a/toolkit/mozapps/extensions/internal/AddonRepository.jsm
+++ b/toolkit/mozapps/extensions/internal/AddonRepository.jsm
@@ -11,6 +11,7 @@ const Cr = Components.results;
 
 Components.utils.import("resource://gre/modules/Services.jsm");
 Components.utils.import("resource://gre/modules/AddonManager.jsm");
+/*globals AddonManagerPrivate*/
 Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
 
 XPCOMUtils.defineLazyModuleGetter(this, "NetUtil",
@@ -428,7 +429,8 @@ AddonSearchResult.prototype = {
   toJSON: function() {
     let json = {};
 
-    for (let [property, value] of Iterator(this)) {
+    for (let property of Object.keys(this)) {
+      let value = this[property];
       if (property.startsWith("_") ||
           typeof(value) === "function")
         continue;
@@ -451,7 +453,8 @@ AddonSearchResult.prototype = {
       }
     }
 
-    for (let [property, value] of Iterator(this._unsupportedProperties)) {
+    for (let property of Object.keys(this._unsupportedProperties)) {
+      let value = this._unsupportedProperties[property];
       if (!property.startsWith("_"))
         json[property] = value;
     }
@@ -1833,7 +1836,7 @@ var AddonDatabase = {
 
     let addon = new AddonSearchResult(id);
 
-    for (let [expectedProperty,] of Iterator(AddonSearchResult.prototype)) {
+    for (let expectedProperty of Object.keys(AddonSearchResult.prototype)) {
       if (!(expectedProperty in aObj) ||
           typeof(aObj[expectedProperty]) === "function")
         continue;
@@ -1881,8 +1884,8 @@ var AddonDatabase = {
 
           case "icons":
             if (!addon.icons) addon.icons = {};
-            for (let [size, url] of Iterator(aObj.icons)) {
-              addon.icons[size] = url;
+            for (let size of Object.keys(aObj.icons)) {
+              addon.icons[size] = aObj.icons[size];
             }
             break;
 
diff --git a/toolkit/mozapps/extensions/internal/AddonRepository_SQLiteMigrator.jsm b/toolkit/mozapps/extensions/internal/AddonRepository_SQLiteMigrator.jsm
index f2499b4aa9a..3d1bef88142 100644
--- a/toolkit/mozapps/extensions/internal/AddonRepository_SQLiteMigrator.jsm
+++ b/toolkit/mozapps/extensions/internal/AddonRepository_SQLiteMigrator.jsm
@@ -10,6 +10,7 @@ const Cu = Components.utils;
 
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/AddonManager.jsm");
+/*globals AddonManagerPrivate*/
 Cu.import("resource://gre/modules/FileUtils.jsm");
 
 const KEY_PROFILEDIR  = "ProfD";
diff --git a/toolkit/mozapps/extensions/internal/AddonUpdateChecker.jsm b/toolkit/mozapps/extensions/internal/AddonUpdateChecker.jsm
index 5717d8a099c..7ae7934f2b3 100644
--- a/toolkit/mozapps/extensions/internal/AddonUpdateChecker.jsm
+++ b/toolkit/mozapps/extensions/internal/AddonUpdateChecker.jsm
@@ -274,7 +274,8 @@ function sanitizeUpdateURL(aUpdate, aRequest, aHashPattern, aHashString) {
  */
 function parseRDFManifest(aId, aUpdateKey, aRequest, aManifestData) {
   if (aManifestData.documentElement.namespaceURI != PREFIX_NS_RDF) {
-    throw Components.Exception("Update manifest had an unrecognised namespace: " + xml.documentElement.namespaceURI);
+    throw Components.Exception("Update manifest had an unrecognised namespace: " +
+                               aManifestData.documentElement.namespaceURI);
     return undefined;
   }
 
diff --git a/toolkit/mozapps/extensions/internal/Content.js b/toolkit/mozapps/extensions/internal/Content.js
index e641f91c37c..97dc928029e 100644
--- a/toolkit/mozapps/extensions/internal/Content.js
+++ b/toolkit/mozapps/extensions/internal/Content.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/. */
 
+/*globals addMessageListener*/
+
 "use strict";
 
 (function() {
diff --git a/toolkit/mozapps/extensions/internal/GMPProvider.jsm b/toolkit/mozapps/extensions/internal/GMPProvider.jsm
index 93ecb8fd07b..688a997dfb0 100644
--- a/toolkit/mozapps/extensions/internal/GMPProvider.jsm
+++ b/toolkit/mozapps/extensions/internal/GMPProvider.jsm
@@ -12,12 +12,15 @@ this.EXPORTED_SYMBOLS = [];
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/AddonManager.jsm");
+/*globals AddonManagerPrivate*/
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/Preferences.jsm");
 Cu.import("resource://gre/modules/osfile.jsm");
+/*globals OS*/
 Cu.import("resource://gre/modules/Log.jsm");
 Cu.import("resource://gre/modules/Task.jsm");
 Cu.import("resource://gre/modules/GMPUtils.jsm");
+/*globals EME_ADOBE_ID, GMP_PLUGIN_IDS, GMPPrefs, GMPUtils, OPEN_H264_ID*/
 Cu.import("resource://gre/modules/AppConstants.jsm");
 Cu.import("resource://gre/modules/UpdateUtils.jsm");
 
diff --git a/toolkit/mozapps/extensions/internal/LightweightThemeImageOptimizer.jsm b/toolkit/mozapps/extensions/internal/LightweightThemeImageOptimizer.jsm
index b95737524fd..49dfa237fe0 100644
--- a/toolkit/mozapps/extensions/internal/LightweightThemeImageOptimizer.jsm
+++ b/toolkit/mozapps/extensions/internal/LightweightThemeImageOptimizer.jsm
@@ -22,7 +22,7 @@ const ORIGIN_BOTTOM_LEFT = 2;
 
 this.LightweightThemeImageOptimizer = {
   optimize: function(aThemeData, aScreen) {
-    let data = Utils.createCopy(aThemeData);
+    let data = Object.assign({}, aThemeData);
     if (!data.headerURL) {
       return data;
     }
@@ -178,12 +178,3 @@ var ImageTools = {
 XPCOMUtils.defineLazyServiceGetter(ImageTools, "_imgTools",
   "@mozilla.org/image/tools;1", "imgITools");
 
-var Utils = {
-  createCopy: function(aData) {
-    let copy = {};
-    for (let [k, v] in Iterator(aData)) {
-      copy[k] = v;
-    }
-    return copy;
-  }
-};
diff --git a/toolkit/mozapps/extensions/internal/PluginProvider.jsm b/toolkit/mozapps/extensions/internal/PluginProvider.jsm
index b502dc95f05..e6d82ef3854 100644
--- a/toolkit/mozapps/extensions/internal/PluginProvider.jsm
+++ b/toolkit/mozapps/extensions/internal/PluginProvider.jsm
@@ -11,6 +11,7 @@ const Cu = Components.utils;
 this.EXPORTED_SYMBOLS = [];
 
 Cu.import("resource://gre/modules/AddonManager.jsm");
+/*globals AddonManagerPrivate*/
 Cu.import("resource://gre/modules/Services.jsm");
 
 const URI_EXTENSION_STRINGS  = "chrome://mozapps/locale/extensions/extensions.properties";
diff --git a/toolkit/mozapps/extensions/internal/ProductAddonChecker.jsm b/toolkit/mozapps/extensions/internal/ProductAddonChecker.jsm
index 5a7a3ebf0ac..850390e88b4 100644
--- a/toolkit/mozapps/extensions/internal/ProductAddonChecker.jsm
+++ b/toolkit/mozapps/extensions/internal/ProductAddonChecker.jsm
@@ -11,9 +11,11 @@ this.EXPORTED_SYMBOLS = [ "ProductAddonChecker" ];
 Cu.import("resource://gre/modules/Task.jsm");
 Cu.import("resource://gre/modules/Log.jsm");
 Cu.import("resource://gre/modules/CertUtils.jsm");
+/*globals checkCert, BadCertHandler*/
 Cu.import("resource://gre/modules/FileUtils.jsm");
 Cu.import("resource://gre/modules/NetUtil.jsm");
 Cu.import("resource://gre/modules/osfile.jsm");
+/*globals OS*/
 
 var logger = Log.repository.getLogger("addons.productaddons");
 
diff --git a/toolkit/mozapps/extensions/internal/XPIProvider.jsm b/toolkit/mozapps/extensions/internal/XPIProvider.jsm
index 007bdb13b1e..70e3828ae19 100644
--- a/toolkit/mozapps/extensions/internal/XPIProvider.jsm
+++ b/toolkit/mozapps/extensions/internal/XPIProvider.jsm
@@ -18,6 +18,7 @@ const { ADDON_SIGNING, REQUIRE_SIGNING } = CONSTANTS
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/AddonManager.jsm");
+/*globals AddonManagerPrivate*/
 Cu.import("resource://gre/modules/Preferences.jsm");
 
 XPCOMUtils.defineLazyModuleGetter(this, "AddonRepository",
@@ -276,6 +277,7 @@ const LOGGER_ID = "addons.xpi";
 var logger = Log.repository.getLogger(LOGGER_ID);
 
 const LAZY_OBJECTS = ["XPIDatabase", "XPIDatabaseReconcile"];
+/*globals XPIDatabase, XPIDatabaseReconcile*/
 
 var gLazyObjectsLoaded = false;
 
@@ -574,7 +576,7 @@ SafeInstallOperation.prototype = {
     while (this._installedFiles.length > 0) {
       let move = this._installedFiles.pop();
       if (move.isMoveTo) {
-        move.newFile.moveTo(oldDir.parent, oldDir.leafName);
+        move.newFile.moveTo(move.oldDir.parent, move.oldDir.leafName);
       }
       else if (move.newFile.isDirectory()) {
         let oldDir = move.oldFile.parent.clone();
@@ -3633,8 +3635,8 @@ this.XPIProvider = {
 
         // When upgrading remove the old extensions cache to force older
         // versions to rescan the entire list of extensions
+        let oldCache = FileUtils.getFile(KEY_PROFILEDIR, [FILE_OLD_CACHE], true);
         try {
-          let oldCache = FileUtils.getFile(KEY_PROFILEDIR, [FILE_OLD_CACHE], true);
           if (oldCache.exists())
             oldCache.remove(true);
         }
diff --git a/toolkit/mozapps/extensions/internal/XPIProviderUtils.js b/toolkit/mozapps/extensions/internal/XPIProviderUtils.js
index a08ac34982d..f5ab1a11fa8 100644
--- a/toolkit/mozapps/extensions/internal/XPIProviderUtils.js
+++ b/toolkit/mozapps/extensions/internal/XPIProviderUtils.js
@@ -4,6 +4,12 @@
 
 "use strict";
 
+// These are injected from XPIProvider.jsm
+/*globals ADDON_SIGNING, SIGNED_TYPES, BOOTSTRAP_REASONS, DB_SCHEMA,
+          AddonInternal, XPIProvider, XPIStates, syncLoadManifestFromFile,
+          isUsableAddon, recordAddonTelemetry, applyBlocklistChanges,
+          flushStartupCache, canRunInSafeMode*/
+
 var Cc = Components.classes;
 var Ci = Components.interfaces;
 var Cr = Components.results;
@@ -12,6 +18,7 @@ var Cu = Components.utils;
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/AddonManager.jsm");
+/*globals AddonManagerPrivate*/
 Cu.import("resource://gre/modules/Preferences.jsm");
 
 XPCOMUtils.defineLazyModuleGetter(this, "AddonRepository",
diff --git a/toolkit/mozapps/extensions/nsBlocklistService.js b/toolkit/mozapps/extensions/nsBlocklistService.js
index 0737172186e..95ee20962b6 100644
--- a/toolkit/mozapps/extensions/nsBlocklistService.js
+++ b/toolkit/mozapps/extensions/nsBlocklistService.js
@@ -19,6 +19,7 @@ try {
   // process. We're used in the child process (for now), so guard against
   // this.
   Components.utils.import("resource://gre/modules/AddonManager.jsm");
+  /*globals AddonManagerPrivate*/
 } catch (e) {
 }
 
diff --git a/toolkit/mozapps/extensions/test/addons/test_bug675371/test.js b/toolkit/mozapps/extensions/test/addons/test_bug675371/test.js
index ae74c174d80..b942a806482 100644
--- a/toolkit/mozapps/extensions/test/addons/test_bug675371/test.js
+++ b/toolkit/mozapps/extensions/test/addons/test_bug675371/test.js
@@ -1 +1 @@
-active = true;
+var active = true;
diff --git a/toolkit/mozapps/extensions/test/browser/browser_bug593535.js b/toolkit/mozapps/extensions/test/browser/browser_bug593535.js
index eacf1c47b87..fd23d00361a 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_bug593535.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_bug593535.js
@@ -10,6 +10,7 @@ const SEARCH_URL = TESTROOT + "browser_bug593535.xml";
 const QUERY = "NOTFOUND";
 
 var gProvider;
+var gManagerWindow;
 
 function test() {
   waitForExplicitFinish();
diff --git a/toolkit/mozapps/extensions/test/browser/discovery_install.html b/toolkit/mozapps/extensions/test/browser/discovery_install.html
index 3832adff640..3ad9268b98f 100644
--- a/toolkit/mozapps/extensions/test/browser/discovery_install.html
+++ b/toolkit/mozapps/extensions/test/browser/discovery_install.html
@@ -1,6 +1,7 @@
 <html>
 <head>
 <script type="text/javascript">
+/*globals InstallTrigger*/
 function install() {
   InstallTrigger.install({
     "Test Add-on": {
diff --git a/toolkit/mozapps/extensions/test/browser/head.js b/toolkit/mozapps/extensions/test/browser/head.js
index 47afd6b15cd..923cabcf0fa 100644
--- a/toolkit/mozapps/extensions/test/browser/head.js
+++ b/toolkit/mozapps/extensions/test/browser/head.js
@@ -1,6 +1,7 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/
  */
+/*globals end_test*/
 
 Components.utils.import("resource://gre/modules/NetUtil.jsm");
 
@@ -1343,7 +1344,7 @@ MockInstall.prototype = {
         break;
       case AddonManager.STATE_DOWNLOADING:
       case AddonManager.STATE_CHECKING:
-      case AddonManger.STATE_INSTALLING:
+      case AddonManager.STATE_INSTALLING:
         // Installation is already running
         return;
       default:
diff --git a/toolkit/mozapps/extensions/test/xpcshell/head_addons.js b/toolkit/mozapps/extensions/test/xpcshell/head_addons.js
index 3466e0c1304..84c24f2c198 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/head_addons.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/head_addons.js
@@ -37,7 +37,7 @@ Components.utils.import("resource://gre/modules/Services.jsm");
 Components.utils.import("resource://gre/modules/NetUtil.jsm");
 Components.utils.import("resource://gre/modules/Promise.jsm");
 Components.utils.import("resource://gre/modules/Task.jsm");
-Components.utils.import("resource://gre/modules/osfile.jsm");
+const { OS } = Components.utils.import("resource://gre/modules/osfile.jsm", {});
 Components.utils.import("resource://gre/modules/AsyncShutdown.jsm");
 Components.utils.import("resource://testing-common/MockRegistrar.jsm");
 
@@ -47,9 +47,9 @@ XPCOMUtils.defineLazyModuleGetter(this, "HttpServer",
                                   "resource://testing-common/httpd.js");
 
 // We need some internal bits of AddonManager
-var AMscope = Components.utils.import("resource://gre/modules/AddonManager.jsm");
-var AddonManager = AMscope.AddonManager;
-var AddonManagerInternal = AMscope.AddonManagerInternal;
+var AMscope = Components.utils.import("resource://gre/modules/AddonManager.jsm", {});
+var { AddonManager, AddonManagerInternal, AddonManagerPrivate } = AMscope;
+
 // Mock out AddonManager's reference to the AsyncShutdown module so we can shut
 // down AddonManager from the test
 var MockAsyncShutdown = {
@@ -469,7 +469,7 @@ function overrideCertDB(handler) {
   let certDBFactory = {
     createInstance: function(outer, iid) {
       if (outer != null) {
-        throw Cr.NS_ERROR_NO_AGGREGATION;
+        throw Components.results.NS_ERROR_NO_AGGREGATION;
       }
       return fakeCertDB.QueryInterface(iid);
     }
@@ -1794,7 +1794,7 @@ if ("nsIWindowsRegKey" in AM_Ci) {
       case AM_Ci.nsIWindowsRegKey.ROOT_KEY_CLASSES_ROOT:
         return MockRegistry.CLASSES_ROOT;
       default:
-        do_throw("Unknown root " + aRootKey);
+        do_throw("Unknown root " + aRoot);
         return null;
       }
     },
diff --git a/toolkit/mozapps/extensions/test/xpcshell/head_unpack.js b/toolkit/mozapps/extensions/test/xpcshell/head_unpack.js
index 088898b4116..560f27e58ff 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/head_unpack.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/head_unpack.js
@@ -1,2 +1,3 @@
+/*globals Services, TEST_UNPACKED: true*/
 Services.prefs.setBoolPref("extensions.alwaysUnpack", true);
 TEST_UNPACKED = true;
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_DeferredSave.js b/toolkit/mozapps/extensions/test/xpcshell/test_DeferredSave.js
index 7d385682934..2a6ff291e42 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_DeferredSave.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_DeferredSave.js
@@ -303,7 +303,6 @@ add_task(function* dirty_while_writing() {
 // A write callback for the OS.File.writeAtomic mock that rejects write attempts
 function disabled_write_callback(aTester) {
   do_throw("Should not have written during clean flush");
-  deferred.reject(new Error("Write during supposedly clean flush"));
 }
 
 // special write callback that disables itself to make sure
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug393285.js b/toolkit/mozapps/extensions/test/xpcshell/test_bug393285.js
index 4c7182ee43c..268939962ce 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_bug393285.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_bug393285.js
@@ -258,7 +258,7 @@ function run_test() {
   startupManager();
 
   AddonManager.getAddonsByIDs(addonIDs, function(addons) {
-    for (addon of addons) {
+    for (let addon of addons) {
       do_check_eq(addon.blocklistState, Ci.nsIBlocklistService.STATE_NOT_BLOCKED);
     }
     run_test_1();
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug406118.js b/toolkit/mozapps/extensions/test/xpcshell/test_bug406118.js
index 0c7152044e3..8493d7816a6 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_bug406118.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_bug406118.js
@@ -125,7 +125,7 @@ function run_test() {
   startupManager();
 
   AddonManager.getAddonsByIDs(addonIDs, function(addons) {
-    for (addon of addons) {
+    for (let addon of addons) {
       do_check_eq(addon.blocklistState, Ci.nsIBlocklistService.STATE_NOT_BLOCKED);
     }
     run_test_1();
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug675371.js b/toolkit/mozapps/extensions/test/xpcshell/test_bug675371.js
index 579335d8aad..6f2a5e7cd97 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_bug675371.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_bug675371.js
@@ -35,7 +35,7 @@ function check_test() {
     do_check_true(addon.isActive);
 
     // Tests that chrome.manifest is registered when the addon is installed.
-    var target = { active: false };
+    var target = { };
     Services.scriptloader.loadSubScript("chrome://bug675371/content/test.js", target);
     do_check_true(target.active);
 
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_fuel.js b/toolkit/mozapps/extensions/test/xpcshell/test_fuel.js
index 4bc78cacb49..2ab8781df8d 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_fuel.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_fuel.js
@@ -141,6 +141,7 @@ function run_test() {
   });
 }
 
+var gLastEvent;
 function onGenericEvent(event) {
   gLastEvent = event.type;
 }
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_prefs.js b/toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_prefs.js
index bb0e55e2c75..843c57f907a 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_prefs.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_gfxBlacklist_prefs.js
@@ -2,6 +2,8 @@
  * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
+var { classes: Cc, interfaces: Ci } = Components;
+
 // Test whether the blacklist succesfully adds and removes the prefs that store
 // its decisions when the remote blacklist is changed.
 // Uses test_gfxBlacklist.xml and test_gfxBlacklist2.xml
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_mapURIToAddonID.js b/toolkit/mozapps/extensions/test/xpcshell/test_mapURIToAddonID.js
index 0a67442f0c1..e4d4734ec71 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_mapURIToAddonID.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_mapURIToAddonID.js
@@ -33,7 +33,7 @@ TestProvider.prototype = {
     if (aURI.spec === this.uri.spec) {
       return this.id;
     }
-    throw Components.Exception("Not mapped", result);
+    throw Components.Exception("Not mapped", this.result);
   }
 };
 
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_pluginchange.js b/toolkit/mozapps/extensions/test/xpcshell/test_pluginchange.js
index d28fc4e75c8..05e17b35edc 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_pluginchange.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_pluginchange.js
@@ -31,7 +31,7 @@ PluginTag.prototype = {
   }
 };
 
-PLUGINS = [
+const PLUGINS = [
   // A standalone plugin
   new PluginTag("Java", "A mock Java plugin"),
 
@@ -40,7 +40,7 @@ PLUGINS = [
   new PluginTag("Flash", "A mock Flash plugin")
 ];
 
-gPluginHost = {
+const gPluginHost = {
   // nsIPluginHost
   getPluginTags: function(count) {
     count.value = PLUGINS.length;
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_provider_unsafe_access_shutdown.js b/toolkit/mozapps/extensions/test/xpcshell/test_provider_unsafe_access_shutdown.js
index a0dbe3353c7..6fdfd915dd4 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_provider_unsafe_access_shutdown.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_provider_unsafe_access_shutdown.js
@@ -18,7 +18,7 @@ function mockAddonProvider(name) {
     },
     getAddonByID(id, callback) {
       if (this.hasShutdown) {
-        unsafeAccess = true;
+        this.unsafeAccess = true;
       }
       callback(null);
     },
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_provider_unsafe_access_startup.js b/toolkit/mozapps/extensions/test/xpcshell/test_provider_unsafe_access_startup.js
index 2b251252d9e..1193ddfe44b 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_provider_unsafe_access_startup.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_provider_unsafe_access_startup.js
@@ -17,7 +17,7 @@ function mockAddonProvider(name) {
     },
     getAddonByID(id, callback) {
       if (!this.hasStarted) {
-        unsafeAccess = true;
+        this.unsafeAccess = true;
       }
       callback(null);
     },
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_seen.js b/toolkit/mozapps/extensions/test/xpcshell/test_seen.js
index 993deae0145..e499e7339d2 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_seen.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_seen.js
@@ -109,7 +109,7 @@ add_task(function*() {
   do_check_false(addon.seen);
 
   // Updating through the API shouldn't change the state
-  install = yield new Promise(resolve => AddonManager.getInstallForFile(do_get_addon("test_bootstrap1_2"), resolve));
+  let install = yield new Promise(resolve => AddonManager.getInstallForFile(do_get_addon("test_bootstrap1_2"), resolve));
   yield promiseCompleteAllInstalls([install]);
   do_check_eq(install.state, AddonManager.STATE_INSTALLED);
   do_check_false(hasFlag(install.addon.pendingOperations, AddonManager.PENDING_INSTALL));
@@ -190,7 +190,7 @@ add_task(function*() {
   do_check_true(addon.seen);
 
   // Updating through the API shouldn't change the state
-  install = yield new Promise(resolve => AddonManager.getInstallForFile(do_get_addon("test_bootstrap1_2"), resolve));
+  let install = yield new Promise(resolve => AddonManager.getInstallForFile(do_get_addon("test_bootstrap1_2"), resolve));
   yield promiseCompleteAllInstalls([install]);
   do_check_eq(install.state, AddonManager.STATE_INSTALLED);
   do_check_false(hasFlag(install.addon.pendingOperations, AddonManager.PENDING_INSTALL));
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_undouninstall.js b/toolkit/mozapps/extensions/test/xpcshell/test_undouninstall.js
index a589361b606..93d4b6abc12 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_undouninstall.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_undouninstall.js
@@ -350,7 +350,7 @@ add_task(function* cancelUninstallOfRestartless() {
   yield promiseInstallAllFiles([do_get_addon("test_undouninstall1")]);
   ensure_test_completed();
 
-  a1 = yield promiseAddonByID(ID);
+  let a1 = yield promiseAddonByID(ID);
 
   do_check_neq(a1, null);
   BootstrapMonitor.checkAddonInstalled(ID, "1.0");
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_updateCancel.js b/toolkit/mozapps/extensions/test/xpcshell/test_updateCancel.js
index f334cbeb0b4..b50fd4a55d8 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_updateCancel.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_updateCancel.js
@@ -52,7 +52,6 @@ function makeCancelListener() {
 // Set up the HTTP server so that we can control when it responds
 var httpReceived = Promise.defer();
 function dataHandler(aRequest, aResponse) {
-  asyncResponse = aResponse;
   aResponse.processAsync();
   httpReceived.resolve([aRequest, aResponse]);
 }
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_webextension_icons.js b/toolkit/mozapps/extensions/test/xpcshell/test_webextension_icons.js
index 88ffefcbcc5..1982a72bb13 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_webextension_icons.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_webextension_icons.js
@@ -48,7 +48,7 @@ add_task(function*() {
 
   let uri = do_get_addon_root_uri(profileDir, ID);
 
-  addon = yield promiseAddonByID(ID);
+  let addon = yield promiseAddonByID(ID);
   do_check_neq(addon, null);
 
   function check_icons(addon) {
diff --git a/toolkit/mozapps/extensions/test/xpcshell/xpcshell-shared.ini b/toolkit/mozapps/extensions/test/xpcshell/xpcshell-shared.ini
index 7001b0fb524..c1493d43925 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/xpcshell-shared.ini
+++ b/toolkit/mozapps/extensions/test/xpcshell/xpcshell-shared.ini
@@ -194,6 +194,8 @@ skip-if = os == "android"
 [test_gfxBlacklist_Vendor.js]
 [test_gfxBlacklist_Version.js]
 [test_gfxBlacklist_prefs.js]
+# Bug 1248787 - consistently fails
+skip-if = true
 [test_hasbinarycomponents.js]
 [test_hotfix.js]
 [test_install.js]
diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_bug672485.js b/toolkit/mozapps/extensions/test/xpinstall/browser_bug672485.js
index 4540cad437e..78da9fb5cf2 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/browser_bug672485.js
+++ b/toolkit/mozapps/extensions/test/xpinstall/browser_bug672485.js
@@ -2,7 +2,7 @@
  * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
-gWindowWatcher = null;
+var gWindowWatcher = null;
 
 function test() {
   Harness.installConfirmCallback = confirm_install;
diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_concurrent_installs.js b/toolkit/mozapps/extensions/test/xpinstall/browser_concurrent_installs.js
index 6b4fc1abda7..31d9cc6923c 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/browser_concurrent_installs.js
+++ b/toolkit/mozapps/extensions/test/xpinstall/browser_concurrent_installs.js
@@ -1,13 +1,12 @@
 // Test that having two frames that request installs at the same time doesn't
 // cause callback ID conflicts (discussed in bug 926712)
 
-var {Promise} = Cu.import("resource://gre/modules/Promise.jsm");
-
 var gConcurrentTabs = [];
 var gQueuedForInstall = [];
 var gResults = [];
 
 function frame_script() {
+  /*globals addMessageListener, sendAsyncMessage*/
   addMessageListener("Test:StartInstall", () => {
     content.document.getElementById("installnow").click()
   });
diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_whitelist3.js b/toolkit/mozapps/extensions/test/xpinstall/browser_whitelist3.js
index d522982fb8e..282e904c07f 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/browser_whitelist3.js
+++ b/toolkit/mozapps/extensions/test/xpinstall/browser_whitelist3.js
@@ -1,7 +1,7 @@
 // ----------------------------------------------------------------------------
 // Tests installing an unsigned add-on through a navigation. Should not be
 // blocked since the referer is whitelisted.
-var URL = TESTROOT2 + "navigate.html?" + encodeURIComponent(TESTROOT + "unsigned.xpi");
+var url = TESTROOT2 + "navigate.html?" + encodeURIComponent(TESTROOT + "unsigned.xpi");
 
 function test() {
   Harness.installConfirmCallback = confirm_install;
@@ -12,7 +12,7 @@ function test() {
   pm.add(makeURI("http://example.org/"), "install", pm.ALLOW_ACTION);
 
   gBrowser.selectedTab = gBrowser.addTab();
-  gBrowser.loadURI(URL);
+  gBrowser.loadURI(url);
 }
 
 function confirm_install(window) {
diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_whitelist4.js b/toolkit/mozapps/extensions/test/xpinstall/browser_whitelist4.js
index 5f40adf7228..c77b9d6629c 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/browser_whitelist4.js
+++ b/toolkit/mozapps/extensions/test/xpinstall/browser_whitelist4.js
@@ -1,7 +1,7 @@
 // ----------------------------------------------------------------------------
 // Tests installing an unsigned add-on through a navigation. Should be
 // blocked since the referer is not whitelisted even though the target is.
-var URL = TESTROOT2 + "navigate.html?" + encodeURIComponent(TESTROOT + "unsigned.xpi");
+var url = TESTROOT2 + "navigate.html?" + encodeURIComponent(TESTROOT + "unsigned.xpi");
 
 function test() {
   Harness.installBlockedCallback = allow_blocked;
@@ -12,12 +12,12 @@ function test() {
   pm.add(makeURI("http://example.com/"), "install", pm.ALLOW_ACTION);
 
   gBrowser.selectedTab = gBrowser.addTab();
-  gBrowser.loadURI(URL);
+  gBrowser.loadURI(url);
 }
 
 function allow_blocked(installInfo) {
   is(installInfo.browser, gBrowser.selectedBrowser, "Install should have been triggered by the right browser");
-  is(installInfo.originatingURI.spec, URL, "Install should have been triggered by the right uri");
+  is(installInfo.originatingURI.spec, url, "Install should have been triggered by the right uri");
   return false;
 }
 
diff --git a/toolkit/mozapps/extensions/test/xpinstall/bug645699.html b/toolkit/mozapps/extensions/test/xpinstall/bug645699.html
index 9a65720ae2b..5944ed77c16 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/bug645699.html
+++ b/toolkit/mozapps/extensions/test/xpinstall/bug645699.html
@@ -6,6 +6,7 @@
 <head>
 <title>InstallTrigger tests</title>
 <script type="text/javascript">
+/*globals InstallTrigger*/
 function startInstall() {
   var whiteUrl = "https://example.org/";
 
diff --git a/toolkit/mozapps/extensions/test/xpinstall/concurrent_installs.html b/toolkit/mozapps/extensions/test/xpinstall/concurrent_installs.html
index 192bbf2bc22..55ff9a2b805 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/concurrent_installs.html
+++ b/toolkit/mozapps/extensions/test/xpinstall/concurrent_installs.html
@@ -7,6 +7,7 @@
   <meta charset="utf-8">
 <title>Concurrent InstallTrigger tests</title>
 <script type="text/javascript">
+/*globals InstallTrigger*/
 function installCallback(url, status) {
   document.getElementById("status").textContent = status;
 
diff --git a/toolkit/mozapps/extensions/test/xpinstall/enabled.html b/toolkit/mozapps/extensions/test/xpinstall/enabled.html
index ec8513edc6b..ed950d35a45 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/enabled.html
+++ b/toolkit/mozapps/extensions/test/xpinstall/enabled.html
@@ -8,6 +8,7 @@
 <head>
 <title>InstallTrigger tests</title>
 <script type="text/javascript">
+/*globals InstallTrigger*/
 function init() {
   document.getElementById("enabled").textContent = InstallTrigger.enabled() ? "true" : "false";
   dump("Sending PageLoaded\n");
diff --git a/toolkit/mozapps/extensions/test/xpinstall/installchrome.html b/toolkit/mozapps/extensions/test/xpinstall/installchrome.html
index 71c072d3aa1..1679848d52f 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/installchrome.html
+++ b/toolkit/mozapps/extensions/test/xpinstall/installchrome.html
@@ -8,6 +8,7 @@
 <head>
 <title>InstallTrigger tests</title>
 <script type="text/javascript">
+/*globals InstallTrigger*/
 function startInstall() {
   InstallTrigger.installChrome(InstallTrigger.SKIN,
                                decodeURIComponent(document.location.search.substring(1)),
diff --git a/toolkit/mozapps/extensions/test/xpinstall/installtrigger.html b/toolkit/mozapps/extensions/test/xpinstall/installtrigger.html
index cd7618cc502..1ca41522aae 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/installtrigger.html
+++ b/toolkit/mozapps/extensions/test/xpinstall/installtrigger.html
@@ -8,6 +8,7 @@
 <head>
 <title>InstallTrigger tests</title>
 <script type="text/javascript">
+/*globals InstallTrigger*/
 function installCallback(url, status) {
   document.getElementById("status").textContent = status;
 
diff --git a/toolkit/mozapps/extensions/test/xpinstall/startsoftwareupdate.html b/toolkit/mozapps/extensions/test/xpinstall/startsoftwareupdate.html
index 4845a504a05..bc72d9897fc 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/startsoftwareupdate.html
+++ b/toolkit/mozapps/extensions/test/xpinstall/startsoftwareupdate.html
@@ -8,6 +8,7 @@
 <head>
 <title>InstallTrigger tests</title>
 <script type="text/javascript">
+/*globals InstallTrigger*/
 function startInstall() {
   InstallTrigger.startSoftwareUpdate(decodeURIComponent(document.location.search.substring(1)));
 }
diff --git a/toolkit/mozapps/extensions/test/xpinstall/triggerredirect.html b/toolkit/mozapps/extensions/test/xpinstall/triggerredirect.html
index 49fda7dc87e..568b0370994 100644
--- a/toolkit/mozapps/extensions/test/xpinstall/triggerredirect.html
+++ b/toolkit/mozapps/extensions/test/xpinstall/triggerredirect.html
@@ -8,6 +8,7 @@
 <head>
 <title>InstallTrigger tests</title>
 <script type="text/javascript">
+/*globals InstallTrigger*/
 function installCallback(url, status) {
   document.location = "#foo";
 

From 27e8b30aaa40e657f4a050cca4023a02e6f9e68c Mon Sep 17 00:00:00 2001
From: Kit Cambridge <kcambridge@mozilla.com>
Date: Tue, 16 Feb 2016 15:52:15 -0800
Subject: [PATCH 38/45] Bug 1224785, Part 3 - Don't include
 `ShowWith{Icon}Backend` on Android. r=me

---
 toolkit/components/alerts/nsAlertsService.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/toolkit/components/alerts/nsAlertsService.cpp b/toolkit/components/alerts/nsAlertsService.cpp
index 345f6075406..25cc5a3fc43 100644
--- a/toolkit/components/alerts/nsAlertsService.cpp
+++ b/toolkit/components/alerts/nsAlertsService.cpp
@@ -84,6 +84,8 @@ NS_IMPL_ISUPPORTS(IconCallback, nsIFaviconDataCallback)
 
 #endif // MOZ_PLACES
 
+#ifndef MOZ_WIDGET_ANDROID
+
 nsresult
 ShowWithIconBackend(nsIAlertsService* aBackend, nsIAlertNotification* aAlert,
                     nsIObserver* aAlertListener)
@@ -132,6 +134,8 @@ ShowWithBackend(nsIAlertsService* aBackend, nsIAlertNotification* aAlert,
   return aBackend->ShowAlert(aAlert, aAlertListener);
 }
 
+#endif // MOZ_WIDGET_ANDROID
+
 } // anonymous namespace
 
 NS_IMPL_ISUPPORTS(nsAlertsService, nsIAlertsService, nsIAlertsDoNotDisturb, nsIAlertsProgressListener)

From 2802bf505dc26b8b879c04dba0aaa0a99b503fef Mon Sep 17 00:00:00 2001
From: Brian Grinstead <bgrinstead@mozilla.com>
Date: Tue, 16 Feb 2016 16:10:25 -0800
Subject: [PATCH 39/45] Bug 1246733 - Remove stylesheet references of
 'devtools/skin/common.css' and instead import it in theme
 files;r=ntim,r=ochameau

MozReview-Commit-ID: AwS9aJ4dypm
---
 devtools/client/animationinspector/animation-inspector.xhtml | 1 -
 devtools/client/canvasdebugger/canvasdebugger.xul            | 1 -
 devtools/client/debugger/debugger.xul                        | 1 -
 devtools/client/eyedropper/eyedropper.xul                    | 1 -
 devtools/client/framework/test/browser_toolbox_sidebar.js    | 1 -
 .../client/framework/test/browser_toolbox_sidebar_events.js  | 1 -
 .../framework/test/browser_toolbox_sidebar_existing_tabs.js  | 1 -
 .../client/framework/test/browser_toolbox_sidebar_tool.xul   | 1 -
 devtools/client/framework/toolbox.xul                        | 1 -
 devtools/client/inspector/inspector.xul                      | 1 -
 devtools/client/inspector/markup/markup.xhtml                | 1 -
 devtools/client/memory/memory.xhtml                          | 1 -
 devtools/client/netmonitor/netmonitor.xul                    | 1 -
 devtools/client/performance/performance.xul                  | 1 -
 devtools/client/promisedebugger/promise-debugger.xhtml       | 1 -
 devtools/client/responsive.html/index.xhtml                  | 2 --
 devtools/client/scratchpad/scratchpad.xul                    | 1 -
 devtools/client/shadereditor/shadereditor.xul                | 1 -
 devtools/client/shared/test/browser_tableWidget_basic.js     | 1 -
 .../shared/test/browser_tableWidget_keyboard_interaction.js  | 1 -
 .../shared/test/browser_tableWidget_mouse_interaction.js     | 1 -
 devtools/client/shared/test/browser_treeWidget_basic.js      | 5 ++---
 .../shared/test/browser_treeWidget_keyboard_interaction.js   | 5 ++---
 .../shared/test/browser_treeWidget_mouse_interaction.js      | 5 ++---
 devtools/client/shared/test/doc_options-view.xul             | 1 -
 devtools/client/shared/widgets/VariablesView.xul             | 1 -
 devtools/client/shared/widgets/cubic-bezier-frame.xhtml      | 1 -
 devtools/client/shared/widgets/filter-frame.xhtml            | 1 -
 devtools/client/shared/widgets/graphs-frame.xhtml            | 1 -
 devtools/client/shared/widgets/mdn-docs-frame.xhtml          | 1 -
 devtools/client/shared/widgets/spectrum-frame.xhtml          | 1 -
 devtools/client/sourceeditor/editor.js                       | 1 -
 devtools/client/storage/storage.xul                          | 1 -
 devtools/client/styleeditor/styleeditor.xul                  | 1 -
 devtools/client/themes/dark-theme.css                        | 1 +
 devtools/client/themes/light-theme.css                       | 1 +
 devtools/client/webaudioeditor/webaudioeditor.xul            | 1 -
 devtools/client/webconsole/webconsole.xul                    | 2 --
 38 files changed, 8 insertions(+), 44 deletions(-)

diff --git a/devtools/client/animationinspector/animation-inspector.xhtml b/devtools/client/animationinspector/animation-inspector.xhtml
index 298147be332..3c721fc8d87 100644
--- a/devtools/client/animationinspector/animation-inspector.xhtml
+++ b/devtools/client/animationinspector/animation-inspector.xhtml
@@ -10,7 +10,6 @@
   <head>
     <title>&animationInspectorTitle;</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-    <link rel="stylesheet" href="chrome://devtools/skin/common.css" type="text/css"/>
     <link rel="stylesheet" href="chrome://devtools/skin/animationinspector.css" type="text/css"/>
     <script type="application/javascript;version=1.8" src="chrome://devtools/content/shared/theme-switching.js"/>
   </head>
diff --git a/devtools/client/canvasdebugger/canvasdebugger.xul b/devtools/client/canvasdebugger/canvasdebugger.xul
index 504200be310..33765d351de 100644
--- a/devtools/client/canvasdebugger/canvasdebugger.xul
+++ b/devtools/client/canvasdebugger/canvasdebugger.xul
@@ -4,7 +4,6 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://devtools/content/shared/widgets/widgets.css" type="text/css"?>
-<?xml-stylesheet href="chrome://devtools/skin/common.css" type="text/css"?>
 <?xml-stylesheet href="chrome://devtools/skin/widgets.css" type="text/css"?>
 <?xml-stylesheet href="chrome://devtools/skin/canvasdebugger.css" type="text/css"?>
 <!DOCTYPE window [
diff --git a/devtools/client/debugger/debugger.xul b/devtools/client/debugger/debugger.xul
index a11efa99ce3..ce0b0ca67dd 100644
--- a/devtools/client/debugger/debugger.xul
+++ b/devtools/client/debugger/debugger.xul
@@ -5,7 +5,6 @@
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://devtools/content/shared/widgets/widgets.css" type="text/css"?>
 <?xml-stylesheet href="debugger.css" type="text/css"?>
-<?xml-stylesheet href="chrome://devtools/skin/common.css" type="text/css"?>
 <?xml-stylesheet href="chrome://devtools/skin/widgets.css" type="text/css"?>
 <?xml-stylesheet href="chrome://devtools/skin/debugger.css" type="text/css"?>
 <!DOCTYPE window [
diff --git a/devtools/client/eyedropper/eyedropper.xul b/devtools/client/eyedropper/eyedropper.xul
index 7a5d1fe2f15..2c6944521c4 100644
--- a/devtools/client/eyedropper/eyedropper.xul
+++ b/devtools/client/eyedropper/eyedropper.xul
@@ -6,7 +6,6 @@
 
 <!DOCTYPE window []>
 
-<?xml-stylesheet href="chrome://devtools/skin/common.css"?>
 <?xml-stylesheet href="chrome://devtools/skin/eyedropper.css" type="text/css"?>
 
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
diff --git a/devtools/client/framework/test/browser_toolbox_sidebar.js b/devtools/client/framework/test/browser_toolbox_sidebar.js
index e52a6ef5c0a..34d105762cf 100644
--- a/devtools/client/framework/test/browser_toolbox_sidebar.js
+++ b/devtools/client/framework/test/browser_toolbox_sidebar.js
@@ -6,7 +6,6 @@ function test() {
   let {ToolSidebar} = require("devtools/client/framework/sidebar");
 
   const toolURL = "data:text/xml;charset=utf8,<?xml version='1.0'?>" +
-                  "<?xml-stylesheet href='chrome://devtools/skin/common.css' type='text/css'?>" +
                   "<window xmlns='http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul'>" +
                   "<hbox flex='1'><description flex='1'>foo</description><splitter class='devtools-side-splitter'/>" +
                   "<tabbox flex='1' id='sidebar' class='devtools-sidebar-tabs'><tabs/><tabpanels flex='1'/></tabbox>" +
diff --git a/devtools/client/framework/test/browser_toolbox_sidebar_events.js b/devtools/client/framework/test/browser_toolbox_sidebar_events.js
index fedcc1e35e7..ec5ca1f929c 100644
--- a/devtools/client/framework/test/browser_toolbox_sidebar_events.js
+++ b/devtools/client/framework/test/browser_toolbox_sidebar_events.js
@@ -6,7 +6,6 @@ function test() {
   const { ToolSidebar } = require("devtools/client/framework/sidebar");
 
   const toolURL = "data:text/xml;charset=utf8,<?xml version='1.0'?>" +
-                  "<?xml-stylesheet href='chrome://devtools/skin/common.css' type='text/css'?>" +
                   "<window xmlns='http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul'>" +
                   "<hbox flex='1'><description flex='1'>foo</description><splitter class='devtools-side-splitter'/>" +
                   "<tabbox flex='1' id='sidebar' class='devtools-sidebar-tabs'><tabs/><tabpanels flex='1'/></tabbox>" +
diff --git a/devtools/client/framework/test/browser_toolbox_sidebar_existing_tabs.js b/devtools/client/framework/test/browser_toolbox_sidebar_existing_tabs.js
index e9b3bff9637..913489e3d22 100644
--- a/devtools/client/framework/test/browser_toolbox_sidebar_existing_tabs.js
+++ b/devtools/client/framework/test/browser_toolbox_sidebar_existing_tabs.js
@@ -7,7 +7,6 @@
 const {ToolSidebar} = require("devtools/client/framework/sidebar");
 
 const testToolURL = "data:text/xml;charset=utf8,<?xml version='1.0'?>" +
-                "<?xml-stylesheet href='chrome://devtools/skin/common.css' type='text/css'?>" +
                 "<window xmlns='http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul'>" +
                 "<hbox flex='1'><description flex='1'>test tool</description>" +
                 "<splitter class='devtools-side-splitter'/>" +
diff --git a/devtools/client/framework/test/browser_toolbox_sidebar_tool.xul b/devtools/client/framework/test/browser_toolbox_sidebar_tool.xul
index 2367115ce8f..2ce4951580a 100644
--- a/devtools/client/framework/test/browser_toolbox_sidebar_tool.xul
+++ b/devtools/client/framework/test/browser_toolbox_sidebar_tool.xul
@@ -4,7 +4,6 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://devtools/content/shared/widgets/widgets.css" type="text/css"?>
-<?xml-stylesheet href="chrome://devtools/skin/common.css" type="text/css"?>
 <?xml-stylesheet href="chrome://devtools/skin/widgets.css" type="text/css"?>
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   <script type="application/javascript;version=1.8" src="chrome://devtools/content/shared/theme-switching.js"/>
diff --git a/devtools/client/framework/toolbox.xul b/devtools/client/framework/toolbox.xul
index f7c18aaa743..7999e6c87f5 100644
--- a/devtools/client/framework/toolbox.xul
+++ b/devtools/client/framework/toolbox.xul
@@ -3,7 +3,6 @@
    - 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/. -->
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://devtools/skin/common.css" type="text/css"?>
 
 <?xul-overlay href="chrome://global/content/editMenuOverlay.xul"?>
 
diff --git a/devtools/client/inspector/inspector.xul b/devtools/client/inspector/inspector.xul
index 597389c8021..2bad1a82ea5 100644
--- a/devtools/client/inspector/inspector.xul
+++ b/devtools/client/inspector/inspector.xul
@@ -5,7 +5,6 @@
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://devtools/content/shared/widgets/widgets.css" type="text/css"?>
 <?xml-stylesheet href="chrome://devtools/content/inspector/inspector.css" type="text/css"?>
-<?xml-stylesheet href="chrome://devtools/skin/common.css" type="text/css"?>
 <?xml-stylesheet href="chrome://devtools/skin/widgets.css" type="text/css"?>
 <?xml-stylesheet href="chrome://devtools/skin/inspector.css" type="text/css"?>
 <?xml-stylesheet href="chrome://devtools/skin/rules.css" type="text/css"?>
diff --git a/devtools/client/inspector/markup/markup.xhtml b/devtools/client/inspector/markup/markup.xhtml
index aad1a21c6f4..9547bf6e5e4 100644
--- a/devtools/client/inspector/markup/markup.xhtml
+++ b/devtools/client/inspector/markup/markup.xhtml
@@ -9,7 +9,6 @@
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
   <link rel="stylesheet" href="chrome://devtools/content/inspector/markup/markup.css" type="text/css"/>
   <link rel="stylesheet" href="chrome://devtools/skin/markup.css" type="text/css"/>
-  <link rel="stylesheet" href="chrome://devtools/skin/common.css" type="text/css"/>
 
   <script type="application/javascript;version=1.8"
           src="chrome://devtools/content/shared/theme-switching.js"/>
diff --git a/devtools/client/memory/memory.xhtml b/devtools/client/memory/memory.xhtml
index 914b3526653..a126dcc34a5 100644
--- a/devtools/client/memory/memory.xhtml
+++ b/devtools/client/memory/memory.xhtml
@@ -11,7 +11,6 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
-    <link rel="stylesheet" href="chrome://devtools/skin/common.css" type="text/css"/>
     <link rel="stylesheet" href="chrome://devtools/skin/widgets.css" type="text/css"/>
     <link rel="stylesheet" href="chrome://devtools/skin/memory.css" type="text/css"/>
     <link rel="stylesheet" href="chrome://devtools/skin/components-frame.css" type="text/css"/>
diff --git a/devtools/client/netmonitor/netmonitor.xul b/devtools/client/netmonitor/netmonitor.xul
index 4b46861c627..fa344911664 100644
--- a/devtools/client/netmonitor/netmonitor.xul
+++ b/devtools/client/netmonitor/netmonitor.xul
@@ -5,7 +5,6 @@
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://devtools/content/shared/widgets/widgets.css" type="text/css"?>
 <?xml-stylesheet href="chrome://devtools/content/netmonitor/netmonitor.css" type="text/css"?>
-<?xml-stylesheet href="chrome://devtools/skin/common.css" type="text/css"?>
 <?xml-stylesheet href="chrome://devtools/skin/widgets.css" type="text/css"?>
 <?xml-stylesheet href="chrome://devtools/skin/netmonitor.css" type="text/css"?>
 <!DOCTYPE window [
diff --git a/devtools/client/performance/performance.xul b/devtools/client/performance/performance.xul
index 68cb2df4bb8..07bb4a0650f 100644
--- a/devtools/client/performance/performance.xul
+++ b/devtools/client/performance/performance.xul
@@ -4,7 +4,6 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://devtools/content/shared/widgets/widgets.css" type="text/css"?>
-<?xml-stylesheet href="chrome://devtools/skin/common.css" type="text/css"?>
 <?xml-stylesheet href="chrome://devtools/skin/widgets.css" type="text/css"?>
 <?xml-stylesheet href="chrome://devtools/skin/performance.css" type="text/css"?>
 <?xml-stylesheet href="chrome://devtools/skin/jit-optimizations.css" type="text/css"?>
diff --git a/devtools/client/promisedebugger/promise-debugger.xhtml b/devtools/client/promisedebugger/promise-debugger.xhtml
index e4064a99529..cca446f531e 100644
--- a/devtools/client/promisedebugger/promise-debugger.xhtml
+++ b/devtools/client/promisedebugger/promise-debugger.xhtml
@@ -12,7 +12,6 @@
   <head>
     <title>&title;</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-    <link rel="stylesheet" href="chrome://devtools/skin/common.css" type="text/css"/>
     <link rel="stylesheet" href="chrome://devtools/skin/promisedebugger.css" type="text/css"/>
     <script type="application/javascript;version=1.8" src="chrome://devtools/content/shared/theme-switching.js"/>
   </head>
diff --git a/devtools/client/responsive.html/index.xhtml b/devtools/client/responsive.html/index.xhtml
index e991414a0bf..4073622c105 100644
--- a/devtools/client/responsive.html/index.xhtml
+++ b/devtools/client/responsive.html/index.xhtml
@@ -6,8 +6,6 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-    <link rel="stylesheet" type="text/css"
-          href="chrome://devtools/skin/common.css"/>
     <link rel="stylesheet" type="text/css"
           href="resource://devtools/client/responsive.html/index.css"/>
     <script type="application/javascript;version=1.8"
diff --git a/devtools/client/scratchpad/scratchpad.xul b/devtools/client/scratchpad/scratchpad.xul
index 5d03943ccce..0603fa95e70 100644
--- a/devtools/client/scratchpad/scratchpad.xul
+++ b/devtools/client/scratchpad/scratchpad.xul
@@ -14,7 +14,6 @@
 ]>
 
 <?xml-stylesheet href="chrome://global/skin/global.css"?>
-<?xml-stylesheet href="chrome://devtools/skin/common.css"?>
 <?xml-stylesheet href="chrome://devtools/skin/scratchpad.css"?>
 <?xul-overlay href="chrome://global/content/editMenuOverlay.xul"?>
 
diff --git a/devtools/client/shadereditor/shadereditor.xul b/devtools/client/shadereditor/shadereditor.xul
index b8579af4319..dc7f764b7a8 100644
--- a/devtools/client/shadereditor/shadereditor.xul
+++ b/devtools/client/shadereditor/shadereditor.xul
@@ -3,7 +3,6 @@
    - 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/. -->
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://devtools/skin/common.css" type="text/css"?>
 <?xml-stylesheet href="chrome://devtools/skin/widgets.css" type="text/css"?>
 <?xml-stylesheet href="chrome://devtools/skin/shadereditor.css" type="text/css"?>
 <?xml-stylesheet href="chrome://devtools/content/shared/widgets/widgets.css" type="text/css"?>
diff --git a/devtools/client/shared/test/browser_tableWidget_basic.js b/devtools/client/shared/test/browser_tableWidget_basic.js
index 32f48418347..9d8180619be 100644
--- a/devtools/client/shared/test/browser_tableWidget_basic.js
+++ b/devtools/client/shared/test/browser_tableWidget_basic.js
@@ -6,7 +6,6 @@
 
 const TEST_URI = "data:text/xml;charset=UTF-8,<?xml version='1.0'?>" +
   "<?xml-stylesheet href='chrome://global/skin/global.css'?>" +
-  "<?xml-stylesheet href='chrome://devtools/skin/common.css'?>" +
   "<?xml-stylesheet href='chrome://devtools/skin/light-theme.css'?>" +
   "<?xml-stylesheet href='chrome://devtools/skin/widgets.css'?>" +
   "<window xmlns='http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul'" +
diff --git a/devtools/client/shared/test/browser_tableWidget_keyboard_interaction.js b/devtools/client/shared/test/browser_tableWidget_keyboard_interaction.js
index 5ad63561355..3589e4aabbe 100644
--- a/devtools/client/shared/test/browser_tableWidget_keyboard_interaction.js
+++ b/devtools/client/shared/test/browser_tableWidget_keyboard_interaction.js
@@ -6,7 +6,6 @@
 
 const TEST_URI = "data:text/xml;charset=UTF-8,<?xml version='1.0'?>" +
   "<?xml-stylesheet href='chrome://global/skin/global.css'?>" +
-  "<?xml-stylesheet href='chrome://devtools/skin/common.css'?>" +
   "<?xml-stylesheet href='chrome://devtools/skin/light-theme.css'?>" +
   "<?xml-stylesheet href='chrome://devtools/skin/widgets.css'?>" +
   "<window xmlns='http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul'" +
diff --git a/devtools/client/shared/test/browser_tableWidget_mouse_interaction.js b/devtools/client/shared/test/browser_tableWidget_mouse_interaction.js
index fdc0a52927a..4ed3648e30e 100644
--- a/devtools/client/shared/test/browser_tableWidget_mouse_interaction.js
+++ b/devtools/client/shared/test/browser_tableWidget_mouse_interaction.js
@@ -6,7 +6,6 @@
 
 const TEST_URI = "data:text/xml;charset=UTF-8,<?xml version='1.0'?>" +
   "<?xml-stylesheet href='chrome://global/skin/global.css'?>" +
-  "<?xml-stylesheet href='chrome://devtools/skin/common.css'?>" +
   "<?xml-stylesheet href='chrome://devtools/skin/light-theme.css'?>" +
   "<?xml-stylesheet href='chrome://devtools/skin/widgets.css'?>" +
   "<window xmlns='http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul'" +
diff --git a/devtools/client/shared/test/browser_treeWidget_basic.js b/devtools/client/shared/test/browser_treeWidget_basic.js
index 8aa3bd18307..1e570406276 100644
--- a/devtools/client/shared/test/browser_treeWidget_basic.js
+++ b/devtools/client/shared/test/browser_treeWidget_basic.js
@@ -4,9 +4,8 @@
 
 // Tests that the tree widget api works fine
 
-const TEST_URI = "data:text/html;charset=utf-8,<head><link rel='stylesheet' " +
-  "type='text/css' href='chrome://devtools/skin/common.css'><link " +
-  "rel='stylesheet' type='text/css' href='chrome://devtools/skin/widg" +
+const TEST_URI = "data:text/html;charset=utf-8,<head>" +
+  "<link rel='stylesheet' type='text/css' href='chrome://devtools/skin/widg" +
   "ets.css'></head><body><div></div><span></span></body>";
 const {TreeWidget} = require("devtools/client/shared/widgets/TreeWidget");
 
diff --git a/devtools/client/shared/test/browser_treeWidget_keyboard_interaction.js b/devtools/client/shared/test/browser_treeWidget_keyboard_interaction.js
index c2ad90de3b1..62bdedb6be6 100644
--- a/devtools/client/shared/test/browser_treeWidget_keyboard_interaction.js
+++ b/devtools/client/shared/test/browser_treeWidget_keyboard_interaction.js
@@ -4,9 +4,8 @@
 
 // Tests that keyboard interaction works fine with the tree widget
 
-const TEST_URI = "data:text/html;charset=utf-8,<head><link rel='stylesheet' " +
-  "type='text/css' href='chrome://devtools/skin/common.css'><link " +
-  "rel='stylesheet' type='text/css' href='chrome://devtools/skin/widg" +
+const TEST_URI = "data:text/html;charset=utf-8,<head>" +
+  "<link rel='stylesheet' type='text/css' href='chrome://devtools/skin/widg" +
   "ets.css'></head><body><div></div><span></span></body>";
 const {TreeWidget} = require("devtools/client/shared/widgets/TreeWidget");
 const Promise = require("promise");
diff --git a/devtools/client/shared/test/browser_treeWidget_mouse_interaction.js b/devtools/client/shared/test/browser_treeWidget_mouse_interaction.js
index 2b6d5d7dba2..cc80e42675f 100644
--- a/devtools/client/shared/test/browser_treeWidget_mouse_interaction.js
+++ b/devtools/client/shared/test/browser_treeWidget_mouse_interaction.js
@@ -4,9 +4,8 @@
 
 // Tests that mouse interaction works fine with tree widget
 
-const TEST_URI = "data:text/html;charset=utf-8,<head><link rel='stylesheet' " +
-  "type='text/css' href='chrome://devtools/skin/common.css'><link " +
-  "rel='stylesheet' type='text/css' href='chrome://devtools/skin/widg" +
+const TEST_URI = "data:text/html;charset=utf-8,<head>" +
+  "<link rel='stylesheet' type='text/css' href='chrome://devtools/skin/widg" +
   "ets.css'></head><body><div></div><span></span></body>";
 const {TreeWidget} = require("devtools/client/shared/widgets/TreeWidget");
 const Promise = require("promise");
diff --git a/devtools/client/shared/test/doc_options-view.xul b/devtools/client/shared/test/doc_options-view.xul
index 5655e7a0894..06ae1cbf196 100644
--- a/devtools/client/shared/test/doc_options-view.xul
+++ b/devtools/client/shared/test/doc_options-view.xul
@@ -3,7 +3,6 @@
    - 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/. -->
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://devtools/skin/common.css" type="text/css"?>
 <?xml-stylesheet href="chrome://devtools/skin/widgets.css" type="text/css"?>
 <?xml-stylesheet href="chrome://devtools/content/shared/widgets/widgets.css" type="text/css"?>
 <!DOCTYPE window []>
diff --git a/devtools/client/shared/widgets/VariablesView.xul b/devtools/client/shared/widgets/VariablesView.xul
index dc1a8e351b3..fe8bb13ec68 100644
--- a/devtools/client/shared/widgets/VariablesView.xul
+++ b/devtools/client/shared/widgets/VariablesView.xul
@@ -4,7 +4,6 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <?xml-stylesheet href="chrome://global/skin/global.css"?>
 <?xml-stylesheet href="chrome://devtools/content/shared/widgets/widgets.css" type="text/css"?>
-<?xml-stylesheet href="chrome://devtools/skin/common.css" type="text/css"?>
 <?xml-stylesheet href="chrome://devtools/skin/widgets.css" type="text/css"?>
 <!DOCTYPE window [
   <!ENTITY % viewDTD SYSTEM "chrome://devtools/locale/VariablesView.dtd">
diff --git a/devtools/client/shared/widgets/cubic-bezier-frame.xhtml b/devtools/client/shared/widgets/cubic-bezier-frame.xhtml
index 6634c3ed536..73b6e309976 100644
--- a/devtools/client/shared/widgets/cubic-bezier-frame.xhtml
+++ b/devtools/client/shared/widgets/cubic-bezier-frame.xhtml
@@ -7,7 +7,6 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-  <link rel="stylesheet" href="chrome://devtools/skin/common.css" type="text/css"/>
   <link rel="stylesheet" href="chrome://devtools/content/shared/widgets/cubic-bezier.css" type="text/css"/>
   <script type="application/javascript;version=1.8" src="chrome://devtools/content/shared/theme-switching.js"/>
   <style>
diff --git a/devtools/client/shared/widgets/filter-frame.xhtml b/devtools/client/shared/widgets/filter-frame.xhtml
index 613af19f646..4cfd81045a4 100644
--- a/devtools/client/shared/widgets/filter-frame.xhtml
+++ b/devtools/client/shared/widgets/filter-frame.xhtml
@@ -10,7 +10,6 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
     <link rel="stylesheet" href="chrome://devtools/content/shared/widgets/filter-widget.css" type="text/css"/>
-    <link rel="stylesheet" href="chrome://devtools/skin/common.css" type="text/css"/>
     <script type="application/javascript;version=1.8" src="chrome://devtools/content/shared/theme-switching.js"></script>
   </head>
   <body>
diff --git a/devtools/client/shared/widgets/graphs-frame.xhtml b/devtools/client/shared/widgets/graphs-frame.xhtml
index 6e951982fb0..8c6f45e03ca 100644
--- a/devtools/client/shared/widgets/graphs-frame.xhtml
+++ b/devtools/client/shared/widgets/graphs-frame.xhtml
@@ -7,7 +7,6 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-  <link rel="stylesheet" href="chrome://devtools/skin/common.css" type="text/css"/>
   <link rel="stylesheet" href="chrome://devtools/skin/widgets.css" ype="text/css"/>
   <script type="application/javascript;version=1.8" src="chrome://devtools/content/shared/theme-switching.js"/>
   <style>
diff --git a/devtools/client/shared/widgets/mdn-docs-frame.xhtml b/devtools/client/shared/widgets/mdn-docs-frame.xhtml
index c6784a2817d..85e3ae3f28f 100644
--- a/devtools/client/shared/widgets/mdn-docs-frame.xhtml
+++ b/devtools/client/shared/widgets/mdn-docs-frame.xhtml
@@ -7,7 +7,6 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-  <link rel="stylesheet" href="chrome://devtools/skin/common.css" type="text/css"/>
   <link rel="stylesheet" href="chrome://devtools/content/shared/widgets/mdn-docs.css" type="text/css"/>
   <script type="application/javascript;version=1.8" src="chrome://devtools/content/shared/theme-switching.js"/>
 </head>
diff --git a/devtools/client/shared/widgets/spectrum-frame.xhtml b/devtools/client/shared/widgets/spectrum-frame.xhtml
index 5c7540f5fb8..07b684974c6 100644
--- a/devtools/client/shared/widgets/spectrum-frame.xhtml
+++ b/devtools/client/shared/widgets/spectrum-frame.xhtml
@@ -7,7 +7,6 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-  <link rel="stylesheet" href="chrome://devtools/skin/common.css" type="text/css"/>
   <link rel="stylesheet" href="chrome://devtools/content/shared/widgets/spectrum.css" ype="text/css"/>
   <script type="application/javascript;version=1.8" src="chrome://devtools/content/shared/theme-switching.js"/>
   <style>
diff --git a/devtools/client/sourceeditor/editor.js b/devtools/client/sourceeditor/editor.js
index f9c9809e7a8..640c574d91a 100644
--- a/devtools/client/sourceeditor/editor.js
+++ b/devtools/client/sourceeditor/editor.js
@@ -46,7 +46,6 @@ const { OS } = Services.appinfo;
 // order to initialize a CodeMirror instance.
 
 const CM_STYLES = [
-  "chrome://devtools/skin/common.css",
   "chrome://devtools/content/sourceeditor/codemirror/lib/codemirror.css",
   "chrome://devtools/content/sourceeditor/codemirror/addon/dialog/dialog.css",
   "chrome://devtools/content/sourceeditor/codemirror/mozilla.css"
diff --git a/devtools/client/storage/storage.xul b/devtools/client/storage/storage.xul
index 6077fafbaec..23207735281 100644
--- a/devtools/client/storage/storage.xul
+++ b/devtools/client/storage/storage.xul
@@ -4,7 +4,6 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://devtools/content/shared/widgets/widgets.css" type="text/css"?>
-<?xml-stylesheet href="chrome://devtools/skin/common.css" type="text/css"?>
 <?xml-stylesheet href="chrome://devtools/skin/widgets.css" type="text/css"?>
 <?xml-stylesheet href="chrome://devtools/skin/storage.css" type="text/css"?>
 
diff --git a/devtools/client/styleeditor/styleeditor.xul b/devtools/client/styleeditor/styleeditor.xul
index 73fe4c67680..1e6ccd68f74 100644
--- a/devtools/client/styleeditor/styleeditor.xul
+++ b/devtools/client/styleeditor/styleeditor.xul
@@ -16,7 +16,6 @@
 <?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
 <?xml-stylesheet href="chrome://devtools/content/shared/widgets/widgets.css" type="text/css"?>
 <?xml-stylesheet href="chrome://devtools/content/shared/splitview.css" type="text/css"?>
-<?xml-stylesheet href="chrome://devtools/skin/common.css" type="text/css"?>
 <?xml-stylesheet href="chrome://devtools/skin/widgets.css" type="text/css"?>
 <?xml-stylesheet href="chrome://devtools/skin/splitview.css" type="text/css"?>
 <?xml-stylesheet href="chrome://devtools/content/styleeditor/styleeditor.css" type="text/css"?>
diff --git a/devtools/client/themes/dark-theme.css b/devtools/client/themes/dark-theme.css
index a5c568338a0..573110bb8d6 100644
--- a/devtools/client/themes/dark-theme.css
+++ b/devtools/client/themes/dark-theme.css
@@ -4,6 +4,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 @import url(variables.css);
+@import url(common.css);
 @import url(toolbars.css);
 
 body {
diff --git a/devtools/client/themes/light-theme.css b/devtools/client/themes/light-theme.css
index 477d9d11fcf..2cd32d79306 100644
--- a/devtools/client/themes/light-theme.css
+++ b/devtools/client/themes/light-theme.css
@@ -4,6 +4,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 @import url(variables.css);
+@import url(common.css);
 @import url(toolbars.css);
 
 body {
diff --git a/devtools/client/webaudioeditor/webaudioeditor.xul b/devtools/client/webaudioeditor/webaudioeditor.xul
index 4975e821ceb..f35ce3d9cf0 100644
--- a/devtools/client/webaudioeditor/webaudioeditor.xul
+++ b/devtools/client/webaudioeditor/webaudioeditor.xul
@@ -4,7 +4,6 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://devtools/content/shared/widgets/widgets.css" type="text/css"?>
-<?xml-stylesheet href="chrome://devtools/skin/common.css" type="text/css"?>
 <?xml-stylesheet href="chrome://devtools/skin/widgets.css" type="text/css"?>
 <?xml-stylesheet href="chrome://devtools/skin/webaudioeditor.css" type="text/css"?>
 <!DOCTYPE window [
diff --git a/devtools/client/webconsole/webconsole.xul b/devtools/client/webconsole/webconsole.xul
index 37c033f530c..131497e8c78 100644
--- a/devtools/client/webconsole/webconsole.xul
+++ b/devtools/client/webconsole/webconsole.xul
@@ -7,8 +7,6 @@
 %webConsoleDTD;
 ]>
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://devtools/skin/common.css"
-                 type="text/css"?>
 <?xml-stylesheet href="chrome://devtools/skin/widgets.css"
                  type="text/css"?>
 <?xml-stylesheet href="chrome://devtools/skin/webconsole.css"

From 2f001e11a5f946693455288899971a3c0a69ae7f Mon Sep 17 00:00:00 2001
From: Kit Cambridge <kcambridge@mozilla.com>
Date: Tue, 16 Feb 2016 16:13:38 -0800
Subject: [PATCH 40/45] Back out changeset 4357fe5a9d22 (bug 1206560) for
 M-e10s(bc4) failures.

MozReview-Commit-ID: 1J0li7PNBWN
---
 .../test/alerts/browser_notification_close.js |  2 --
 .../test/alerts/file_dom_notifications.html   |  1 -
 toolkit/components/alerts/nsXULAlerts.cpp     | 21 +------------------
 toolkit/components/alerts/nsXULAlerts.h       |  4 +---
 .../alerts/resources/content/alert.css        |  6 ------
 .../alerts/resources/content/alert.js         | 10 ---------
 .../alerts/resources/content/alert.xul        |  1 -
 toolkit/themes/shared/alert-common.css        | 16 --------------
 8 files changed, 2 insertions(+), 59 deletions(-)

diff --git a/browser/base/content/test/alerts/browser_notification_close.js b/browser/base/content/test/alerts/browser_notification_close.js
index 3d4660dbb4a..82e1f314fac 100644
--- a/browser/base/content/test/alerts/browser_notification_close.js
+++ b/browser/base/content/test/alerts/browser_notification_close.js
@@ -29,8 +29,6 @@ add_task(function* test_notificationClose() {
     is(alertTitleLabel.value, "Test title", "Title text of notification should be present");
     let alertTextLabel = alertWindow.document.getElementById("alertTextLabel");
     is(alertTextLabel.textContent, "Test body", "Body text of notification should be present");
-    let alertIcon = alertWindow.document.getElementById("alertIcon");
-    ok(alertIcon.src, "Icon of notification should be present");
 
     let alertCloseButton = alertWindow.document.querySelector(".alertCloseButton");
     is(alertCloseButton.localName, "toolbarbutton", "close button found");
diff --git a/browser/base/content/test/alerts/file_dom_notifications.html b/browser/base/content/test/alerts/file_dom_notifications.html
index e5a2be2d3f4..8f5c6f2fd57 100644
--- a/browser/base/content/test/alerts/file_dom_notifications.html
+++ b/browser/base/content/test/alerts/file_dom_notifications.html
@@ -1,7 +1,6 @@
 <html>
 <head>
 <meta charset="utf-8">
-<link rel="icon" type="image/png" href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAADElEQVQI12P4//8/AAX+Av7czFnnAAAAAElFTkSuQmCC">
 <script>
 "use strict";
 
diff --git a/toolkit/components/alerts/nsXULAlerts.cpp b/toolkit/components/alerts/nsXULAlerts.cpp
index f85c67662dd..f28c4501c8d 100644
--- a/toolkit/components/alerts/nsXULAlerts.cpp
+++ b/toolkit/components/alerts/nsXULAlerts.cpp
@@ -48,7 +48,7 @@ nsXULAlertObserver::Observe(nsISupports* aSubject, const char* aTopic,
   return rv;
 }
 
-NS_IMPL_ISUPPORTS(nsXULAlerts, nsIAlertsService, nsIAlertsDoNotDisturb, nsIAlertsIconURI)
+NS_IMPL_ISUPPORTS(nsXULAlerts, nsIAlertsService, nsIAlertsDoNotDisturb)
 
 /* static */ already_AddRefed<nsXULAlerts>
 nsXULAlerts::GetInstance()
@@ -83,14 +83,6 @@ nsXULAlerts::ShowAlertNotification(const nsAString& aImageUrl, const nsAString&
 NS_IMETHODIMP
 nsXULAlerts::ShowAlert(nsIAlertNotification* aAlert,
                        nsIObserver* aAlertListener)
-{
-  return ShowAlertWithIconURI(aAlert, aAlertListener, nullptr);
-}
-
-NS_IMETHODIMP
-nsXULAlerts::ShowAlertWithIconURI(nsIAlertNotification* aAlert,
-                                  nsIObserver* aAlertListener,
-                                  nsIURI* aIconURI)
 {
   bool inPrivateBrowsing;
   nsresult rv = aAlert->GetInPrivateBrowsing(&inPrivateBrowsing);
@@ -248,17 +240,6 @@ nsXULAlerts::ShowAlertWithIconURI(nsIAlertNotification* aAlert,
   rv = argsArray->AppendElement(scriptableAlertSource);
   NS_ENSURE_SUCCESS(rv, rv);
 
-  nsCOMPtr<nsISupportsCString> scriptableIconURL (do_CreateInstance(NS_SUPPORTS_CSTRING_CONTRACTID));
-  NS_ENSURE_TRUE(scriptableIconURL, NS_ERROR_FAILURE);
-  if (aIconURI) {
-    nsAutoCString iconURL;
-    rv = aIconURI->GetSpec(iconURL);
-    NS_ENSURE_SUCCESS(rv, rv);
-    scriptableIconURL->SetData(iconURL);
-  }
-  rv = argsArray->AppendElement(scriptableIconURL);
-  NS_ENSURE_SUCCESS(rv, rv);
-
   nsCOMPtr<mozIDOMWindowProxy> newWindow;
   nsAutoCString features("chrome,dialog=yes,titlebar=no,popup=yes");
   if (inPrivateBrowsing) {
diff --git a/toolkit/components/alerts/nsXULAlerts.h b/toolkit/components/alerts/nsXULAlerts.h
index 698d29397e5..c317ea80bae 100644
--- a/toolkit/components/alerts/nsXULAlerts.h
+++ b/toolkit/components/alerts/nsXULAlerts.h
@@ -13,12 +13,10 @@
 #include "nsIObserver.h"
 
 class nsXULAlerts : public nsIAlertsService,
-                    public nsIAlertsDoNotDisturb,
-                    public nsIAlertsIconURI
+                    public nsIAlertsDoNotDisturb
 {
   friend class nsXULAlertObserver;
 public:
-  NS_DECL_NSIALERTSICONURI
   NS_DECL_NSIALERTSDONOTDISTURB
   NS_DECL_NSIALERTSSERVICE
   NS_DECL_ISUPPORTS
diff --git a/toolkit/components/alerts/resources/content/alert.css b/toolkit/components/alerts/resources/content/alert.css
index 236d7612662..54a54c3fd83 100644
--- a/toolkit/components/alerts/resources/content/alert.css
+++ b/toolkit/components/alerts/resources/content/alert.css
@@ -13,16 +13,10 @@
 }
 
 #alertBox:not([hasOrigin]) > box > #alertTextBox > #alertFooter,
-#alertBox:not([hasIcon]) > box > #alertIcon,
 #alertImage:not([src]) {
   display: none;
 }
 
-#alertTitleBox {
-  -moz-box-pack: center;
-  -moz-box-align: center;
-}
-
 .alertText {
   white-space: pre-wrap;
 }
diff --git a/toolkit/components/alerts/resources/content/alert.js b/toolkit/components/alerts/resources/content/alert.js
index b67cb7783c4..684ceb39207 100644
--- a/toolkit/components/alerts/resources/content/alert.js
+++ b/toolkit/components/alerts/resources/content/alert.js
@@ -37,19 +37,9 @@ function prefillAlertInfo() {
   // arguments[8] --> replaced alert window (nsIDOMWindow)
   // arguments[9] --> an optional callback listener (nsIObserver)
   // arguments[10] -> the nsIURI.hostPort of the origin, optional
-  // arguments[11] -> the alert icon URL, optional
 
   switch (window.arguments.length) {
     default:
-    case 12: {
-      if (window.arguments[11]) {
-        let alertBox = document.getElementById("alertBox");
-        alertBox.setAttribute("hasIcon", true);
-
-        let icon = document.getElementById("alertIcon");
-        icon.src = window.arguments[11];
-      }
-    }
     case 11: {
       if (window.arguments[10]) {
         let alertBox = document.getElementById("alertBox");
diff --git a/toolkit/components/alerts/resources/content/alert.xul b/toolkit/components/alerts/resources/content/alert.xul
index 8597d9954d8..c4c2771cb7e 100644
--- a/toolkit/components/alerts/resources/content/alert.xul
+++ b/toolkit/components/alerts/resources/content/alert.xul
@@ -25,7 +25,6 @@
 
   <vbox id="alertBox" class="alertBox">
     <box id="alertTitleBox">
-      <image id="alertIcon"/>
       <label id="alertTitleLabel" class="alertTitle plain" crop="end"/>
       <vbox class="alertCloseBox">
         <toolbarbutton class="alertCloseButton close-icon"
diff --git a/toolkit/themes/shared/alert-common.css b/toolkit/themes/shared/alert-common.css
index a58388e56a3..20d9e7b00cf 100644
--- a/toolkit/themes/shared/alert-common.css
+++ b/toolkit/themes/shared/alert-common.css
@@ -53,22 +53,6 @@
   }
 }
 
-#alertIcon {
-  margin-top: 6px;
-  margin-inline-start: 8px;
-  margin-inline-end: 0;
-  margin-bottom: 0;
-  width: 16px;
-  min-height: 16px;
-  max-height: 16px;
-}
-
-@media (resolution: 2dppx) {
-  #alertIcon {
-    image-rendering: -moz-crisp-edges;
-  }
-}
-
 #alertImage {
   width: 80px;
   height: 80px;

From ea4b7320409320def9cff25eae9d72490949cb10 Mon Sep 17 00:00:00 2001
From: Lin Clark <lclark@mozilla.com>
Date: Tue, 16 Feb 2016 16:14:53 -0800
Subject: [PATCH 41/45] Bug 1245667 - Use standard license boilerplate in
 framework js files. r=bgrins

MozReview-Commit-ID: 31xbv6rirPg
---
 devtools/client/framework/ToolboxProcess.jsm               | 1 +
 devtools/client/framework/attach-thread.js                 | 6 ++++++
 devtools/client/framework/gDevTools.jsm                    | 2 ++
 devtools/client/framework/target.js                        | 2 ++
 devtools/client/framework/test/browser_devtools_api.js     | 2 ++
 .../client/framework/test/browser_devtools_api_destroy.js  | 2 ++
 .../client/framework/test/browser_dynamic_tool_enabling.js | 2 ++
 .../test/browser_ignore_toolbox_network_requests.js        | 3 +++
 devtools/client/framework/test/browser_keybindings_01.js   | 4 +++-
 devtools/client/framework/test/browser_keybindings_02.js   | 2 ++
 devtools/client/framework/test/browser_keybindings_03.js   | 2 ++
 .../framework/test/browser_new_activation_workflow.js      | 2 ++
 devtools/client/framework/test/browser_target_events.js    | 5 +++--
 devtools/client/framework/test/browser_target_remote.js    | 4 +++-
 devtools/client/framework/test/browser_target_support.js   | 4 +++-
 .../client/framework/test/browser_toolbox_custom_host.js   | 5 +++--
 .../framework/test/browser_toolbox_dynamic_registration.js | 5 +++--
 .../framework/test/browser_toolbox_getpanelwhenready.js    | 2 ++
 .../client/framework/test/browser_toolbox_highlight.js     | 2 ++
 devtools/client/framework/test/browser_toolbox_hosts.js    | 5 +++--
 .../client/framework/test/browser_toolbox_hosts_size.js    | 6 ++----
 devtools/client/framework/test/browser_toolbox_minimize.js | 2 ++
 devtools/client/framework/test/browser_toolbox_options.js  | 2 ++
 .../test/browser_toolbox_options_disable_buttons.js        | 2 ++
 .../test/browser_toolbox_options_disable_cache-01.js       | 4 +++-
 .../test/browser_toolbox_options_disable_cache-02.js       | 4 +++-
 .../framework/test/browser_toolbox_options_disable_js.js   | 2 ++
 ...rowser_toolbox_options_enable_serviceworkers_testing.js | 2 ++
 ...x_options_enable_serviceworkers_testing_frame_script.js | 4 +++-
 devtools/client/framework/test/browser_toolbox_raise.js    | 5 +++--
 devtools/client/framework/test/browser_toolbox_ready.js    | 5 +++--
 .../client/framework/test/browser_toolbox_select_event.js  | 2 ++
 .../test/browser_toolbox_selected_tool_unavailable.js      | 3 +++
 devtools/client/framework/test/browser_toolbox_sidebar.js  | 2 ++
 .../framework/test/browser_toolbox_sidebar_events.js       | 2 ++
 .../test/browser_toolbox_sidebar_existing_tabs.js          | 3 +++
 .../test/browser_toolbox_sidebar_overflow_menu.js          | 3 +++
 .../client/framework/test/browser_toolbox_split_console.js | 4 ++--
 .../framework/test/browser_toolbox_tabsswitch_shortcuts.js | 2 ++
 .../framework/test/browser_toolbox_textbox_context_menu.js | 2 ++
 .../framework/test/browser_toolbox_theme_registration.js   | 5 +++--
 devtools/client/framework/test/browser_toolbox_toggle.js   | 4 +++-
 .../client/framework/test/browser_toolbox_tool_ready.js    | 4 +++-
 .../framework/test/browser_toolbox_tool_remote_reopen.js   | 4 +++-
 .../framework/test/browser_toolbox_transport_events.js     | 2 ++
 .../framework/test/browser_toolbox_view_source_01.js       | 4 +++-
 .../framework/test/browser_toolbox_view_source_02.js       | 4 +++-
 .../framework/test/browser_toolbox_view_source_03.js       | 4 +++-
 .../framework/test/browser_toolbox_view_source_04.js       | 4 +++-
 .../framework/test/browser_toolbox_window_reload_target.js | 2 ++
 .../framework/test/browser_toolbox_window_shortcuts.js     | 2 ++
 .../framework/test/browser_toolbox_window_title_changes.js | 2 ++
 devtools/client/framework/test/browser_toolbox_zoom.js     | 2 ++
 devtools/client/framework/test/browser_two_tabs.js         | 4 +++-
 devtools/client/framework/test/code_math.js                | 5 +++++
 devtools/client/framework/test/head.js                     | 4 +++-
 devtools/client/framework/test/helper_disable_cache.js     | 4 +++-
 devtools/client/framework/test/serviceworker.js            | 5 +++++
 devtools/client/framework/test/shared-head.js              | 7 ++++---
 devtools/client/framework/test/shared-redux-head.js        | 4 +++-
 devtools/client/framework/toolbox-highlighter-utils.js     | 2 ++
 devtools/client/framework/toolbox-hosts.js                 | 2 ++
 devtools/client/framework/toolbox-options.js               | 2 ++
 devtools/client/framework/toolbox-process-window.js        | 3 +++
 devtools/client/framework/toolbox.js                       | 2 ++
 65 files changed, 170 insertions(+), 40 deletions(-)

diff --git a/devtools/client/framework/ToolboxProcess.jsm b/devtools/client/framework/ToolboxProcess.jsm
index c2f2eebc746..c51e738cdbe 100644
--- a/devtools/client/framework/ToolboxProcess.jsm
+++ b/devtools/client/framework/ToolboxProcess.jsm
@@ -3,6 +3,7 @@
 /* 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, results: Cr } = Components;
diff --git a/devtools/client/framework/attach-thread.js b/devtools/client/framework/attach-thread.js
index 43f7e5361b8..422ab644f19 100644
--- a/devtools/client/framework/attach-thread.js
+++ b/devtools/client/framework/attach-thread.js
@@ -1,3 +1,9 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
 const {Cc, Ci, Cu} = require("chrome");
 const Services = Cu.import("resource://gre/modules/Services.jsm", {}).Services;
 const promise = require("promise");
diff --git a/devtools/client/framework/gDevTools.jsm b/devtools/client/framework/gDevTools.jsm
index df1d45425f1..1f0b36dc442 100644
--- a/devtools/client/framework/gDevTools.jsm
+++ b/devtools/client/framework/gDevTools.jsm
@@ -1,3 +1,5 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/devtools/client/framework/target.js b/devtools/client/framework/target.js
index 3ffe04cadfe..9311ed88771 100644
--- a/devtools/client/framework/target.js
+++ b/devtools/client/framework/target.js
@@ -1,3 +1,5 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/devtools/client/framework/test/browser_devtools_api.js b/devtools/client/framework/test/browser_devtools_api.js
index ea263dd551c..e090b5c1c69 100644
--- a/devtools/client/framework/test/browser_devtools_api.js
+++ b/devtools/client/framework/test/browser_devtools_api.js
@@ -1,3 +1,5 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
diff --git a/devtools/client/framework/test/browser_devtools_api_destroy.js b/devtools/client/framework/test/browser_devtools_api_destroy.js
index e002e4a296c..5c488de6171 100644
--- a/devtools/client/framework/test/browser_devtools_api_destroy.js
+++ b/devtools/client/framework/test/browser_devtools_api_destroy.js
@@ -1,3 +1,5 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
diff --git a/devtools/client/framework/test/browser_dynamic_tool_enabling.js b/devtools/client/framework/test/browser_dynamic_tool_enabling.js
index c9989669b34..db3468a8f36 100644
--- a/devtools/client/framework/test/browser_dynamic_tool_enabling.js
+++ b/devtools/client/framework/test/browser_dynamic_tool_enabling.js
@@ -1,3 +1,5 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
diff --git a/devtools/client/framework/test/browser_ignore_toolbox_network_requests.js b/devtools/client/framework/test/browser_ignore_toolbox_network_requests.js
index 4965901eb02..e7f4c5753d0 100644
--- a/devtools/client/framework/test/browser_ignore_toolbox_network_requests.js
+++ b/devtools/client/framework/test/browser_ignore_toolbox_network_requests.js
@@ -1,5 +1,8 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
+
 "use strict";
 
 // Test that network requests originating from the toolbox don't get recorded in
diff --git a/devtools/client/framework/test/browser_keybindings_01.js b/devtools/client/framework/test/browser_keybindings_01.js
index 547e1347718..f2e6df896c4 100644
--- a/devtools/client/framework/test/browser_keybindings_01.js
+++ b/devtools/client/framework/test/browser_keybindings_01.js
@@ -1,5 +1,7 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
 /* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 // Tests that the keybindings for opening and closing the inspector work as expected
 // Can probably make this a shared test that tests all of the tools global keybindings
diff --git a/devtools/client/framework/test/browser_keybindings_02.js b/devtools/client/framework/test/browser_keybindings_02.js
index 6bbd4a6a216..8871b3eac6d 100644
--- a/devtools/client/framework/test/browser_keybindings_02.js
+++ b/devtools/client/framework/test/browser_keybindings_02.js
@@ -1,3 +1,5 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
diff --git a/devtools/client/framework/test/browser_keybindings_03.js b/devtools/client/framework/test/browser_keybindings_03.js
index c276e37972b..fbe74961012 100644
--- a/devtools/client/framework/test/browser_keybindings_03.js
+++ b/devtools/client/framework/test/browser_keybindings_03.js
@@ -1,3 +1,5 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
diff --git a/devtools/client/framework/test/browser_new_activation_workflow.js b/devtools/client/framework/test/browser_new_activation_workflow.js
index d97481c8f26..79483a689fa 100644
--- a/devtools/client/framework/test/browser_new_activation_workflow.js
+++ b/devtools/client/framework/test/browser_new_activation_workflow.js
@@ -1,3 +1,5 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
diff --git a/devtools/client/framework/test/browser_target_events.js b/devtools/client/framework/test/browser_target_events.js
index 2eb8a4038f0..d0054a484be 100644
--- a/devtools/client/framework/test/browser_target_events.js
+++ b/devtools/client/framework/test/browser_target_events.js
@@ -1,6 +1,7 @@
-/* vim: set ts=2 et sw=2 tw=80: */
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
 /* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 var target;
 
diff --git a/devtools/client/framework/test/browser_target_remote.js b/devtools/client/framework/test/browser_target_remote.js
index cc19a7fe6e5..b828d14ff56 100644
--- a/devtools/client/framework/test/browser_target_remote.js
+++ b/devtools/client/framework/test/browser_target_remote.js
@@ -1,5 +1,7 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
 /* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 // Ensure target is closed if client is closed directly
 function test() {
diff --git a/devtools/client/framework/test/browser_target_support.js b/devtools/client/framework/test/browser_target_support.js
index 587cf8b1c77..e26cf725b65 100644
--- a/devtools/client/framework/test/browser_target_support.js
+++ b/devtools/client/framework/test/browser_target_support.js
@@ -1,5 +1,7 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
 /* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 // Test support methods on Target, such as `hasActor`, `getActorDescription`,
 // `actorHasMethod` and `getTrait`.
diff --git a/devtools/client/framework/test/browser_toolbox_custom_host.js b/devtools/client/framework/test/browser_toolbox_custom_host.js
index 573b3305220..07d848a47ae 100644
--- a/devtools/client/framework/test/browser_toolbox_custom_host.js
+++ b/devtools/client/framework/test/browser_toolbox_custom_host.js
@@ -1,6 +1,7 @@
-/* vim: set ts=2 et sw=2 tw=80: */
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
 /* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 function test() {
   let {Toolbox} = require("devtools/client/framework/toolbox");
diff --git a/devtools/client/framework/test/browser_toolbox_dynamic_registration.js b/devtools/client/framework/test/browser_toolbox_dynamic_registration.js
index 44a07ad1aa8..f5453e79c17 100644
--- a/devtools/client/framework/test/browser_toolbox_dynamic_registration.js
+++ b/devtools/client/framework/test/browser_toolbox_dynamic_registration.js
@@ -1,6 +1,7 @@
-/* vim: set ts=2 et sw=2 tw=80: */
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
 /* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 var toolbox;
 
diff --git a/devtools/client/framework/test/browser_toolbox_getpanelwhenready.js b/devtools/client/framework/test/browser_toolbox_getpanelwhenready.js
index 93006f05e0c..3d531ac07a0 100644
--- a/devtools/client/framework/test/browser_toolbox_getpanelwhenready.js
+++ b/devtools/client/framework/test/browser_toolbox_getpanelwhenready.js
@@ -1,3 +1,5 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
diff --git a/devtools/client/framework/test/browser_toolbox_highlight.js b/devtools/client/framework/test/browser_toolbox_highlight.js
index d4140a526a4..170e5cd2a24 100644
--- a/devtools/client/framework/test/browser_toolbox_highlight.js
+++ b/devtools/client/framework/test/browser_toolbox_highlight.js
@@ -1,3 +1,5 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
diff --git a/devtools/client/framework/test/browser_toolbox_hosts.js b/devtools/client/framework/test/browser_toolbox_hosts.js
index 2558ed4217a..d46f5a615fc 100644
--- a/devtools/client/framework/test/browser_toolbox_hosts.js
+++ b/devtools/client/framework/test/browser_toolbox_hosts.js
@@ -1,6 +1,7 @@
-/* vim: set ts=2 et sw=2 tw=80: */
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
 /* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 "use strict";
 
diff --git a/devtools/client/framework/test/browser_toolbox_hosts_size.js b/devtools/client/framework/test/browser_toolbox_hosts_size.js
index b66acfae547..a28e28826ad 100644
--- a/devtools/client/framework/test/browser_toolbox_hosts_size.js
+++ b/devtools/client/framework/test/browser_toolbox_hosts_size.js
@@ -1,7 +1,5 @@
-/* vim: set ts=2 et sw=2 tw=80: */
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
diff --git a/devtools/client/framework/test/browser_toolbox_minimize.js b/devtools/client/framework/test/browser_toolbox_minimize.js
index d78d60b8cab..ce66826b139 100644
--- a/devtools/client/framework/test/browser_toolbox_minimize.js
+++ b/devtools/client/framework/test/browser_toolbox_minimize.js
@@ -1,3 +1,5 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
diff --git a/devtools/client/framework/test/browser_toolbox_options.js b/devtools/client/framework/test/browser_toolbox_options.js
index c977aab23e2..a8aa5c924a8 100644
--- a/devtools/client/framework/test/browser_toolbox_options.js
+++ b/devtools/client/framework/test/browser_toolbox_options.js
@@ -1,3 +1,5 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
diff --git a/devtools/client/framework/test/browser_toolbox_options_disable_buttons.js b/devtools/client/framework/test/browser_toolbox_options_disable_buttons.js
index a1c1ee32464..ee9b4388ecd 100644
--- a/devtools/client/framework/test/browser_toolbox_options_disable_buttons.js
+++ b/devtools/client/framework/test/browser_toolbox_options_disable_buttons.js
@@ -1,3 +1,5 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
diff --git a/devtools/client/framework/test/browser_toolbox_options_disable_cache-01.js b/devtools/client/framework/test/browser_toolbox_options_disable_cache-01.js
index 2625cf4703e..6d8c43da2b3 100644
--- a/devtools/client/framework/test/browser_toolbox_options_disable_cache-01.js
+++ b/devtools/client/framework/test/browser_toolbox_options_disable_cache-01.js
@@ -1,6 +1,8 @@
-/* vim: set ts=2 et sw=2 tw=80: */
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
+
 "use strict";
 
 requestLongerTimeout(2);
diff --git a/devtools/client/framework/test/browser_toolbox_options_disable_cache-02.js b/devtools/client/framework/test/browser_toolbox_options_disable_cache-02.js
index 3861d3cdb97..5739abce630 100644
--- a/devtools/client/framework/test/browser_toolbox_options_disable_cache-02.js
+++ b/devtools/client/framework/test/browser_toolbox_options_disable_cache-02.js
@@ -1,6 +1,8 @@
-/* vim: set ts=2 et sw=2 tw=80: */
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
+
 "use strict";
 
 requestLongerTimeout(2);
diff --git a/devtools/client/framework/test/browser_toolbox_options_disable_js.js b/devtools/client/framework/test/browser_toolbox_options_disable_js.js
index 512a50721d8..de029295a65 100644
--- a/devtools/client/framework/test/browser_toolbox_options_disable_js.js
+++ b/devtools/client/framework/test/browser_toolbox_options_disable_js.js
@@ -1,3 +1,5 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
diff --git a/devtools/client/framework/test/browser_toolbox_options_enable_serviceworkers_testing.js b/devtools/client/framework/test/browser_toolbox_options_enable_serviceworkers_testing.js
index a94d2225417..d66a8284ba6 100644
--- a/devtools/client/framework/test/browser_toolbox_options_enable_serviceworkers_testing.js
+++ b/devtools/client/framework/test/browser_toolbox_options_enable_serviceworkers_testing.js
@@ -1,3 +1,5 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
diff --git a/devtools/client/framework/test/browser_toolbox_options_enable_serviceworkers_testing_frame_script.js b/devtools/client/framework/test/browser_toolbox_options_enable_serviceworkers_testing_frame_script.js
index 63ee55f2edb..a228afe7c20 100644
--- a/devtools/client/framework/test/browser_toolbox_options_enable_serviceworkers_testing_frame_script.js
+++ b/devtools/client/framework/test/browser_toolbox_options_enable_serviceworkers_testing_frame_script.js
@@ -1,5 +1,7 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
 /* Any copyright is dedicated to the Public Domain.
- http://creativecommons.org/publicdomain/zero/1.0/ */
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 // A helper frame-script for devtools/client/framework service worker tests.
 
diff --git a/devtools/client/framework/test/browser_toolbox_raise.js b/devtools/client/framework/test/browser_toolbox_raise.js
index 6c857995658..7ff6d1288a9 100644
--- a/devtools/client/framework/test/browser_toolbox_raise.js
+++ b/devtools/client/framework/test/browser_toolbox_raise.js
@@ -1,6 +1,7 @@
-/* vim: set ts=2 et sw=2 tw=80: */
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
 /* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 var {Toolbox} = require("devtools/client/framework/toolbox");
 
diff --git a/devtools/client/framework/test/browser_toolbox_ready.js b/devtools/client/framework/test/browser_toolbox_ready.js
index 21e9fc4d92a..34be6f1155e 100644
--- a/devtools/client/framework/test/browser_toolbox_ready.js
+++ b/devtools/client/framework/test/browser_toolbox_ready.js
@@ -1,6 +1,7 @@
-/* vim: set ts=2 et sw=2 tw=80: */
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
 /* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 function test() {
   gBrowser.selectedTab = gBrowser.addTab();
diff --git a/devtools/client/framework/test/browser_toolbox_select_event.js b/devtools/client/framework/test/browser_toolbox_select_event.js
index 35dc10cb6b2..0909b168392 100644
--- a/devtools/client/framework/test/browser_toolbox_select_event.js
+++ b/devtools/client/framework/test/browser_toolbox_select_event.js
@@ -1,3 +1,5 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
diff --git a/devtools/client/framework/test/browser_toolbox_selected_tool_unavailable.js b/devtools/client/framework/test/browser_toolbox_selected_tool_unavailable.js
index b6ac2e3484c..e7aefc9bc6f 100644
--- a/devtools/client/framework/test/browser_toolbox_selected_tool_unavailable.js
+++ b/devtools/client/framework/test/browser_toolbox_selected_tool_unavailable.js
@@ -1,5 +1,8 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
+
 "use strict";
 
 // Test that opening the toolbox doesn't throw when the previously selected
diff --git a/devtools/client/framework/test/browser_toolbox_sidebar.js b/devtools/client/framework/test/browser_toolbox_sidebar.js
index 34d105762cf..2dbda37da56 100644
--- a/devtools/client/framework/test/browser_toolbox_sidebar.js
+++ b/devtools/client/framework/test/browser_toolbox_sidebar.js
@@ -1,3 +1,5 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
diff --git a/devtools/client/framework/test/browser_toolbox_sidebar_events.js b/devtools/client/framework/test/browser_toolbox_sidebar_events.js
index ec5ca1f929c..9e56845d6db 100644
--- a/devtools/client/framework/test/browser_toolbox_sidebar_events.js
+++ b/devtools/client/framework/test/browser_toolbox_sidebar_events.js
@@ -1,3 +1,5 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
diff --git a/devtools/client/framework/test/browser_toolbox_sidebar_existing_tabs.js b/devtools/client/framework/test/browser_toolbox_sidebar_existing_tabs.js
index 913489e3d22..ec856868620 100644
--- a/devtools/client/framework/test/browser_toolbox_sidebar_existing_tabs.js
+++ b/devtools/client/framework/test/browser_toolbox_sidebar_existing_tabs.js
@@ -1,5 +1,8 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
+
 "use strict";
 
 // Test that the sidebar widget auto-registers existing tabs.
diff --git a/devtools/client/framework/test/browser_toolbox_sidebar_overflow_menu.js b/devtools/client/framework/test/browser_toolbox_sidebar_overflow_menu.js
index 62df6112182..3c850dd28d2 100644
--- a/devtools/client/framework/test/browser_toolbox_sidebar_overflow_menu.js
+++ b/devtools/client/framework/test/browser_toolbox_sidebar_overflow_menu.js
@@ -1,5 +1,8 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
+
 "use strict";
 
 // Test that the sidebar widget correctly displays the "all tabs..." button
diff --git a/devtools/client/framework/test/browser_toolbox_split_console.js b/devtools/client/framework/test/browser_toolbox_split_console.js
index b2347820e43..228ad696221 100644
--- a/devtools/client/framework/test/browser_toolbox_split_console.js
+++ b/devtools/client/framework/test/browser_toolbox_split_console.js
@@ -1,5 +1,5 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/ */
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
diff --git a/devtools/client/framework/test/browser_toolbox_tabsswitch_shortcuts.js b/devtools/client/framework/test/browser_toolbox_tabsswitch_shortcuts.js
index 4208fbd15fa..84177a34242 100644
--- a/devtools/client/framework/test/browser_toolbox_tabsswitch_shortcuts.js
+++ b/devtools/client/framework/test/browser_toolbox_tabsswitch_shortcuts.js
@@ -1,3 +1,5 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
diff --git a/devtools/client/framework/test/browser_toolbox_textbox_context_menu.js b/devtools/client/framework/test/browser_toolbox_textbox_context_menu.js
index 826706a69f0..c81ed6eb62a 100644
--- a/devtools/client/framework/test/browser_toolbox_textbox_context_menu.js
+++ b/devtools/client/framework/test/browser_toolbox_textbox_context_menu.js
@@ -1,3 +1,5 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
diff --git a/devtools/client/framework/test/browser_toolbox_theme_registration.js b/devtools/client/framework/test/browser_toolbox_theme_registration.js
index 541a5ee8e05..c61ed623c9d 100644
--- a/devtools/client/framework/test/browser_toolbox_theme_registration.js
+++ b/devtools/client/framework/test/browser_toolbox_theme_registration.js
@@ -1,6 +1,7 @@
-/* vim: set ts=2 et sw=2 tw=80: */
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
 /* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 // Test for dynamically registering and unregistering themes
 const CHROME_URL = "chrome://mochitests/content/browser/devtools/client/framework/test/";
diff --git a/devtools/client/framework/test/browser_toolbox_toggle.js b/devtools/client/framework/test/browser_toolbox_toggle.js
index 77104296619..554b9ddfc69 100644
--- a/devtools/client/framework/test/browser_toolbox_toggle.js
+++ b/devtools/client/framework/test/browser_toolbox_toggle.js
@@ -1,5 +1,7 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
 /* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 "use strict";
 
diff --git a/devtools/client/framework/test/browser_toolbox_tool_ready.js b/devtools/client/framework/test/browser_toolbox_tool_ready.js
index ffe5dca3a7c..1821bf48e1a 100644
--- a/devtools/client/framework/test/browser_toolbox_tool_ready.js
+++ b/devtools/client/framework/test/browser_toolbox_tool_ready.js
@@ -1,5 +1,7 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
 /* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 "use strict";
 
diff --git a/devtools/client/framework/test/browser_toolbox_tool_remote_reopen.js b/devtools/client/framework/test/browser_toolbox_tool_remote_reopen.js
index 14d585779de..785ebc2a32b 100644
--- a/devtools/client/framework/test/browser_toolbox_tool_remote_reopen.js
+++ b/devtools/client/framework/test/browser_toolbox_tool_remote_reopen.js
@@ -1,5 +1,7 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
 /* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 "use strict";
 
diff --git a/devtools/client/framework/test/browser_toolbox_transport_events.js b/devtools/client/framework/test/browser_toolbox_transport_events.js
index 13424801158..74800746fb0 100644
--- a/devtools/client/framework/test/browser_toolbox_transport_events.js
+++ b/devtools/client/framework/test/browser_toolbox_transport_events.js
@@ -1,3 +1,5 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
diff --git a/devtools/client/framework/test/browser_toolbox_view_source_01.js b/devtools/client/framework/test/browser_toolbox_view_source_01.js
index f6d70b3471b..ee75bb91300 100644
--- a/devtools/client/framework/test/browser_toolbox_view_source_01.js
+++ b/devtools/client/framework/test/browser_toolbox_view_source_01.js
@@ -1,5 +1,7 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
 /* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 /**
  * Tests that Toolbox#viewSourceInDebugger works when debugger is not
diff --git a/devtools/client/framework/test/browser_toolbox_view_source_02.js b/devtools/client/framework/test/browser_toolbox_view_source_02.js
index 525aa49e704..26781781d4d 100644
--- a/devtools/client/framework/test/browser_toolbox_view_source_02.js
+++ b/devtools/client/framework/test/browser_toolbox_view_source_02.js
@@ -1,5 +1,7 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
 /* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 /**
  * Tests that Toolbox#viewSourceInDebugger works when debugger is already loaded.
diff --git a/devtools/client/framework/test/browser_toolbox_view_source_03.js b/devtools/client/framework/test/browser_toolbox_view_source_03.js
index 663febbddbc..0d2ff1b68b1 100644
--- a/devtools/client/framework/test/browser_toolbox_view_source_03.js
+++ b/devtools/client/framework/test/browser_toolbox_view_source_03.js
@@ -1,5 +1,7 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
 /* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 /**
  * Tests that Toolbox#viewSourceInStyleEditor works when style editor is not
diff --git a/devtools/client/framework/test/browser_toolbox_view_source_04.js b/devtools/client/framework/test/browser_toolbox_view_source_04.js
index 4d4b9cbdbbc..274d3261e1f 100644
--- a/devtools/client/framework/test/browser_toolbox_view_source_04.js
+++ b/devtools/client/framework/test/browser_toolbox_view_source_04.js
@@ -1,5 +1,7 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
 /* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 /**
  * Tests that Toolbox#viewSourceInScratchpad works.
diff --git a/devtools/client/framework/test/browser_toolbox_window_reload_target.js b/devtools/client/framework/test/browser_toolbox_window_reload_target.js
index 71a65b9a2b7..57a8f52255c 100644
--- a/devtools/client/framework/test/browser_toolbox_window_reload_target.js
+++ b/devtools/client/framework/test/browser_toolbox_window_reload_target.js
@@ -1,3 +1,5 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
diff --git a/devtools/client/framework/test/browser_toolbox_window_shortcuts.js b/devtools/client/framework/test/browser_toolbox_window_shortcuts.js
index 1d4d0d2cd28..4c17281314a 100644
--- a/devtools/client/framework/test/browser_toolbox_window_shortcuts.js
+++ b/devtools/client/framework/test/browser_toolbox_window_shortcuts.js
@@ -1,3 +1,5 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
diff --git a/devtools/client/framework/test/browser_toolbox_window_title_changes.js b/devtools/client/framework/test/browser_toolbox_window_title_changes.js
index eeac68de811..91ba9325dff 100644
--- a/devtools/client/framework/test/browser_toolbox_window_title_changes.js
+++ b/devtools/client/framework/test/browser_toolbox_window_title_changes.js
@@ -1,3 +1,5 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
diff --git a/devtools/client/framework/test/browser_toolbox_zoom.js b/devtools/client/framework/test/browser_toolbox_zoom.js
index a7e50ca2a8e..a0d4e8fe806 100644
--- a/devtools/client/framework/test/browser_toolbox_zoom.js
+++ b/devtools/client/framework/test/browser_toolbox_zoom.js
@@ -1,3 +1,5 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
diff --git a/devtools/client/framework/test/browser_two_tabs.js b/devtools/client/framework/test/browser_two_tabs.js
index 41dcc721cb5..2fada35d363 100644
--- a/devtools/client/framework/test/browser_two_tabs.js
+++ b/devtools/client/framework/test/browser_two_tabs.js
@@ -1,5 +1,7 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
 /* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 /**
  * Check regression when opening two tabs
diff --git a/devtools/client/framework/test/code_math.js b/devtools/client/framework/test/code_math.js
index 97c289411fd..9fe2a354176 100644
--- a/devtools/client/framework/test/code_math.js
+++ b/devtools/client/framework/test/code_math.js
@@ -1,3 +1,8 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
 function add(a, b, k) {
   var result = a + b;
   return k(result);
diff --git a/devtools/client/framework/test/head.js b/devtools/client/framework/test/head.js
index 977268197cc..4ca722b9e7e 100644
--- a/devtools/client/framework/test/head.js
+++ b/devtools/client/framework/test/head.js
@@ -1,5 +1,7 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
 /* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 // shared-head.js handles imports, constants, and utility functions
 Services.scriptloader.loadSubScript("chrome://mochitests/content/browser/devtools/client/framework/test/shared-head.js", this);
diff --git a/devtools/client/framework/test/helper_disable_cache.js b/devtools/client/framework/test/helper_disable_cache.js
index 720008257ea..ad5a8498e4a 100644
--- a/devtools/client/framework/test/helper_disable_cache.js
+++ b/devtools/client/framework/test/helper_disable_cache.js
@@ -1,6 +1,8 @@
-/* vim: set ts=2 et sw=2 tw=80: */
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
+
 "use strict";
 
 // Common code shared by browser_toolbox_options_disable_cache-*.js
diff --git a/devtools/client/framework/test/serviceworker.js b/devtools/client/framework/test/serviceworker.js
index 5f23cd547e2..ed3c1ec323b 100644
--- a/devtools/client/framework/test/serviceworker.js
+++ b/devtools/client/framework/test/serviceworker.js
@@ -1 +1,6 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
 // empty service worker, always succeed!
diff --git a/devtools/client/framework/test/shared-head.js b/devtools/client/framework/test/shared-head.js
index d2299dc5499..5df1e6c97c7 100644
--- a/devtools/client/framework/test/shared-head.js
+++ b/devtools/client/framework/test/shared-head.js
@@ -1,6 +1,7 @@
-/* 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/. */
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 "use strict";
 
diff --git a/devtools/client/framework/test/shared-redux-head.js b/devtools/client/framework/test/shared-redux-head.js
index 81687e8cf1b..d2ab50ff19e 100644
--- a/devtools/client/framework/test/shared-redux-head.js
+++ b/devtools/client/framework/test/shared-redux-head.js
@@ -1,5 +1,7 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
 /* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 "use strict";
 
diff --git a/devtools/client/framework/toolbox-highlighter-utils.js b/devtools/client/framework/toolbox-highlighter-utils.js
index 806bfdd5b87..97f5f1639a9 100644
--- a/devtools/client/framework/toolbox-highlighter-utils.js
+++ b/devtools/client/framework/toolbox-highlighter-utils.js
@@ -1,3 +1,5 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/devtools/client/framework/toolbox-hosts.js b/devtools/client/framework/toolbox-hosts.js
index 6c681d977bd..47ce544cbf4 100644
--- a/devtools/client/framework/toolbox-hosts.js
+++ b/devtools/client/framework/toolbox-hosts.js
@@ -1,3 +1,5 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/devtools/client/framework/toolbox-options.js b/devtools/client/framework/toolbox-options.js
index 9bce031c253..5ca4d61d6d0 100644
--- a/devtools/client/framework/toolbox-options.js
+++ b/devtools/client/framework/toolbox-options.js
@@ -1,3 +1,5 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/devtools/client/framework/toolbox-process-window.js b/devtools/client/framework/toolbox-process-window.js
index b0cecbc560d..ca6b56150ab 100644
--- a/devtools/client/framework/toolbox-process-window.js
+++ b/devtools/client/framework/toolbox-process-window.js
@@ -1,6 +1,9 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
 "use strict";
 
 var { classes: Cc, interfaces: Ci, utils: Cu } = Components;
diff --git a/devtools/client/framework/toolbox.js b/devtools/client/framework/toolbox.js
index 537f3e484f2..1cf89156d02 100644
--- a/devtools/client/framework/toolbox.js
+++ b/devtools/client/framework/toolbox.js
@@ -1,3 +1,5 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */

From ba71f8162f6871126832dc990ad39c4410457ea6 Mon Sep 17 00:00:00 2001
From: Patrick Brosset <pbrosset@mozilla.com>
Date: Tue, 16 Feb 2016 10:01:11 +0100
Subject: [PATCH 42/45] Bug 1248360 - Set eslint version to 1.10.3 when setting
 it up via mach

MozReview-Commit-ID: LmKsvGzj3fo
---
 python/mach_commands.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/python/mach_commands.py b/python/mach_commands.py
index 23ff6fe09a9..c58bf9357e2 100644
--- a/python/mach_commands.py
+++ b/python/mach_commands.py
@@ -219,9 +219,11 @@ class MachCommands(MachCommandBase):
         if not npmPath:
             return 1
 
-        # Install eslint.
+        # Install eslint 1.10.3.
+        # Note that that's the version currently compatible with the mozilla
+        # eslint plugin.
         success = self.callProcess("eslint",
-                                   [npmPath, "install", "eslint", "-g"])
+                                   [npmPath, "install", "eslint@1.10.3", "-g"])
         if not success:
             return 1
 

From dd163563b133239d62c1154e2dc5698e7dad2495 Mon Sep 17 00:00:00 2001
From: Drew Willcoxon <adw@mozilla.com>
Date: Tue, 16 Feb 2016 16:34:25 -0800
Subject: [PATCH 43/45] Bug 1247641 - When loading a background thumbnail, load
 about:blank asynchronously when a load fails to avoid endless redirects.
 r=markh

---
 .../content/backgroundPageThumbsContent.js      | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/toolkit/components/thumbnails/content/backgroundPageThumbsContent.js b/toolkit/components/thumbnails/content/backgroundPageThumbsContent.js
index 61386de5fdc..800768106ec 100644
--- a/toolkit/components/thumbnails/content/backgroundPageThumbsContent.js
+++ b/toolkit/components/thumbnails/content/backgroundPageThumbsContent.js
@@ -108,8 +108,6 @@ const backgroundPageThumbsContent = {
           this._startNextCapture();
         }
         else if (this._state == STATE_CANCELED) {
-          // A capture request was received while the current capture's page
-          // was still loading.
           delete this._currentCapture;
           this._startNextCapture();
         }
@@ -119,9 +117,20 @@ const backgroundPageThumbsContent = {
         // The requested page has loaded.  Capture it.
         this._state = STATE_CAPTURING;
         this._captureCurrentPage();
-      } else {
+      }
+      else if (this._state != STATE_CANCELED) {
+        // Something went wrong.  Cancel the capture.  Loading about:blank
+        // while onStateChange is still on the stack does not actually stop
+        // the request if it redirects, so do it asyncly.
         this._state = STATE_CANCELED;
-        this._loadAboutBlank();
+        if (!this._cancelTimer) {
+          this._cancelTimer =
+            Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer);
+          this._cancelTimer.init(() => {
+            this._loadAboutBlank();
+            delete this._cancelTimer;
+          }, 0, Ci.nsITimer.TYPE_ONE_SHOT);
+        }
       }
     }
   },

From 575bd7a4239adf11011c43636eafe58004635a88 Mon Sep 17 00:00:00 2001
From: Brian Grinstead <bgrinstead@mozilla.com>
Date: Tue, 16 Feb 2016 17:30:12 -0800
Subject: [PATCH 44/45] Bug 1247962 - Get rid of CPOW in
 browser_webconsole_live_filtering_on_search_strings.js;r=linclark

MozReview-Commit-ID: EyBMJ3dqZSW
---
 ...wser_webconsole_live_filtering_on_search_strings.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/devtools/client/webconsole/test/browser_webconsole_live_filtering_on_search_strings.js b/devtools/client/webconsole/test/browser_webconsole_live_filtering_on_search_strings.js
index fed9a62c135..d41bb40a59e 100644
--- a/devtools/client/webconsole/test/browser_webconsole_live_filtering_on_search_strings.js
+++ b/devtools/client/webconsole/test/browser_webconsole_live_filtering_on_search_strings.js
@@ -15,11 +15,11 @@ add_task(function*() {
   let hud = yield openConsole();
   hud.jsterm.clearOutput();
 
-  let console = content.console;
-
-  for (let i = 0; i < 50; i++) {
-    console.log("http://www.example.com/ " + i);
-  }
+  ContentTask.spawn(gBrowser.selectedBrowser, {}, function*() {
+    for (let i = 0; i < 50; i++) {
+      content.console.log("http://www.example.com/ " + i);
+    }
+  });
 
   yield waitForMessages({
     webconsole: hud,

From 1ca36cb9c8f405d224bd09bd43ed44116ffd2a4d Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Tue, 16 Feb 2016 20:10:00 -0800
Subject: [PATCH 45/45] Bug 1248855 - [webext] Add "object-curly-spacing"
 ESLint rule and auto-fix errors. r=billm

MozReview-Commit-ID: BAZ2rRl7eSM
---
 .../components/extensions/ext-bookmarks.js    |  10 +-
 .../extensions/ext-browserAction.js           |   2 +-
 .../components/extensions/ext-contextMenus.js |   2 +-
 .../extensions/ext-desktop-runtime.js         |   2 +-
 .../components/extensions/ext-pageAction.js   |   2 +-
 browser/components/extensions/ext-tabs.js     |   6 +-
 browser/components/extensions/ext-utils.js    |   4 +-
 .../browser_ext_browserAction_context.js      | 158 +++++++++---------
 ...owser_ext_browserAction_pageAction_icon.js | 122 +++++++-------
 .../browser_ext_browserAction_popup.js        |  24 +--
 .../browser_ext_contentscript_connect.js      |   2 +-
 .../test/browser/browser_ext_contextMenus.js  |  26 +--
 .../test/browser/browser_ext_lastError.js     |   2 +-
 .../browser/browser_ext_pageAction_context.js |  70 ++++----
 .../browser/browser_ext_pageAction_popup.js   |  28 ++--
 .../browser_ext_popup_api_injection.js        |   6 +-
 .../browser_ext_runtime_setUninstallURL.js    |   8 +-
 .../browser/browser_ext_tab_runtimeConnect.js |   6 +-
 .../test/browser/browser_ext_tabs_audio.js    |  22 +--
 .../browser_ext_tabs_captureVisibleTab.js     |  38 ++---
 .../test/browser/browser_ext_tabs_create.js   |  48 +++---
 .../browser_ext_tabs_executeScript_bad.js     |  10 +-
 .../browser_ext_tabs_executeScript_good.js    |  18 +-
 .../browser/browser_ext_tabs_getCurrent.js    |   8 +-
 .../browser/browser_ext_tabs_insertCSS.js     |   2 +-
 .../test/browser/browser_ext_tabs_move.js     |  14 +-
 .../browser/browser_ext_tabs_move_window.js   |  10 +-
 .../browser/browser_ext_tabs_onUpdated.js     |   8 +-
 .../browser/browser_ext_tabs_sendMessage.js   |   2 +-
 .../browser_ext_webNavigation_getFrames.js    |  14 +-
 toolkit/components/extensions/.eslintrc       |  15 +-
 toolkit/components/extensions/Extension.jsm   |  12 +-
 .../extensions/ExtensionContent.jsm           |  24 +--
 .../extensions/ExtensionManagement.jsm        |   2 +-
 .../components/extensions/MessageChannel.jsm  |  18 +-
 toolkit/components/extensions/ext-alarms.js   |   2 +-
 .../extensions/ext-backgroundPage.js          |   2 +-
 toolkit/components/extensions/ext-cookies.js  |   4 +-
 .../components/extensions/ext-downloads.js    |   2 +-
 .../extensions/ext-notifications.js           |   2 +-
 toolkit/components/extensions/ext-runtime.js  |   8 +-
 toolkit/components/extensions/ext-storage.js  |   2 +-
 .../extensions/ext-webNavigation.js           |  14 +-
 .../components/extensions/ext-webRequest.js   |   2 +-
 .../mochitest/file_ext_test_api_injection.js  |   4 +-
 ...ext_background_runtime_connect_params.html |   4 +-
 .../test_ext_contentscript_create_iframe.html |   8 +-
 .../test_ext_cookies_permissions.html         |  12 +-
 .../test/mochitest/test_ext_i18n.html         |   4 +-
 .../extensions/test/xpcshell/head.js          |   2 +-
 .../test/xpcshell/test_ext_schemas.js         |  20 +--
 .../test/xpcshell/test_locale_converter.js    |   2 +-
 toolkit/modules/addons/MatchPattern.jsm       |   2 +-
 toolkit/modules/addons/WebRequest.jsm         |   2 +-
 54 files changed, 423 insertions(+), 420 deletions(-)

diff --git a/browser/components/extensions/ext-bookmarks.js b/browser/components/extensions/ext-bookmarks.js
index 04f97d43528..26a6909ae31 100644
--- a/browser/components/extensions/ext-bookmarks.js
+++ b/browser/components/extensions/ext-bookmarks.js
@@ -2,7 +2,7 @@
 /* vim: set sts=2 sw=2 et tw=80: */
 "use strict";
 
-const { classes: Cc, interfaces: Ci, utils: Cu } = Components;
+const {classes: Cc, interfaces: Ci, utils: Cu} = Components;
 
 Cu.import("resource://gre/modules/PlacesUtils.jsm");
 var Bookmarks = PlacesUtils.bookmarks;
@@ -141,7 +141,7 @@ extensions.registerSchemaAPI("bookmarks", "bookmarks", (extension, context) => {
         try {
           return Bookmarks.insert(info).then(convert);
         } catch (e) {
-          return Promise.reject({ message: `Invalid bookmark: ${JSON.stringify(info)}` });
+          return Promise.reject({message: `Invalid bookmark: ${JSON.stringify(info)}`});
         }
       },
 
@@ -160,7 +160,7 @@ extensions.registerSchemaAPI("bookmarks", "bookmarks", (extension, context) => {
         try {
           return Bookmarks.update(info).then(convert);
         } catch (e) {
-          return Promise.reject({ message: `Invalid bookmark: ${JSON.stringify(info)}` });
+          return Promise.reject({message: `Invalid bookmark: ${JSON.stringify(info)}`});
         }
       },
 
@@ -179,7 +179,7 @@ extensions.registerSchemaAPI("bookmarks", "bookmarks", (extension, context) => {
         try {
           return Bookmarks.update(info).then(convert);
         } catch (e) {
-          return Promise.reject({ message: `Invalid bookmark: ${JSON.stringify(info)}` });
+          return Promise.reject({message: `Invalid bookmark: ${JSON.stringify(info)}`});
         }
       },
 
@@ -192,7 +192,7 @@ extensions.registerSchemaAPI("bookmarks", "bookmarks", (extension, context) => {
         try {
           return Bookmarks.remove(info).then(result => {});
         } catch (e) {
-          return Promise.reject({ message: `Invalid bookmark: ${JSON.stringify(info)}` });
+          return Promise.reject({message: `Invalid bookmark: ${JSON.stringify(info)}`});
         }
       },
     },
diff --git a/browser/components/extensions/ext-browserAction.js b/browser/components/extensions/ext-browserAction.js
index 0da06076b75..718eccd143f 100644
--- a/browser/components/extensions/ext-browserAction.js
+++ b/browser/components/extensions/ext-browserAction.js
@@ -44,7 +44,7 @@ function BrowserAction(options, extension) {
     title: title || extension.name,
     badgeText: "",
     badgeBackgroundColor: null,
-    icon: IconDetails.normalize({ path: options.default_icon }, extension,
+    icon: IconDetails.normalize({path: options.default_icon}, extension,
                                 null, true),
     popup: popup,
   };
diff --git a/browser/components/extensions/ext-contextMenus.js b/browser/components/extensions/ext-contextMenus.js
index d1c54398a4d..ae0cafa4174 100644
--- a/browser/components/extensions/ext-contextMenus.js
+++ b/browser/components/extensions/ext-contextMenus.js
@@ -310,7 +310,7 @@ MenuItem.prototype = {
     let extension = this.extension;
     if (!rootItems.has(extension)) {
       let root = new MenuItem(extension, this.context,
-                              { title: extension.name },
+                              {title: extension.name},
                               /* isRoot = */ true);
       rootItems.set(extension, root);
     }
diff --git a/browser/components/extensions/ext-desktop-runtime.js b/browser/components/extensions/ext-desktop-runtime.js
index ccfa3207ede..a7d9f176bd2 100644
--- a/browser/components/extensions/ext-desktop-runtime.js
+++ b/browser/components/extensions/ext-desktop-runtime.js
@@ -4,7 +4,7 @@
 extensions.on("uninstall", (msg, extension) => {
   if (extension.uninstallURL) {
     let browser = Services.wm.getMostRecentWindow("navigator:browser").gBrowser;
-    browser.addTab(extension.uninstallURL, { relatedToCurrent: true });
+    browser.addTab(extension.uninstallURL, {relatedToCurrent: true});
   }
 });
 
diff --git a/browser/components/extensions/ext-pageAction.js b/browser/components/extensions/ext-pageAction.js
index 3d89b170e5e..138069999ad 100644
--- a/browser/components/extensions/ext-pageAction.js
+++ b/browser/components/extensions/ext-pageAction.js
@@ -28,7 +28,7 @@ function PageAction(options, extension) {
   this.defaults = {
     show: false,
     title: title || extension.name,
-    icon: IconDetails.normalize({ path: options.default_icon }, extension,
+    icon: IconDetails.normalize({path: options.default_icon}, extension,
                                 null, true),
     popup: popup && extension.baseURI.resolve(popup),
   };
diff --git a/browser/components/extensions/ext-tabs.js b/browser/components/extensions/ext-tabs.js
index 72a43e787c2..c8d0fea1fe2 100644
--- a/browser/components/extensions/ext-tabs.js
+++ b/browser/components/extensions/ext-tabs.js
@@ -465,7 +465,7 @@ extensions.registerSchemaAPI("tabs", null, (extension, context) => {
 
       captureVisibleTab: function(windowId, options) {
         if (!extension.hasPermission("<all_urls>")) {
-          return Promise.reject({ message: "The <all_urls> permission is required to use the captureVisibleTab API" });
+          return Promise.reject({message: "The <all_urls> permission is required to use the captureVisibleTab API"});
         }
 
         let window = windowId == null ?
@@ -524,7 +524,7 @@ extensions.registerSchemaAPI("tabs", null, (extension, context) => {
         if (details.file !== null) {
           let url = context.uri.resolve(details.file);
           if (!extension.isExtensionURL(url)) {
-            return Promise.reject({ message: "Files to be injected must be within the extension" });
+            return Promise.reject({message: "Files to be injected must be within the extension"});
           }
           options[kind].push(url);
         }
@@ -538,7 +538,7 @@ extensions.registerSchemaAPI("tabs", null, (extension, context) => {
           options.run_at = details.runAt;
         }
 
-        return context.sendMessage(mm, "Extension:Execute", { options }, recipient);
+        return context.sendMessage(mm, "Extension:Execute", {options}, recipient);
       },
 
       executeScript: function(tabId, details) {
diff --git a/browser/components/extensions/ext-utils.js b/browser/components/extensions/ext-utils.js
index 8b2374e5c67..a05f5356684 100644
--- a/browser/components/extensions/ext-utils.js
+++ b/browser/components/extensions/ext-utils.js
@@ -235,7 +235,7 @@ class BasePopup {
       };
       this.browser.addEventListener("load", loadListener, true);
     }).then(() => {
-      let { contentWindow } = this.browser;
+      let {contentWindow} = this.browser;
 
       contentWindow.QueryInterface(Ci.nsIInterfaceRequestor)
                    .getInterface(Ci.nsIDOMWindowUtils)
@@ -423,7 +423,7 @@ ExtensionTabManager.prototype = {
   convert(tab) {
     let window = tab.ownerDocument.defaultView;
 
-    let mutedInfo = { muted: tab.muted };
+    let mutedInfo = {muted: tab.muted};
     if (tab.muteReason === null) {
       mutedInfo.reason = "user";
     } else if (tab.muteReason) {
diff --git a/browser/components/extensions/test/browser/browser_ext_browserAction_context.js b/browser/components/extensions/test/browser/browser_ext_browserAction_context.js
index a325d23a430..eee0d97a9bd 100644
--- a/browser/components/extensions/test/browser/browser_ext_browserAction_context.js
+++ b/browser/components/extensions/test/browser/browser_ext_browserAction_context.js
@@ -13,10 +13,10 @@ function* runTests(options) {
         browser.browserAction.getBadgeText({tabId}),
         browser.browserAction.getBadgeBackgroundColor({tabId})]
       ).then(details => {
-        return Promise.resolve({ title: details[0],
-                                 popup: details[1],
-                                 badge: details[2],
-                                 badgeBackgroundColor: details[3] });
+        return Promise.resolve({title: details[0],
+                                popup: details[1],
+                                badge: details[2],
+                                badgeBackgroundColor: details[3]});
       });
     }
 
@@ -53,7 +53,7 @@ function* runTests(options) {
         // Check that the API returns the expected values, and then
         // run the next test.
         new Promise(resolve => {
-          return browser.tabs.query({ active: true, currentWindow: true }, resolve);
+          return browser.tabs.query({active: true, currentWindow: true}, resolve);
         }).then(tabs => {
           return checkDetails(expecting, tabs[0].id);
         }).then(() => {
@@ -72,7 +72,7 @@ function* runTests(options) {
       nextTest();
     });
 
-    browser.tabs.query({ active: true, currentWindow: true }, resultTabs => {
+    browser.tabs.query({active: true, currentWindow: true}, resultTabs => {
       tabs[0] = resultTabs[0].id;
 
       nextTest();
@@ -148,39 +148,39 @@ add_task(function* testTabSwitchContext() {
 
     getTests(tabs, expectDefaults) {
       let details = [
-        { "icon": browser.runtime.getURL("default.png"),
-          "popup": browser.runtime.getURL("default.html"),
-          "title": "Default Title",
-          "badge": "",
-          "badgeBackgroundColor": null },
-        { "icon": browser.runtime.getURL("1.png"),
-          "popup": browser.runtime.getURL("default.html"),
-          "title": "Default Title",
-          "badge": "",
-          "badgeBackgroundColor": null },
-        { "icon": browser.runtime.getURL("2.png"),
-          "popup": browser.runtime.getURL("2.html"),
-          "title": "Title 2",
-          "badge": "2",
-          "badgeBackgroundColor": [0xff, 0, 0, 0xff],
-          "disabled": true },
-        { "icon": browser.runtime.getURL("1.png"),
-          "popup": browser.runtime.getURL("default-2.html"),
-          "title": "Default Title 2",
-          "badge": "d2",
-          "badgeBackgroundColor": [0, 0xff, 0, 0xff],
-          "disabled": true },
-        { "icon": browser.runtime.getURL("1.png"),
-          "popup": browser.runtime.getURL("default-2.html"),
-          "title": "Default Title 2",
-          "badge": "d2",
-          "badgeBackgroundColor": [0, 0xff, 0, 0xff],
-          "disabled": false },
-        { "icon": browser.runtime.getURL("default-2.png"),
-          "popup": browser.runtime.getURL("default-2.html"),
-          "title": "Default Title 2",
-          "badge": "d2",
-          "badgeBackgroundColor": [0, 0xff, 0, 0xff] },
+        {"icon": browser.runtime.getURL("default.png"),
+         "popup": browser.runtime.getURL("default.html"),
+         "title": "Default Title",
+         "badge": "",
+         "badgeBackgroundColor": null},
+        {"icon": browser.runtime.getURL("1.png"),
+         "popup": browser.runtime.getURL("default.html"),
+         "title": "Default Title",
+         "badge": "",
+         "badgeBackgroundColor": null},
+        {"icon": browser.runtime.getURL("2.png"),
+         "popup": browser.runtime.getURL("2.html"),
+         "title": "Title 2",
+         "badge": "2",
+         "badgeBackgroundColor": [0xff, 0, 0, 0xff],
+          "disabled": true},
+        {"icon": browser.runtime.getURL("1.png"),
+         "popup": browser.runtime.getURL("default-2.html"),
+         "title": "Default Title 2",
+         "badge": "d2",
+         "badgeBackgroundColor": [0, 0xff, 0, 0xff],
+          "disabled": true},
+        {"icon": browser.runtime.getURL("1.png"),
+         "popup": browser.runtime.getURL("default-2.html"),
+         "title": "Default Title 2",
+         "badge": "d2",
+         "badgeBackgroundColor": [0, 0xff, 0, 0xff],
+         "disabled": false},
+        {"icon": browser.runtime.getURL("default-2.png"),
+         "popup": browser.runtime.getURL("default-2.html"),
+         "title": "Default Title 2",
+         "badge": "d2",
+         "badgeBackgroundColor": [0, 0xff, 0, 0xff]},
       ];
 
       return [
@@ -192,14 +192,14 @@ add_task(function* testTabSwitchContext() {
         },
         expect => {
           browser.test.log("Change the icon in the current tab. Expect default properties excluding the icon.");
-          browser.browserAction.setIcon({ tabId: tabs[0], path: "1.png" });
+          browser.browserAction.setIcon({tabId: tabs[0], path: "1.png"});
           expectDefaults(details[0]).then(() => {
             expect(details[1]);
           });
         },
         expect => {
           browser.test.log("Create a new tab. Expect default properties.");
-          browser.tabs.create({ active: true, url: "about:blank?0" }, tab => {
+          browser.tabs.create({active: true, url: "about:blank?0"}, tab => {
             tabs.push(tab.id);
             expectDefaults(details[0]).then(() => {
               expect(details[0]);
@@ -209,11 +209,11 @@ add_task(function* testTabSwitchContext() {
         expect => {
           browser.test.log("Change properties. Expect new properties.");
           let tabId = tabs[1];
-          browser.browserAction.setIcon({ tabId, path: "2.png" });
-          browser.browserAction.setPopup({ tabId, popup: "2.html" });
-          browser.browserAction.setTitle({ tabId, title: "Title 2" });
-          browser.browserAction.setBadgeText({ tabId, text: "2" });
-          browser.browserAction.setBadgeBackgroundColor({ tabId, color: [0xff, 0, 0, 0xff] });
+          browser.browserAction.setIcon({tabId, path: "2.png"});
+          browser.browserAction.setPopup({tabId, popup: "2.html"});
+          browser.browserAction.setTitle({tabId, title: "Title 2"});
+          browser.browserAction.setBadgeText({tabId, text: "2"});
+          browser.browserAction.setBadgeBackgroundColor({tabId, color: [0xff, 0, 0, 0xff]});
           browser.browserAction.disable(tabId);
 
           expectDefaults(details[0]).then(() => {
@@ -232,21 +232,21 @@ add_task(function* testTabSwitchContext() {
             }
           });
 
-          browser.tabs.update(tabs[1], { url: "about:blank?1" });
+          browser.tabs.update(tabs[1], {url: "about:blank?1"});
         },
         expect => {
           browser.test.log("Switch back to the first tab. Expect previously set properties.");
-          browser.tabs.update(tabs[0], { active: true }, () => {
+          browser.tabs.update(tabs[0], {active: true}, () => {
             expect(details[1]);
           });
         },
         expect => {
           browser.test.log("Change default values, expect those changes reflected.");
-          browser.browserAction.setIcon({ path: "default-2.png" });
-          browser.browserAction.setPopup({ popup: "default-2.html" });
-          browser.browserAction.setTitle({ title: "Default Title 2" });
-          browser.browserAction.setBadgeText({ text: "d2" });
-          browser.browserAction.setBadgeBackgroundColor({ color: [0, 0xff, 0, 0xff] });
+          browser.browserAction.setIcon({path: "default-2.png"});
+          browser.browserAction.setPopup({popup: "default-2.html"});
+          browser.browserAction.setTitle({title: "Default Title 2"});
+          browser.browserAction.setBadgeText({text: "d2"});
+          browser.browserAction.setBadgeBackgroundColor({color: [0, 0xff, 0, 0xff]});
           browser.browserAction.disable();
           expectDefaults(details[3]).then(() => {
             expect(details[3]);
@@ -261,7 +261,7 @@ add_task(function* testTabSwitchContext() {
         },
         expect => {
           browser.test.log("Switch back to tab 2. Expect former value, unaffected by changes to defaults in previous step.");
-          browser.tabs.update(tabs[1], { active: true }, () => {
+          browser.tabs.update(tabs[1], {active: true}, () => {
             expectDefaults(details[3]).then(() => {
               expect(details[2]);
             });
@@ -275,7 +275,7 @@ add_task(function* testTabSwitchContext() {
         },
         expect => {
           browser.test.log("Create a new tab. Expect new default properties.");
-          browser.tabs.create({ active: true, url: "about:blank?2" }, tab => {
+          browser.tabs.create({active: true, url: "about:blank?2"}, tab => {
             tabs.push(tab.id);
             expect(details[5]);
           });
@@ -305,26 +305,26 @@ add_task(function* testDefaultTitle() {
 
     getTests(tabs, expectDefaults) {
       let details = [
-        { "title": "Foo Extension",
-          "popup": "",
-          "badge": "",
-          "badgeBackgroundColor": null,
-          "icon": browser.runtime.getURL("icon.png") },
-        { "title": "Foo Title",
-          "popup": "",
-          "badge": "",
-          "badgeBackgroundColor": null,
-          "icon": browser.runtime.getURL("icon.png") },
-        { "title": "Bar Title",
-          "popup": "",
-          "badge": "",
-          "badgeBackgroundColor": null,
-          "icon": browser.runtime.getURL("icon.png") },
-        { "title": "",
-          "popup": "",
-          "badge": "",
-          "badgeBackgroundColor": null,
-          "icon": browser.runtime.getURL("icon.png") },
+        {"title": "Foo Extension",
+         "popup": "",
+         "badge": "",
+         "badgeBackgroundColor": null,
+         "icon": browser.runtime.getURL("icon.png")},
+        {"title": "Foo Title",
+         "popup": "",
+         "badge": "",
+         "badgeBackgroundColor": null,
+         "icon": browser.runtime.getURL("icon.png")},
+        {"title": "Bar Title",
+         "popup": "",
+         "badge": "",
+         "badgeBackgroundColor": null,
+         "icon": browser.runtime.getURL("icon.png")},
+        {"title": "",
+         "popup": "",
+         "badge": "",
+         "badgeBackgroundColor": null,
+         "icon": browser.runtime.getURL("icon.png")},
       ];
 
       return [
@@ -336,28 +336,28 @@ add_task(function* testDefaultTitle() {
         },
         expect => {
           browser.test.log("Change the title. Expect new title.");
-          browser.browserAction.setTitle({ tabId: tabs[0], title: "Foo Title" });
+          browser.browserAction.setTitle({tabId: tabs[0], title: "Foo Title"});
           expectDefaults(details[0]).then(() => {
             expect(details[1]);
           });
         },
         expect => {
           browser.test.log("Change the default. Expect same properties.");
-          browser.browserAction.setTitle({ title: "Bar Title" });
+          browser.browserAction.setTitle({title: "Bar Title"});
           expectDefaults(details[2]).then(() => {
             expect(details[1]);
           });
         },
         expect => {
           browser.test.log("Clear the title. Expect new default title.");
-          browser.browserAction.setTitle({ tabId: tabs[0], title: "" });
+          browser.browserAction.setTitle({tabId: tabs[0], title: ""});
           expectDefaults(details[2]).then(() => {
             expect(details[2]);
           });
         },
         expect => {
           browser.test.log("Set default title to null string. Expect null string from API, extension title in UI.");
-          browser.browserAction.setTitle({ title: "" });
+          browser.browserAction.setTitle({title: ""});
           expectDefaults(details[3]).then(() => {
             expect(details[3]);
           });
diff --git a/browser/components/extensions/test/browser/browser_ext_browserAction_pageAction_icon.js b/browser/components/extensions/test/browser/browser_ext_browserAction_pageAction_icon.js
index 53fefefaa30..2e8ac03bf81 100644
--- a/browser/components/extensions/test/browser/browser_ext_browserAction_pageAction_icon.js
+++ b/browser/components/extensions/test/browser/browser_ext_browserAction_pageAction_icon.js
@@ -31,100 +31,100 @@ add_task(function* testDetailsObjects() {
     /* eslint-disable comma-dangle, indent */
     let iconDetails = [
       // Only paths.
-      { details: { "path": "a.png" },
+      {details: {"path": "a.png"},
         resolutions: {
           "1": browser.runtime.getURL("data/a.png"),
-          "2": browser.runtime.getURL("data/a.png"), } },
-      { details: { "path": "/a.png" },
+          "2": browser.runtime.getURL("data/a.png")}},
+      {details: {"path": "/a.png"},
         resolutions: {
           "1": browser.runtime.getURL("a.png"),
-          "2": browser.runtime.getURL("a.png"), } },
-      { details: { "path": { "19": "a.png" } },
+          "2": browser.runtime.getURL("a.png")}},
+      {details: {"path": {"19": "a.png"}},
         resolutions: {
           "1": browser.runtime.getURL("data/a.png"),
-          "2": browser.runtime.getURL("data/a.png"), } },
-      { details: { "path": { "38": "a.png" } },
+          "2": browser.runtime.getURL("data/a.png")}},
+      {details: {"path": {"38": "a.png"}},
         resolutions: {
           "1": browser.runtime.getURL("data/a.png"),
-          "2": browser.runtime.getURL("data/a.png"), } },
-      { details: { "path": { "19": "a.png", "38": "a-x2.png" } },
+          "2": browser.runtime.getURL("data/a.png")}},
+      {details: {"path": {"19": "a.png", "38": "a-x2.png"}},
         resolutions: {
           "1": browser.runtime.getURL("data/a.png"),
-          "2": browser.runtime.getURL("data/a-x2.png"), } },
+          "2": browser.runtime.getURL("data/a-x2.png")}},
 
       // Only ImageData objects.
-      { details: { "imageData": imageData.red.imageData },
+      {details: {"imageData": imageData.red.imageData},
         resolutions: {
           "1": imageData.red.url,
-          "2": imageData.red.url, } },
-      { details: { "imageData": { "19": imageData.red.imageData } },
+          "2": imageData.red.url}},
+      {details: {"imageData": {"19": imageData.red.imageData}},
         resolutions: {
           "1": imageData.red.url,
-          "2": imageData.red.url, } },
-      { details: { "imageData": { "38": imageData.red.imageData } },
+          "2": imageData.red.url}},
+      {details: {"imageData": {"38": imageData.red.imageData}},
         resolutions: {
           "1": imageData.red.url,
-          "2": imageData.red.url, } },
-      { details: { "imageData": {
+          "2": imageData.red.url}},
+      {details: {"imageData": {
           "19": imageData.red.imageData,
-          "38": imageData.green.imageData } },
+          "38": imageData.green.imageData}},
         resolutions: {
           "1": imageData.red.url,
-          "2": imageData.green.url, } },
+          "2": imageData.green.url}},
 
       // Mixed path and imageData objects.
       //
       // The behavior is currently undefined if both |path| and
       // |imageData| specify icons of the same size.
-      { details: {
-          "path": { "19": "a.png" },
-          "imageData": { "38": imageData.red.imageData } },
+      {details: {
+          "path": {"19": "a.png"},
+          "imageData": {"38": imageData.red.imageData}},
         resolutions: {
           "1": browser.runtime.getURL("data/a.png"),
-          "2": imageData.red.url, } },
-      { details: {
-          "path": { "38": "a.png" },
-          "imageData": { "19": imageData.red.imageData } },
+          "2": imageData.red.url}},
+      {details: {
+          "path": {"38": "a.png"},
+          "imageData": {"19": imageData.red.imageData}},
         resolutions: {
           "1": imageData.red.url,
-          "2": browser.runtime.getURL("data/a.png"), } },
+          "2": browser.runtime.getURL("data/a.png")}},
 
       // A path or ImageData object by itself is treated as a 19px icon.
-      { details: {
+      {details: {
           "path": "a.png",
-          "imageData": { "38": imageData.red.imageData } },
+          "imageData": {"38": imageData.red.imageData}},
         resolutions: {
           "1": browser.runtime.getURL("data/a.png"),
-          "2": imageData.red.url, } },
-      { details: {
-          "path": { "38": "a.png" },
-          "imageData": imageData.red.imageData, },
+          "2": imageData.red.url}},
+      {details: {
+          "path": {"38": "a.png"},
+          "imageData": imageData.red.imageData},
         resolutions: {
           "1": imageData.red.url,
-          "2": browser.runtime.getURL("data/a.png"), } },
+          "2": browser.runtime.getURL("data/a.png")}},
 
       // Various resolutions
-      { details: { "path": { "18": "a.png", "32": "a-x2.png" } },
+      {details: {"path": {"18": "a.png", "32": "a-x2.png"}},
         resolutions: {
           "1": browser.runtime.getURL("data/a.png"),
-          "2": browser.runtime.getURL("data/a-x2.png"), } },
-      { details: { "path": { "16": "16.png", "100": "100.png" } },
+          "2": browser.runtime.getURL("data/a-x2.png")}},
+      {details: {"path": {"16": "16.png", "100": "100.png"}},
         resolutions: {
           "1": browser.runtime.getURL("data/100.png"),
-          "2": browser.runtime.getURL("data/100.png"), } },
-      { details: { "path": { "2": "2.png"} },
+          "2": browser.runtime.getURL("data/100.png")}},
+      {details: {"path": {"2": "2.png"}},
         resolutions: {
           "1": browser.runtime.getURL("data/2.png"),
-          "2": browser.runtime.getURL("data/2.png"), } },
-      { details: { "path": {
+          "2": browser.runtime.getURL("data/2.png")}},
+      {details: {"path": {
         "6": "6.png",
         "18": "18.png",
         "32": "32.png",
         "48": "48.png",
-        "128": "128.png" } },
+        "128": "128.png"}},
         resolutions: {
           "1": browser.runtime.getURL("data/18.png"),
-          "2": browser.runtime.getURL("data/48.png"), } },
+          "2": browser.runtime.getURL("data/48.png")}},
     ];
 
     // Allow serializing ImageData objects for logging.
@@ -162,7 +162,7 @@ add_task(function* testDetailsObjects() {
     let tests = [];
     for (let [idx, icon] of iconDetails.entries()) {
       for (let res of Object.keys(icon.resolutions)) {
-        tests.push({ index: idx, resolution: Number(res) });
+        tests.push({index: idx, resolution: Number(res)});
       }
     }
 
@@ -170,7 +170,7 @@ add_task(function* testDetailsObjects() {
     // between each test.
     tests.sort(test => test.resolution);
 
-    browser.tabs.query({ active: true, currentWindow: true }, tabs => {
+    browser.tabs.query({active: true, currentWindow: true}, tabs => {
       tabId = tabs[0].id;
       browser.pageAction.show(tabId);
 
@@ -230,7 +230,7 @@ add_task(function* testInvalidIconSizes() {
     },
 
     background: function() {
-      browser.tabs.query({ active: true, currentWindow: true }, tabs => {
+      browser.tabs.query({active: true, currentWindow: true}, tabs => {
         let tabId = tabs[0].id;
 
         let promises = [];
@@ -255,16 +255,16 @@ add_task(function* testInvalidIconSizes() {
           for (let type of ["path", "imageData"]) {
             let img = type == "imageData" ? imageData : "test.png";
 
-            assertSetIconThrows({ [type]: { "abcdef": img } });
-            assertSetIconThrows({ [type]: { "48px": img } });
-            assertSetIconThrows({ [type]: { "20.5": img } });
-            assertSetIconThrows({ [type]: { "5.0": img } });
-            assertSetIconThrows({ [type]: { "-300": img } });
-            assertSetIconThrows({ [type]: { "abc": img, "5": img }});
+            assertSetIconThrows({[type]: {"abcdef": img}});
+            assertSetIconThrows({[type]: {"48px": img}});
+            assertSetIconThrows({[type]: {"20.5": img}});
+            assertSetIconThrows({[type]: {"5.0": img}});
+            assertSetIconThrows({[type]: {"-300": img}});
+            assertSetIconThrows({[type]: {"abc": img, "5": img}});
           }
 
-          assertSetIconThrows({ imageData: { "abcdef": imageData }, path: {"5": "test.png"} });
-          assertSetIconThrows({ path: { "abcdef": "test.png" }, imageData: {"5": imageData} });
+          assertSetIconThrows({imageData: {"abcdef": imageData}, path: {"5": "test.png"}});
+          assertSetIconThrows({path: {"abcdef": "test.png"}, imageData: {"5": imageData}});
         }
 
         Promise.all(promises).then(() => {
@@ -287,9 +287,9 @@ add_task(function* testDefaultDetails() {
   let icons = [
     "foo/bar.png",
     "/foo/bar.png",
-    { "19": "foo/bar.png" },
-    { "38": "foo/bar.png" },
-    { "19": "foo/bar.png", "38": "baz/quux.png" },
+    {"19": "foo/bar.png"},
+    {"38": "foo/bar.png"},
+    {"19": "foo/bar.png", "38": "baz/quux.png"},
   ];
 
   let expectedURL = new RegExp(String.raw`^moz-extension://[^/]+/foo/bar\.png$`);
@@ -297,12 +297,12 @@ add_task(function* testDefaultDetails() {
   for (let icon of icons) {
     let extension = ExtensionTestUtils.loadExtension({
       manifest: {
-        "browser_action": { "default_icon": icon },
-        "page_action": { "default_icon": icon },
+        "browser_action": {"default_icon": icon},
+        "page_action": {"default_icon": icon},
       },
 
       background: function() {
-        browser.tabs.query({ active: true, currentWindow: true }, tabs => {
+        browser.tabs.query({active: true, currentWindow: true}, tabs => {
           let tabId = tabs[0].id;
 
           browser.pageAction.show(tabId);
@@ -345,7 +345,7 @@ add_task(function* testSecureURLsDenied() {
     },
 
     background: function() {
-      browser.tabs.query({ active: true, currentWindow: true }, tabs => {
+      browser.tabs.query({active: true, currentWindow: true}, tabs => {
         let tabId = tabs[0].id;
 
         let urls = ["chrome://browser/content/browser.xul",
diff --git a/browser/components/extensions/test/browser/browser_ext_browserAction_popup.js b/browser/components/extensions/test/browser/browser_ext_browserAction_popup.js
index ee94ad73537..a4f5fb8afb5 100644
--- a/browser/components/extensions/test/browser/browser_ext_browserAction_popup.js
+++ b/browser/components/extensions/test/browser/browser_ext_browserAction_popup.js
@@ -30,34 +30,34 @@ function* testInArea(area) {
         let sendClick;
         let tests = [
           () => {
-            sendClick({ expectEvent: false, expectPopup: "a" });
+            sendClick({expectEvent: false, expectPopup: "a"});
           },
           () => {
-            sendClick({ expectEvent: false, expectPopup: "a" });
+            sendClick({expectEvent: false, expectPopup: "a"});
           },
           () => {
-            browser.browserAction.setPopup({ popup: "popup-b.html" });
-            sendClick({ expectEvent: false, expectPopup: "b" });
+            browser.browserAction.setPopup({popup: "popup-b.html"});
+            sendClick({expectEvent: false, expectPopup: "b"});
           },
           () => {
-            sendClick({ expectEvent: false, expectPopup: "b" });
+            sendClick({expectEvent: false, expectPopup: "b"});
           },
           () => {
-            browser.browserAction.setPopup({ popup: "" });
-            sendClick({ expectEvent: true, expectPopup: null });
+            browser.browserAction.setPopup({popup: ""});
+            sendClick({expectEvent: true, expectPopup: null});
           },
           () => {
-            sendClick({ expectEvent: true, expectPopup: null });
+            sendClick({expectEvent: true, expectPopup: null});
           },
           () => {
-            browser.browserAction.setPopup({ popup: "/popup-a.html" });
-            sendClick({ expectEvent: false, expectPopup: "a" });
+            browser.browserAction.setPopup({popup: "/popup-a.html"});
+            sendClick({expectEvent: false, expectPopup: "a"});
           },
         ];
 
         let expect = {};
-        sendClick = ({ expectEvent, expectPopup }) => {
-          expect = { event: expectEvent, popup: expectPopup };
+        sendClick = ({expectEvent, expectPopup}) => {
+          expect = {event: expectEvent, popup: expectPopup};
           browser.test.sendMessage("send-click");
         };
 
diff --git a/browser/components/extensions/test/browser/browser_ext_contentscript_connect.js b/browser/components/extensions/test/browser/browser_ext_contentscript_connect.js
index 41b0cf86e46..c2ae72c7925 100644
--- a/browser/components/extensions/test/browser/browser_ext_contentscript_connect.js
+++ b/browser/components/extensions/test/browser/browser_ext_contentscript_connect.js
@@ -43,7 +43,7 @@ add_task(function* () {
         });
       });
 
-      browser.tabs.executeScript({ file: "script.js" });
+      browser.tabs.executeScript({file: "script.js"});
     },
 
     files: {
diff --git a/browser/components/extensions/test/browser/browser_ext_contextMenus.js b/browser/components/extensions/test/browser/browser_ext_contextMenus.js
index bbaf38045dc..8daca183948 100644
--- a/browser/components/extensions/test/browser/browser_ext_contextMenus.js
+++ b/browser/components/extensions/test/browser/browser_ext_contextMenus.js
@@ -22,14 +22,14 @@ add_task(function* () {
         browser.test.sendMessage("menuItemClick", JSON.stringify(info));
       }
 
-      browser.contextMenus.create({ contexts: ["all"], type: "separator" });
+      browser.contextMenus.create({contexts: ["all"], type: "separator"});
 
       let contexts = ["page", "selection", "image"];
       for (let i = 0; i < contexts.length; i++) {
         let context = contexts[i];
         let title = context;
-        browser.contextMenus.create({ title: title, contexts: [context], id: "ext-" + context,
-                                      onclick: genericOnClick });
+        browser.contextMenus.create({title: title, contexts: [context], id: "ext-" + context,
+                                     onclick: genericOnClick});
         if (context == "selection") {
           browser.contextMenus.update("ext-selection", {
             title: "selection is: '%s'",
@@ -41,20 +41,20 @@ add_task(function* () {
         }
       }
 
-      let parent = browser.contextMenus.create({ title: "parent" });
+      let parent = browser.contextMenus.create({title: "parent"});
       browser.contextMenus.create(
-        { title: "child1", parentId: parent, onclick: genericOnClick });
+        {title: "child1", parentId: parent, onclick: genericOnClick});
       let child2 = browser.contextMenus.create(
-        { title: "child2", parentId: parent, onclick: genericOnClick });
+        {title: "child2", parentId: parent, onclick: genericOnClick});
 
-      let parentToDel = browser.contextMenus.create({ title: "parentToDel" });
+      let parentToDel = browser.contextMenus.create({title: "parentToDel"});
       browser.contextMenus.create(
-        { title: "child1", parentId: parentToDel, onclick: genericOnClick });
+        {title: "child1", parentId: parentToDel, onclick: genericOnClick});
       browser.contextMenus.create(
-        { title: "child2", parentId: parentToDel, onclick: genericOnClick });
+        {title: "child2", parentId: parentToDel, onclick: genericOnClick});
       browser.contextMenus.remove(parentToDel);
 
-      browser.contextMenus.update(parent, { parentId: child2 }).then(
+      browser.contextMenus.update(parent, {parentId: child2}).then(
         () => {
           browser.test.notifyFail();
         },
@@ -81,7 +81,7 @@ add_task(function* () {
   let contentAreaContextMenu = document.getElementById("contentAreaContextMenu");
   let popupShownPromise = BrowserTestUtils.waitForEvent(contentAreaContextMenu, "popupshown");
   yield BrowserTestUtils.synthesizeMouseAtCenter("#img1",
-    { type: "contextmenu", button: 2 }, gBrowser.selectedBrowser);
+    {type: "contextmenu", button: 2}, gBrowser.selectedBrowser);
   yield popupShownPromise;
 
   // Check some menu items
@@ -134,7 +134,7 @@ add_task(function* () {
   // Bring up context menu again
   popupShownPromise = BrowserTestUtils.waitForEvent(contentAreaContextMenu, "popupshown");
   yield BrowserTestUtils.synthesizeMouse(null, 1, 1,
-    { type: "contextmenu", button: 2 }, gBrowser.selectedBrowser);
+    {type: "contextmenu", button: 2}, gBrowser.selectedBrowser);
   yield popupShownPromise;
 
   items = contentAreaContextMenu.getElementsByAttribute("ext-type", "top-level-menu");
@@ -163,7 +163,7 @@ add_task(function* () {
 
   popupShownPromise = BrowserTestUtils.waitForEvent(contentAreaContextMenu, "popupshown");
   yield BrowserTestUtils.synthesizeMouseAtCenter("#img1",
-    { type: "contextmenu", button: 2 }, gBrowser.selectedBrowser);
+    {type: "contextmenu", button: 2}, gBrowser.selectedBrowser);
   yield popupShownPromise;
 
   items = contentAreaContextMenu.getElementsByAttribute("ext-type", "top-level-menu");
diff --git a/browser/components/extensions/test/browser/browser_ext_lastError.js b/browser/components/extensions/test/browser/browser_ext_lastError.js
index 8df84833397..21e5525af3f 100644
--- a/browser/components/extensions/test/browser/browser_ext_lastError.js
+++ b/browser/components/extensions/test/browser/browser_ext_lastError.js
@@ -37,7 +37,7 @@ add_task(function* testLastError() {
       SimpleTest.monitorConsole(resolve, [{message: /Invalid extension ID/, forbid: true}]);
     });
 
-    yield sendMessage({ checkLastError: api });
+    yield sendMessage({checkLastError: api});
 
     SimpleTest.endMonitorConsole();
     yield waitForConsole;
diff --git a/browser/components/extensions/test/browser/browser_ext_pageAction_context.js b/browser/components/extensions/test/browser/browser_ext_pageAction_context.js
index a91186f68f2..6b9b17a9a27 100644
--- a/browser/components/extensions/test/browser/browser_ext_pageAction_context.js
+++ b/browser/components/extensions/test/browser/browser_ext_pageAction_context.js
@@ -11,7 +11,7 @@ function* runTests(options) {
     // promise that resolves to an object containing them.
     function getDetails() {
       return new Promise(resolve => {
-        return browser.tabs.query({ active: true, currentWindow: true }, resolve);
+        return browser.tabs.query({active: true, currentWindow: true}, resolve);
       }).then(([tab]) => {
         let tabId = tab.id;
         browser.test.log(`Get details: tab={id: ${tabId}, url: ${JSON.stringify(tab.url)}}`);
@@ -19,8 +19,8 @@ function* runTests(options) {
           browser.pageAction.getTitle({tabId}),
           browser.pageAction.getPopup({tabId})]);
       }).then(details => {
-        return Promise.resolve({ title: details[0],
-                                 popup: details[1] });
+        return Promise.resolve({title: details[0],
+                                popup: details[1]});
       });
     }
 
@@ -59,7 +59,7 @@ function* runTests(options) {
       tabs = [];
       tests = getTests(tabs);
 
-      browser.tabs.query({ active: true, currentWindow: true }, resultTabs => {
+      browser.tabs.query({active: true, currentWindow: true}, resultTabs => {
         tabs[0] = resultTabs[0].id;
 
         nextTest();
@@ -163,18 +163,18 @@ add_task(function* testTabSwitchContext() {
 
     getTests(tabs) {
       let details = [
-        { "icon": browser.runtime.getURL("default.png"),
-          "popup": browser.runtime.getURL("default.html"),
-          "title": "Default Title \u263a" },
-        { "icon": browser.runtime.getURL("1.png"),
-          "popup": browser.runtime.getURL("default.html"),
-          "title": "Default Title \u263a" },
-        { "icon": browser.runtime.getURL("2.png"),
-          "popup": browser.runtime.getURL("2.html"),
-          "title": "Title 2" },
-        { "icon": browser.runtime.getURL("2.png"),
-          "popup": browser.runtime.getURL("2.html"),
-          "title": "Default Title \u263a" },
+        {"icon": browser.runtime.getURL("default.png"),
+         "popup": browser.runtime.getURL("default.html"),
+         "title": "Default Title \u263a"},
+        {"icon": browser.runtime.getURL("1.png"),
+         "popup": browser.runtime.getURL("default.html"),
+         "title": "Default Title \u263a"},
+        {"icon": browser.runtime.getURL("2.png"),
+         "popup": browser.runtime.getURL("2.html"),
+         "title": "Title 2"},
+        {"icon": browser.runtime.getURL("2.png"),
+         "popup": browser.runtime.getURL("2.html"),
+         "title": "Default Title \u263a"},
       ];
 
       let promiseTabLoad = details => {
@@ -201,13 +201,13 @@ add_task(function* testTabSwitchContext() {
         },
         expect => {
           browser.test.log("Change the icon. Expect default properties excluding the icon.");
-          browser.pageAction.setIcon({ tabId: tabs[0], path: "1.png" });
+          browser.pageAction.setIcon({tabId: tabs[0], path: "1.png"});
           expect(details[1]);
         },
         expect => {
           browser.test.log("Create a new tab. No icon visible.");
-          browser.tabs.create({ active: true, url: "about:blank?0" }, tab => {
-            tabLoadPromise = promiseTabLoad({ url: "about:blank?0", id: tab.id });
+          browser.tabs.create({active: true, url: "about:blank?0"}, tab => {
+            tabLoadPromise = promiseTabLoad({url: "about:blank?0", id: tab.id});
             tabs.push(tab.id);
             expect(null);
           });
@@ -222,15 +222,15 @@ add_task(function* testTabSwitchContext() {
           browser.test.log("Change properties. Expect new properties.");
           let tabId = tabs[1];
           browser.pageAction.show(tabId);
-          browser.pageAction.setIcon({ tabId, path: "2.png" });
-          browser.pageAction.setPopup({ tabId, popup: "2.html" });
-          browser.pageAction.setTitle({ tabId, title: "Title 2" });
+          browser.pageAction.setIcon({tabId, path: "2.png"});
+          browser.pageAction.setPopup({tabId, popup: "2.html"});
+          browser.pageAction.setTitle({tabId, title: "Title 2"});
 
           expect(details[2]);
         },
         expect => {
           browser.test.log("Clear the title. Expect default title.");
-          browser.pageAction.setTitle({ tabId: tabs[1], title: "" });
+          browser.pageAction.setTitle({tabId: tabs[1], title: ""});
 
           expect(details[3]);
         },
@@ -239,11 +239,11 @@ add_task(function* testTabSwitchContext() {
 
           // TODO: This listener should not be necessary, but the |tabs.update|
           // callback currently fires too early in e10s windows.
-          promiseTabLoad({ id: tabs[1], url: "about:blank?1" }).then(() => {
+          promiseTabLoad({id: tabs[1], url: "about:blank?1"}).then(() => {
             expect(null);
           });
 
-          browser.tabs.update(tabs[1], { url: "about:blank?1" });
+          browser.tabs.update(tabs[1], {url: "about:blank?1"});
         },
         expect => {
           browser.test.log("Show the icon. Expect default properties again.");
@@ -252,14 +252,14 @@ add_task(function* testTabSwitchContext() {
         },
         expect => {
           browser.test.log("Switch back to the first tab. Expect previously set properties.");
-          browser.tabs.update(tabs[0], { active: true }, () => {
+          browser.tabs.update(tabs[0], {active: true}, () => {
             expect(details[1]);
           });
         },
         expect => {
           browser.test.log("Hide the icon on tab 2. Switch back, expect hidden.");
           browser.pageAction.hide(tabs[1]);
-          browser.tabs.update(tabs[1], { active: true }, () => {
+          browser.tabs.update(tabs[1], {active: true}, () => {
             expect(null);
           });
         },
@@ -293,12 +293,12 @@ add_task(function* testDefaultTitle() {
 
     getTests(tabs) {
       let details = [
-        { "title": "Foo Extension",
-          "popup": "",
-          "icon": browser.runtime.getURL("icon.png") },
-        { "title": "Foo Title",
-          "popup": "",
-          "icon": browser.runtime.getURL("icon.png") },
+        {"title": "Foo Extension",
+         "popup": "",
+         "icon": browser.runtime.getURL("icon.png")},
+        {"title": "Foo Title",
+         "popup": "",
+         "icon": browser.runtime.getURL("icon.png")},
       ];
 
       return [
@@ -313,12 +313,12 @@ add_task(function* testDefaultTitle() {
         },
         expect => {
           browser.test.log("Change the title. Expect new title.");
-          browser.pageAction.setTitle({ tabId: tabs[0], title: "Foo Title" });
+          browser.pageAction.setTitle({tabId: tabs[0], title: "Foo Title"});
           expect(details[1]);
         },
         expect => {
           browser.test.log("Clear the title. Expect extension title.");
-          browser.pageAction.setTitle({ tabId: tabs[0], title: "" });
+          browser.pageAction.setTitle({tabId: tabs[0], title: ""});
           expect(details[0]);
         },
       ];
diff --git a/browser/components/extensions/test/browser/browser_ext_pageAction_popup.js b/browser/components/extensions/test/browser/browser_ext_pageAction_popup.js
index 463e3057697..488c96d1dc7 100644
--- a/browser/components/extensions/test/browser/browser_ext_pageAction_popup.js
+++ b/browser/components/extensions/test/browser/browser_ext_pageAction_popup.js
@@ -34,34 +34,34 @@ add_task(function* testPageActionPopup() {
         let sendClick;
         let tests = [
           () => {
-            sendClick({ expectEvent: false, expectPopup: "a" });
+            sendClick({expectEvent: false, expectPopup: "a"});
           },
           () => {
-            sendClick({ expectEvent: false, expectPopup: "a" });
+            sendClick({expectEvent: false, expectPopup: "a"});
           },
           () => {
-            browser.pageAction.setPopup({ tabId, popup: "popup-b.html" });
-            sendClick({ expectEvent: false, expectPopup: "b" });
+            browser.pageAction.setPopup({tabId, popup: "popup-b.html"});
+            sendClick({expectEvent: false, expectPopup: "b"});
           },
           () => {
-            sendClick({ expectEvent: false, expectPopup: "b" });
+            sendClick({expectEvent: false, expectPopup: "b"});
           },
           () => {
-            browser.pageAction.setPopup({ tabId, popup: "" });
-            sendClick({ expectEvent: true, expectPopup: null });
+            browser.pageAction.setPopup({tabId, popup: ""});
+            sendClick({expectEvent: true, expectPopup: null});
           },
           () => {
-            sendClick({ expectEvent: true, expectPopup: null });
+            sendClick({expectEvent: true, expectPopup: null});
           },
           () => {
-            browser.pageAction.setPopup({ tabId, popup: "/popup-a.html" });
-            sendClick({ expectEvent: false, expectPopup: "a" });
+            browser.pageAction.setPopup({tabId, popup: "/popup-a.html"});
+            sendClick({expectEvent: false, expectPopup: "a"});
           },
         ];
 
         let expect = {};
-        sendClick = ({ expectEvent, expectPopup }) => {
-          expect = { event: expectEvent, popup: expectPopup };
+        sendClick = ({expectEvent, expectPopup}) => {
+          expect = {event: expectEvent, popup: expectPopup};
           browser.test.sendMessage("send-click");
         };
 
@@ -101,7 +101,7 @@ add_task(function* testPageActionPopup() {
           }
         });
 
-        browser.tabs.query({ active: true, currentWindow: true }, tabs => {
+        browser.tabs.query({active: true, currentWindow: true}, tabs => {
           tabId = tabs[0].id;
 
           browser.pageAction.show(tabId);
@@ -165,7 +165,7 @@ add_task(function* testPageActionSecurity() {
 
     let extension = ExtensionTestUtils.loadExtension({
       manifest: {
-        [api]: { "default_popup": URL },
+        [api]: {"default_popup": URL},
       },
     });
 
diff --git a/browser/components/extensions/test/browser/browser_ext_popup_api_injection.js b/browser/components/extensions/test/browser/browser_ext_popup_api_injection.js
index e28c1ccb670..6684cb3213e 100644
--- a/browser/components/extensions/test/browser/browser_ext_popup_api_injection.js
+++ b/browser/components/extensions/test/browser/browser_ext_popup_api_injection.js
@@ -27,15 +27,15 @@ add_task(function* testPageActionPopup() {
 
     background: function() {
       let tabId;
-      browser.tabs.query({ active: true, currentWindow: true }, tabs => {
+      browser.tabs.query({active: true, currentWindow: true}, tabs => {
         tabId = tabs[0].id;
         browser.pageAction.show(tabId);
         browser.test.sendMessage("ready");
       });
 
       browser.test.onMessage.addListener(() => {
-        browser.browserAction.setPopup({ popup: "/popup-a.html" });
-        browser.pageAction.setPopup({ tabId, popup: "popup-b.html" });
+        browser.browserAction.setPopup({popup: "/popup-a.html"});
+        browser.pageAction.setPopup({tabId, popup: "popup-b.html"});
 
         browser.test.sendMessage("ok");
       });
diff --git a/browser/components/extensions/test/browser/browser_ext_runtime_setUninstallURL.js b/browser/components/extensions/test/browser/browser_ext_runtime_setUninstallURL.js
index e13a8d06d3c..e723b0de478 100644
--- a/browser/components/extensions/test/browser/browser_ext_runtime_setUninstallURL.js
+++ b/browser/components/extensions/test/browser/browser_ext_runtime_setUninstallURL.js
@@ -1,7 +1,7 @@
 "use strict";
 
-let { AddonManager } = Components.utils.import("resource://gre/modules/AddonManager.jsm", {});
-let { Extension } = Components.utils.import("resource://gre/modules/Extension.jsm", {});
+let {AddonManager} = Components.utils.import("resource://gre/modules/AddonManager.jsm", {});
+let {Extension} = Components.utils.import("resource://gre/modules/Extension.jsm", {});
 
 function install(url) {
   return new Promise((resolve, reject) => {
@@ -78,7 +78,7 @@ add_task(function* test_setuninstallurl_badargs() {
 add_task(function* test_setuninstall_empty_url() {
   function backgroundScript() {
     browser.runtime.setUninstallURL("")
-      .then(() => browser.tabs.create({ url: "http://example.com/addon_loaded" }));
+      .then(() => browser.tabs.create({url: "http://example.com/addon_loaded"}));
   }
 
   let addon = yield makeAndInstallXPI("test_uinstallurl2@tests.mozilla.org",
@@ -95,7 +95,7 @@ add_task(function* test_setuninstall_empty_url() {
 add_task(function* test_setuninstallurl() {
   function backgroundScript() {
     browser.runtime.setUninstallURL("http://example.com/addon_uninstalled")
-      .then(() => browser.tabs.create({ url: "http://example.com/addon_loaded" }));
+      .then(() => browser.tabs.create({url: "http://example.com/addon_loaded"}));
   }
 
   let addon = yield makeAndInstallXPI("test_uinstallurl@tests.mozilla.org",
diff --git a/browser/components/extensions/test/browser/browser_ext_tab_runtimeConnect.js b/browser/components/extensions/test/browser/browser_ext_tab_runtimeConnect.js
index d145388cb88..a5541a00234 100644
--- a/browser/components/extensions/test/browser/browser_ext_tab_runtimeConnect.js
+++ b/browser/components/extensions/test/browser/browser_ext_tab_runtimeConnect.js
@@ -38,16 +38,16 @@ add_task(function* () {
         });
       });
 
-      browser.tabs.create({ url: "tab.html" },
+      browser.tabs.create({url: "tab.html"},
                           (tab) => { tabId = tab.id; });
     },
 
     files: {
       "tab.js": function() {
-        let port = browser.runtime.connect({ name: "tab-connection-name"});
+        let port = browser.runtime.connect({name: "tab-connection-name"});
         port.postMessage("tab to background port message");
         port.onMessage.addListener((msg) => {
-          port.postMessage({ tabReceived: msg });
+          port.postMessage({tabReceived: msg});
         });
       },
       "tab.html": `
diff --git a/browser/components/extensions/test/browser/browser_ext_tabs_audio.js b/browser/components/extensions/test/browser/browser_ext_tabs_audio.js
index 664e88d74cf..8b4440f54b4 100644
--- a/browser/components/extensions/test/browser/browser_ext_tabs_audio.js
+++ b/browser/components/extensions/test/browser/browser_ext_tabs_audio.js
@@ -49,7 +49,7 @@ add_task(function* () {
 
     let windowId;
     let tabIds;
-    promiseTabs.query({ lastFocusedWindow: true }).then(tabs => {
+    promiseTabs.query({lastFocusedWindow: true}).then(tabs => {
       browser.test.assertEq(tabs.length, 3, "We have three tabs");
 
       for (let tab of tabs) {
@@ -65,10 +65,10 @@ add_task(function* () {
 
       browser.test.log("Test initial queries for muted and audible return no tabs");
       return Promise.all([
-        promiseTabs.query({ windowId, audible: false }),
-        promiseTabs.query({ windowId, audible: true }),
-        promiseTabs.query({ windowId, muted: true }),
-        promiseTabs.query({ windowId, muted: false }),
+        promiseTabs.query({windowId, audible: false}),
+        promiseTabs.query({windowId, audible: true}),
+        promiseTabs.query({windowId, muted: true}),
+        promiseTabs.query({windowId, muted: false}),
       ]);
     }).then(([silent, audible, muted, nonMuted]) => {
       browser.test.assertEq(3, silent.length, "Three silent tabs");
@@ -95,10 +95,10 @@ add_task(function* () {
 
       browser.test.log("Re-check queries. Expect one audible and one muted tab");
       return Promise.all([
-        promiseTabs.query({ windowId, audible: false }),
-        promiseTabs.query({ windowId, audible: true }),
-        promiseTabs.query({ windowId, muted: true }),
-        promiseTabs.query({ windowId, muted: false }),
+        promiseTabs.query({windowId, audible: false}),
+        promiseTabs.query({windowId, audible: true}),
+        promiseTabs.query({windowId, muted: true}),
+        promiseTabs.query({windowId, muted: false}),
       ]);
     }).then(([silent, audible, muted, nonMuted]) => {
       browser.test.assertEq(2, silent.length, "Two silent tabs");
@@ -116,8 +116,8 @@ add_task(function* () {
       return Promise.all([
         promiseUpdated(tabIds[0], "mutedInfo"),
         promiseUpdated(tabIds[1], "mutedInfo"),
-        promiseTabs.update(tabIds[0], { muted: false }),
-        promiseTabs.update(tabIds[1], { muted: true }),
+        promiseTabs.update(tabIds[0], {muted: false}),
+        promiseTabs.update(tabIds[1], {muted: true}),
       ]);
     }).then(([unmuted, muted]) => {
       for (let obj of [unmuted.changeInfo, unmuted.tab]) {
diff --git a/browser/components/extensions/test/browser/browser_ext_tabs_captureVisibleTab.js b/browser/components/extensions/test/browser/browser_ext_tabs_captureVisibleTab.js
index 4f62b77a8c0..91bd733e17c 100644
--- a/browser/components/extensions/test/browser/browser_ext_tabs_captureVisibleTab.js
+++ b/browser/components/extensions/test/browser/browser_ext_tabs_captureVisibleTab.js
@@ -39,11 +39,11 @@ function* runTest(options) {
 
     browser.test.log(`Test color ${options.color} at fullZoom=${options.fullZoom}`);
 
-    promiseTabs.query({ currentWindow: true, active: true }).then(([tab]) => {
+    promiseTabs.query({currentWindow: true, active: true}).then(([tab]) => {
       return Promise.all([
-        promiseTabs.captureVisibleTab(tab.windowId, { format: "jpeg", quality: 95 }),
-        promiseTabs.captureVisibleTab(tab.windowId, { format: "png", quality: 95 }),
-        promiseTabs.captureVisibleTab(tab.windowId, { quality: 95 }),
+        promiseTabs.captureVisibleTab(tab.windowId, {format: "jpeg", quality: 95}),
+        promiseTabs.captureVisibleTab(tab.windowId, {format: "png", quality: 95}),
+        promiseTabs.captureVisibleTab(tab.windowId, {quality: 95}),
         promiseTabs.captureVisibleTab(tab.windowId),
       ]).then(([jpeg, png, ...pngs]) => {
         browser.test.assertTrue(pngs.every(url => url == png), "All PNGs are identical");
@@ -60,7 +60,7 @@ function* runTest(options) {
       }).then(([jpeg, png]) => {
         let tabDims = `${tab.width}\u00d7${tab.height}`;
 
-        let images = { jpeg, png };
+        let images = {jpeg, png};
         for (let format of Object.keys(images)) {
           let img = images[format];
 
@@ -78,17 +78,17 @@ function* runTest(options) {
           // Check the colors of the first and last pixels of the image, to make
           // sure we capture the entire frame, and scale it correctly.
           let coords = [
-            { x: 0, y: 0,
-              color: options.color },
-            { x: img.width - 1,
-              y: img.height - 1,
-              color: options.color },
-            { x: img.width / 2 | 0,
-              y: img.height / 2 | 0,
-              color: options.neutral },
+            {x: 0, y: 0,
+             color: options.color},
+            {x: img.width - 1,
+             y: img.height - 1,
+             color: options.color},
+            {x: img.width / 2 | 0,
+             y: img.height / 2 | 0,
+             color: options.neutral},
           ];
 
-          for (let { x, y, color } of coords) {
+          for (let {x, y, color} of coords) {
             let imageData = ctx.getImageData(x, y, 1, 1).data;
 
             if (format == "png") {
@@ -133,13 +133,13 @@ function* runTest(options) {
 }
 
 add_task(function* testCaptureVisibleTab() {
-  yield runTest({ color: [0, 0, 0], fullZoom: 1 });
+  yield runTest({color: [0, 0, 0], fullZoom: 1});
 
-  yield runTest({ color: [0, 0, 0], fullZoom: 2 });
+  yield runTest({color: [0, 0, 0], fullZoom: 2});
 
-  yield runTest({ color: [0, 0, 0], fullZoom: 0.5 });
+  yield runTest({color: [0, 0, 0], fullZoom: 0.5});
 
-  yield runTest({ color: [255, 255, 255], fullZoom: 1 });
+  yield runTest({color: [255, 255, 255], fullZoom: 1});
 });
 
 add_task(function* testCaptureVisibleTabPermissions() {
@@ -149,7 +149,7 @@ add_task(function* testCaptureVisibleTabPermissions() {
     },
 
     background: function(x) {
-      browser.tabs.query({ currentWindow: true, active: true }, tab => {
+      browser.tabs.query({currentWindow: true, active: true}, tab => {
         browser.tabs.captureVisibleTab(tab.windowId).then(
           () => {
             browser.test.notifyFail("captureVisibleTabPermissions");
diff --git a/browser/components/extensions/test/browser/browser_ext_tabs_create.js b/browser/components/extensions/test/browser/browser_ext_tabs_create.js
index dfb6897c123..5b7c352c86b 100644
--- a/browser/components/extensions/test/browser/browser_ext_tabs_create.js
+++ b/browser/components/extensions/test/browser/browser_ext_tabs_create.js
@@ -19,7 +19,7 @@ add_task(function* () {
     manifest: {
       "permissions": ["tabs"],
 
-      "background": { "page": "bg/background.html" },
+      "background": {"page": "bg/background.html"},
     },
 
     files: {
@@ -45,48 +45,48 @@ add_task(function* () {
 
           let tests = [
             {
-              create: { url: "http://example.com/" },
-              result: { url: "http://example.com/" },
+              create: {url: "http://example.com/"},
+              result: {url: "http://example.com/"},
             },
             {
-              create: { url: "blank.html" },
-              result: { url: browser.runtime.getURL("bg/blank.html") },
+              create: {url: "blank.html"},
+              result: {url: browser.runtime.getURL("bg/blank.html")},
             },
             {
               create: {},
-              result: { url: "about:newtab" },
+              result: {url: "about:newtab"},
             },
             {
-              create: { active: false },
-              result: { active: false },
+              create: {active: false},
+              result: {active: false},
             },
             {
-              create: { active: true },
-              result: { active: true },
+              create: {active: true},
+              result: {active: true},
             },
             {
-              create: { pinned: true },
-              result: { pinned: true, index: 0 },
+              create: {pinned: true},
+              result: {pinned: true, index: 0},
             },
             {
-              create: { pinned: true, active: true },
-              result: { pinned: true, active: true, index: 0 },
+              create: {pinned: true, active: true},
+              result: {pinned: true, active: true, index: 0},
             },
             {
-              create: { pinned: true, active: false },
-              result: { pinned: true, active: false, index: 0 },
+              create: {pinned: true, active: false},
+              result: {pinned: true, active: false, index: 0},
             },
             {
-              create: { index: 1 },
-              result: { index: 1 },
+              create: {index: 1},
+              result: {index: 1},
             },
             {
-              create: { index: 1, active: false },
-              result: { index: 1, active: false },
+              create: {index: 1, active: false},
+              result: {index: 1, active: false},
             },
             {
-              create: { windowId: activeWindow },
-              result: { windowId: activeWindow },
+              create: {windowId: activeWindow},
+              result: {windowId: activeWindow},
             },
           ];
 
@@ -141,7 +141,7 @@ add_task(function* () {
 
               return browser.tabs.remove(tabId);
             }).then(() => {
-              return browser.tabs.update(activeTab, { active: true });
+              return browser.tabs.update(activeTab, {active: true});
             }).then(() => {
               nextTest();
             });
@@ -150,7 +150,7 @@ add_task(function* () {
           nextTest();
         }
 
-        browser.tabs.query({ active: true, currentWindow: true }, tabs => {
+        browser.tabs.query({active: true, currentWindow: true}, tabs => {
           activeTab = tabs[0].id;
           activeWindow = tabs[0].windowId;
 
diff --git a/browser/components/extensions/test/browser/browser_ext_tabs_executeScript_bad.js b/browser/components/extensions/test/browser/browser_ext_tabs_executeScript_bad.js
index 45ff816283e..e07622d54d1 100644
--- a/browser/components/extensions/test/browser/browser_ext_tabs_executeScript_bad.js
+++ b/browser/components/extensions/test/browser/browser_ext_tabs_executeScript_bad.js
@@ -14,7 +14,7 @@ function* testHasNoPermission(params) {
     browser.test.onMessage.addListener(msg => {
       browser.test.assertEq(msg, "execute-script");
 
-      browser.tabs.query({ currentWindow: true }, tabs => {
+      browser.tabs.query({currentWindow: true}, tabs => {
         browser.tabs.executeScript({
           file: "script.js",
         });
@@ -70,12 +70,12 @@ add_task(function* testBadPermissions() {
 
   info("Test no special permissions");
   yield testHasNoPermission({
-    manifest: { "permissions": ["http://example.com/"] },
+    manifest: {"permissions": ["http://example.com/"]},
   });
 
   info("Test tabs permissions");
   yield testHasNoPermission({
-    manifest: { "permissions": ["http://example.com/", "tabs"] },
+    manifest: {"permissions": ["http://example.com/", "tabs"]},
   });
 
   info("Test active tab, browser action, no click");
@@ -94,7 +94,7 @@ add_task(function* testBadPermissions() {
     },
     contentSetup() {
       return new Promise(resolve => {
-        browser.tabs.query({ active: true, currentWindow: true }, tabs => {
+        browser.tabs.query({active: true, currentWindow: true}, tabs => {
           browser.pageAction.show(tabs[0].id);
           resolve();
         });
@@ -108,7 +108,7 @@ add_task(function* testBadPermissions() {
 
 add_task(function* testBadURL() {
   function background() {
-    browser.tabs.query({ currentWindow: true }, tabs => {
+    browser.tabs.query({currentWindow: true}, tabs => {
       let promises = [
         new Promise(resolve => {
           browser.tabs.executeScript({
diff --git a/browser/components/extensions/test/browser/browser_ext_tabs_executeScript_good.js b/browser/components/extensions/test/browser/browser_ext_tabs_executeScript_good.js
index 4f30172cf4f..78ea11ed531 100644
--- a/browser/components/extensions/test/browser/browser_ext_tabs_executeScript_good.js
+++ b/browser/components/extensions/test/browser/browser_ext_tabs_executeScript_good.js
@@ -61,17 +61,17 @@ add_task(function* testGoodPermissions() {
 
   info("Test explicit host permission");
   yield testHasPermission({
-    manifest: { "permissions": ["http://mochi.test/"] },
+    manifest: {"permissions": ["http://mochi.test/"]},
   });
 
   info("Test explicit host subdomain permission");
   yield testHasPermission({
-    manifest: { "permissions": ["http://*.mochi.test/"] },
+    manifest: {"permissions": ["http://*.mochi.test/"]},
   });
 
   info("Test explicit <all_urls> permission");
   yield testHasPermission({
-    manifest: { "permissions": ["<all_urls>"] },
+    manifest: {"permissions": ["<all_urls>"]},
   });
 
   info("Test activeTab permission with a browser action click");
@@ -98,7 +98,7 @@ add_task(function* testGoodPermissions() {
     },
     contentSetup() {
       return new Promise(resolve => {
-        browser.tabs.query({ active: true, currentWindow: true }, tabs => {
+        browser.tabs.query({active: true, currentWindow: true}, tabs => {
           browser.pageAction.show(tabs[0].id);
           resolve();
         });
@@ -112,7 +112,7 @@ add_task(function* testGoodPermissions() {
   yield testHasPermission({
     manifest: {
       "permissions": ["activeTab"],
-      "browser_action": { "default_popup": "_blank.html" },
+      "browser_action": {"default_popup": "_blank.html"},
     },
     setup: clickBrowserAction,
     tearDown: closeBrowserAction,
@@ -122,11 +122,11 @@ add_task(function* testGoodPermissions() {
   yield testHasPermission({
     manifest: {
       "permissions": ["activeTab"],
-      "page_action": { "default_popup": "_blank.html" },
+      "page_action": {"default_popup": "_blank.html"},
     },
     contentSetup() {
       return new Promise(resolve => {
-        browser.tabs.query({ active: true, currentWindow: true }, tabs => {
+        browser.tabs.query({active: true, currentWindow: true}, tabs => {
           browser.pageAction.show(tabs[0].id);
           resolve();
         });
@@ -142,7 +142,7 @@ add_task(function* testGoodPermissions() {
       "permissions": ["activeTab", "contextMenus"],
     },
     contentSetup() {
-      browser.contextMenus.create({ title: "activeTab", contexts: ["all"] });
+      browser.contextMenus.create({title: "activeTab", contexts: ["all"]});
       return Promise.resolve();
     },
     setup: function* (extension) {
@@ -150,7 +150,7 @@ add_task(function* testGoodPermissions() {
       let awaitPopupShown = BrowserTestUtils.waitForEvent(contextMenu, "popupshown");
       let awaitPopupHidden = BrowserTestUtils.waitForEvent(contextMenu, "popuphidden");
 
-      yield BrowserTestUtils.synthesizeMouseAtCenter("a[href]", { type: "contextmenu", button: 2 },
+      yield BrowserTestUtils.synthesizeMouseAtCenter("a[href]", {type: "contextmenu", button: 2},
                                                      gBrowser.selectedBrowser);
       yield awaitPopupShown;
 
diff --git a/browser/components/extensions/test/browser/browser_ext_tabs_getCurrent.js b/browser/components/extensions/test/browser/browser_ext_tabs_getCurrent.js
index 6894ccd834e..6184ada69dd 100644
--- a/browser/components/extensions/test/browser/browser_ext_tabs_getCurrent.js
+++ b/browser/components/extensions/test/browser/browser_ext_tabs_getCurrent.js
@@ -7,7 +7,7 @@ add_task(function* () {
     manifest: {
       "permissions": ["tabs"],
 
-      "browser_action": { "default_popup": "popup.html" },
+      "browser_action": {"default_popup": "popup.html"},
     },
 
     files: {
@@ -18,7 +18,7 @@ add_task(function* () {
           browser.test.assertEq(currentTab.url, url, "getCurrent in non-active background tab");
 
           // Activate the tab.
-          browser.tabs.onActivated.addListener(function listener({ tabId }) {
+          browser.tabs.onActivated.addListener(function listener({tabId}) {
             if (tabId == currentTab.id) {
               browser.tabs.onActivated.removeListener(listener);
 
@@ -31,7 +31,7 @@ add_task(function* () {
               });
             }
           });
-          browser.tabs.update(currentTab.id, { active: true });
+          browser.tabs.update(currentTab.id, {active: true});
         });
       },
 
@@ -52,7 +52,7 @@ add_task(function* () {
         browser.test.sendMessage("background-finished");
       });
 
-      browser.tabs.create({ url: "tab.html", active: false });
+      browser.tabs.create({url: "tab.html", active: false});
     },
   });
 
diff --git a/browser/components/extensions/test/browser/browser_ext_tabs_insertCSS.js b/browser/components/extensions/test/browser/browser_ext_tabs_insertCSS.js
index 5ad47de7356..5fd52f74368 100644
--- a/browser/components/extensions/test/browser/browser_ext_tabs_insertCSS.js
+++ b/browser/components/extensions/test/browser/browser_ext_tabs_insertCSS.js
@@ -62,7 +62,7 @@ add_task(function* testExecuteScript() {
         return;
       }
 
-      let { promise, background, foreground } = promises.shift();
+      let {promise, background, foreground} = promises.shift();
       new Promise(promise).then(() => {
         browser.tabs.executeScript({
           code: `(${checkCSS})()`,
diff --git a/browser/components/extensions/test/browser/browser_ext_tabs_move.js b/browser/components/extensions/test/browser/browser_ext_tabs_move.js
index 8b9f34c905b..dde5fdc465f 100644
--- a/browser/components/extensions/test/browser/browser_ext_tabs_move.js
+++ b/browser/components/extensions/test/browser/browser_ext_tabs_move.js
@@ -20,7 +20,7 @@ add_task(function* () {
         let tab = tabs[0];
         browser.tabs.move(tab.id, {index: 0});
         browser.tabs.query(
-          { lastFocusedWindow: true },
+          {lastFocusedWindow: true},
           tabs => {
             browser.test.assertEq(tabs[0].url, tab.url, "should be first tab");
             browser.test.notifyPass("tabs.move.single");
@@ -40,12 +40,12 @@ add_task(function* () {
 
     background: function() {
       browser.tabs.query(
-        { lastFocusedWindow: true },
+        {lastFocusedWindow: true},
         tabs => {
           tabs.sort(function(a, b) { return a.url > b.url; });
           browser.tabs.move(tabs.map(tab => tab.id), {index: 0});
           browser.tabs.query(
-            { lastFocusedWindow: true },
+            {lastFocusedWindow: true},
             tabs => {
               browser.test.assertEq(tabs[0].url, "about:blank", "should be first tab");
               browser.test.assertEq(tabs[1].url, "about:config", "should be second tab");
@@ -67,13 +67,13 @@ add_task(function* () {
 
     background: function() {
       browser.tabs.query(
-        { lastFocusedWindow: true },
+        {lastFocusedWindow: true},
         tabs => {
           let tab = tabs[0];
           // Assuming that tab.id of 12345 does not exist.
           browser.tabs.move([12345, tab.id], {index: 0});
           browser.tabs.query(
-            { lastFocusedWindow: true },
+            {lastFocusedWindow: true},
             tabs => {
               browser.test.assertEq(tabs[0].url, tab.url, "should be first tab");
               browser.test.notifyPass("tabs.move.invalid");
@@ -93,12 +93,12 @@ add_task(function* () {
 
     background: function() {
       browser.tabs.query(
-        { lastFocusedWindow: true },
+        {lastFocusedWindow: true},
         tabs => {
           let tab = tabs[0];
           browser.tabs.move(tab.id, {index: -1});
           browser.tabs.query(
-            { lastFocusedWindow: true },
+            {lastFocusedWindow: true},
             tabs => {
               browser.test.assertEq(tabs[2].url, tab.url, "should be last tab");
               browser.test.notifyPass("tabs.move.last");
diff --git a/browser/components/extensions/test/browser/browser_ext_tabs_move_window.js b/browser/components/extensions/test/browser/browser_ext_tabs_move_window.js
index 3f74a712993..f42fed85528 100644
--- a/browser/components/extensions/test/browser/browser_ext_tabs_move_window.js
+++ b/browser/components/extensions/test/browser/browser_ext_tabs_move_window.js
@@ -21,7 +21,7 @@ add_task(function* () {
         browser.tabs.move(source.id, {windowId: destination.windowId, index: 0});
 
         browser.tabs.query(
-          { url: "<all_urls>" },
+          {url: "<all_urls>"},
           tabs => {
             browser.test.assertEq(tabs[0].url, "http://example.com/");
             browser.test.assertEq(tabs[0].windowId, destination.windowId);
@@ -54,14 +54,14 @@ add_task(function* () {
 
     background: function() {
       browser.tabs.query(
-        { url: "<all_urls>" },
+        {url: "<all_urls>"},
         tabs => {
           let destination = tabs[0];
           let source = tabs[1]; // remember, pinning moves it to the left.
           browser.tabs.move(source.id, {windowId: destination.windowId, index: 0});
 
           browser.tabs.query(
-            { url: "<all_urls>" },
+            {url: "<all_urls>"},
             tabs => {
               browser.test.assertEq(true, tabs[0].pinned);
               browser.test.notifyPass("tabs.move.pin");
@@ -94,13 +94,13 @@ add_task(function* () {
 
     background: function() {
       browser.tabs.query(
-        { url: "<all_urls>" },
+        {url: "<all_urls>"},
         tabs => {
           let move1 = tabs[1];
           let move3 = tabs[3];
           browser.tabs.move([move1.id, move3.id], {index: 0});
           browser.tabs.query(
-            { url: "<all_urls>" },
+            {url: "<all_urls>"},
             tabs => {
               browser.test.assertEq(tabs[0].url, move1.url);
               browser.test.assertEq(tabs[2].url, move3.url);
diff --git a/browser/components/extensions/test/browser/browser_ext_tabs_onUpdated.js b/browser/components/extensions/test/browser/browser_ext_tabs_onUpdated.js
index 94a34707db3..13a5a7ddc43 100644
--- a/browser/components/extensions/test/browser/browser_ext_tabs_onUpdated.js
+++ b/browser/components/extensions/test/browser/browser_ext_tabs_onUpdated.js
@@ -23,9 +23,9 @@ add_task(function* () {
       let pageURL = "http://mochi.test:8888/browser/browser/components/extensions/test/browser/context_tabs_onUpdated_page.html";
 
       let expectedSequence = [
-        { status: "loading" },
-        { status: "loading", url: pageURL },
-        { status: "complete" },
+        {status: "loading"},
+        {status: "loading", url: pageURL},
+        {status: "complete"},
       ];
       let collectedSequence = [];
 
@@ -60,7 +60,7 @@ add_task(function* () {
         browser.test.notifyPass("tabs.onUpdated");
       });
 
-      browser.tabs.create({ url: pageURL });
+      browser.tabs.create({url: pageURL});
     },
     files: {
       "content-script.js": `
diff --git a/browser/components/extensions/test/browser/browser_ext_tabs_sendMessage.js b/browser/components/extensions/test/browser/browser_ext_tabs_sendMessage.js
index fc961bb81d9..0c0215f3f10 100644
--- a/browser/components/extensions/test/browser/browser_ext_tabs_sendMessage.js
+++ b/browser/components/extensions/test/browser/browser_ext_tabs_sendMessage.js
@@ -9,7 +9,7 @@ add_task(function* tabsSendMessageNoExceptionOnNonExistentTab() {
     },
 
     background: function() {
-      browser.tabs.create({ url: "about:robots"}, tab => {
+      browser.tabs.create({url: "about:robots"}, tab => {
         let exception;
         try {
           browser.tabs.sendMessage(tab.id, "message");
diff --git a/browser/components/extensions/test/browser/browser_ext_webNavigation_getFrames.js b/browser/components/extensions/test/browser/browser_ext_webNavigation_getFrames.js
index bfa16e9a612..b2bd19bae99 100644
--- a/browser/components/extensions/test/browser/browser_ext_webNavigation_getFrames.js
+++ b/browser/components/extensions/test/browser/browser_ext_webNavigation_getFrames.js
@@ -8,7 +8,7 @@ add_task(function* testWebNavigationGetNonExistentTab() {
       let results = [
         // There is no "tabId = 0" because the id assigned by TabManager (defined in ext-utils.js)
         // starts from 1.
-        browser.webNavigation.getAllFrames({ tabId: 0 }).then(() => {
+        browser.webNavigation.getAllFrames({tabId: 0}).then(() => {
           browser.test.fail("getAllFrames Promise should be rejected on error");
         }, (error) => {
           browser.test.assertEq("No tab found with tabId: 0", error.message,
@@ -16,7 +16,7 @@ add_task(function* testWebNavigationGetNonExistentTab() {
         }),
         // There is no "tabId = 0" because the id assigned by TabManager (defined in ext-utils.js)
         // starts from 1, processId is currently marked as optional and it is ignored.
-        browser.webNavigation.getFrame({ tabId: 0, frameId: 15, processId: 20 }).then(() => {
+        browser.webNavigation.getFrame({tabId: 0, frameId: 15, processId: 20}).then(() => {
           browser.test.fail("getFrame Promise should be rejected on error");
         }, (error) => {
           browser.test.assertEq("No tab found with tabId: 0", error.message,
@@ -57,11 +57,11 @@ add_task(function* testWebNavigationFrames() {
           return;
         }
 
-        browser.webNavigation.getAllFrames({ tabId }).then((getAllFramesDetails) => {
+        browser.webNavigation.getAllFrames({tabId}).then((getAllFramesDetails) => {
           let getFramePromises = getAllFramesDetails.map((frameDetail) => {
-            let { frameId } = frameDetail;
+            let {frameId} = frameDetail;
             // processId is currently marked as optional and it is ignored.
-            return browser.webNavigation.getFrame({ tabId, frameId, processId: 0 });
+            return browser.webNavigation.getFrame({tabId, frameId, processId: 0});
           });
 
           Promise.all(getFramePromises).then((getFrameResults) => {
@@ -81,7 +81,7 @@ add_task(function* testWebNavigationFrames() {
           }
 
           // Check that getFrame Promise is rejected with the expected error message on nonexistent frameId.
-          browser.webNavigation.getFrame({ tabId, frameId: nonExistentFrameId, processId: 20 }).then(() => {
+          browser.webNavigation.getFrame({tabId, frameId: nonExistentFrameId, processId: 20}).then(() => {
             browser.test.fail("getFrame promise should be rejected for an unexistent frameId");
           }, (error) => {
             browser.test.assertEq(`No frame found with frameId: ${nonExistentFrameId}`, error.message,
@@ -93,7 +93,7 @@ add_task(function* testWebNavigationFrames() {
         });
       });
 
-      browser.tabs.create({ url: "tab.html" }, (tab) => {
+      browser.tabs.create({url: "tab.html"}, (tab) => {
         tabId = tab.id;
       });
     } + ")();",
diff --git a/toolkit/components/extensions/.eslintrc b/toolkit/components/extensions/.eslintrc
index 2f4bf265a9f..b15d727a3e2 100644
--- a/toolkit/components/extensions/.eslintrc
+++ b/toolkit/components/extensions/.eslintrc
@@ -43,9 +43,12 @@
     // Always require spacing around a single line block
     "block-spacing": 1,
 
+    // Forbid spaces inside the curly brackets of object literals.
+    "object-curly-spacing": [2, "never"],
+
     // Enforce one true brace style (opening brace on the same line) and avoid
     // start and end braces on the same line.
-    "brace-style": [2, "1tbs", { "allowSingleLine": true }],
+    "brace-style": [2, "1tbs", {"allowSingleLine": true}],
 
     // No space before always a space after a comma
     "comma-spacing": [2, {"before": false, "after": true}],
@@ -69,10 +72,10 @@
     "generator-star-spacing": [2, {"before": false, "after": true}],
 
     // Two space indent
-    "indent": [2, 2, { "SwitchCase": 1 }],
+    "indent": [2, 2, {"SwitchCase": 1}],
 
     // Space after colon not before in property declarations
-    "key-spacing": [2, { "beforeColon": false, "afterColon": true, "mode": "minimum" }],
+    "key-spacing": [2, {"beforeColon": false, "afterColon": true, "mode": "minimum"}],
 
     // Unix linebreaks
     "linebreak-style": [2, "unix"],
@@ -189,7 +192,7 @@
     "no-unused-expressions": 2,
 
     // No declaring variables that are never used
-    "no-unused-vars": [2, { "args": "none", "varsIgnorePattern": "^(Cc|Ci|Cr|Cu|EXPORTED_SYMBOLS)$" }],
+    "no-unused-vars": [2, {"args": "none", "varsIgnorePattern": "^(Cc|Ci|Cr|Cu|EXPORTED_SYMBOLS)$"}],
 
     // No using variables before defined
     "no-use-before-define": 2,
@@ -207,7 +210,7 @@
     "space-before-blocks": 2,
 
     // Never use spaces before function parentheses
-    "space-before-function-paren": [2, { "anonymous": "never", "named": "never" }],
+    "space-before-function-paren": [2, {"anonymous": "never", "named": "never"}],
 
     // Require spaces before finally, catch, etc.
     "space-before-keywords": [2, "always"],
@@ -223,7 +226,7 @@
     "space-return-throw-case": 2,
 
     // ++ and -- should not need spacing
-    "space-unary-ops": [1, { "nonwords": false }],
+    "space-unary-ops": [1, {"nonwords": false}],
 
     // No comparisons to NaN
     "use-isnan": 2,
diff --git a/toolkit/components/extensions/Extension.jsm b/toolkit/components/extensions/Extension.jsm
index 442c5202d53..55c92253aaa 100644
--- a/toolkit/components/extensions/Extension.jsm
+++ b/toolkit/components/extensions/Extension.jsm
@@ -416,7 +416,7 @@ GlobalManager = {
                 promise = Promise.reject(e);
               } else {
                 Cu.reportError(e);
-                promise = Promise.reject({ message: "An unexpected error occurred" });
+                promise = Promise.reject({message: "An unexpected error occurred"});
               }
             }
 
@@ -451,7 +451,7 @@ GlobalManager = {
     let id = ExtensionManagement.getAddonIdForWindow(contentWindow);
 
     // We don't inject privileged APIs into sub-frames of a UI page.
-    const { FULL_PRIVILEGES } = ExtensionManagement.API_LEVELS;
+    const {FULL_PRIVILEGES} = ExtensionManagement.API_LEVELS;
     if (ExtensionManagement.getAPILevelForWindow(contentWindow, id) !== FULL_PRIVILEGES) {
       return;
     }
@@ -611,7 +611,7 @@ ExtensionData.prototype = {
         }
         try {
           let text = NetUtil.readInputStreamToString(inputStream, inputStream.available(),
-                                                     { charset: "utf-8" });
+                                                     {charset: "utf-8"});
           resolve(JSON.parse(text));
         } catch (e) {
           reject(e);
@@ -768,7 +768,7 @@ ExtensionData.prototype = {
 
     let promises = [this.readLocaleFile(locale)];
 
-    let { defaultLocale } = this;
+    let {defaultLocale} = this;
     if (locale != defaultLocale && !this.localeData.has(defaultLocale)) {
       promises.push(this.readLocaleFile(defaultLocale));
     }
@@ -1100,7 +1100,7 @@ Extension.prototype = extend(Object.create(ExtensionData.prototype), {
       let locales = yield this.promiseLocales();
 
       let localeList = Array.from(locales.keys(), locale => {
-        return { name: locale, locales: [locale] };
+        return {name: locale, locales: [locale]};
       });
 
       let match = Locale.findClosestLocale(localeList);
@@ -1193,7 +1193,7 @@ Extension.prototype = extend(Object.create(ExtensionData.prototype), {
 
     Services.ppmm.broadcastAsyncMessage("Extension:Shutdown", {id: this.id});
 
-    MessageChannel.abortResponses({ extensionId: this.id });
+    MessageChannel.abortResponses({extensionId: this.id});
 
     ExtensionManagement.shutdownExtension(this.uuid);
 
diff --git a/toolkit/components/extensions/ExtensionContent.jsm b/toolkit/components/extensions/ExtensionContent.jsm
index e3da4e6961f..e66ca20ae0f 100644
--- a/toolkit/components/extensions/ExtensionContent.jsm
+++ b/toolkit/components/extensions/ExtensionContent.jsm
@@ -243,7 +243,7 @@ class ExtensionContext extends BaseContext {
   constructor(extensionId, contentWindow, contextOptions = {}) {
     super();
 
-    let { isExtensionPage } = contextOptions;
+    let {isExtensionPage} = contextOptions;
 
     this.isExtensionPage = isExtensionPage;
     this.extension = ExtensionManager.get(extensionId);
@@ -341,8 +341,8 @@ class ExtensionContext extends BaseContext {
     // defined in the content window (See Bug 1214658 for rationale).
     if (this.isExtensionPage && !Cu.isDeadWrapper(this.contentWindow) &&
         Cu.waiveXrays(this.contentWindow).browser === this.chromeObj) {
-      Cu.createObjectIn(this.contentWindow, { defineAs: "browser" });
-      Cu.createObjectIn(this.contentWindow, { defineAs: "chrome" });
+      Cu.createObjectIn(this.contentWindow, {defineAs: "browser"});
+      Cu.createObjectIn(this.contentWindow, {defineAs: "chrome"});
     }
     Cu.nukeSandbox(this.sandbox);
     this.sandbox = null;
@@ -404,7 +404,7 @@ var DocumentManager = {
 
       // Enable the content script APIs should be available in subframes' window
       // if it is recognized as a valid addon id (see Bug 1214658 for rationale).
-      const { CONTENTSCRIPT_PRIVILEGES } = ExtensionManagement.API_LEVELS;
+      const {CONTENTSCRIPT_PRIVILEGES} = ExtensionManagement.API_LEVELS;
       let extensionId = ExtensionManagement.getAddonIdForWindow(window);
 
       if (ExtensionManagement.getAPILevelForWindow(window, extensionId) == CONTENTSCRIPT_PRIVILEGES &&
@@ -420,7 +420,7 @@ var DocumentManager = {
     } else if (topic == "inner-window-destroyed") {
       let windowId = subject.QueryInterface(Ci.nsISupportsPRUint64).data;
 
-      MessageChannel.abortResponses({ innerWindowID: windowId });
+      MessageChannel.abortResponses({innerWindowID: windowId});
 
       // Close any existent content-script context for the destroyed window.
       if (this.contentScriptWindows.has(windowId)) {
@@ -506,7 +506,7 @@ var DocumentManager = {
 
     let context = this.extensionPageWindows.get(winId);
     if (!context) {
-      let context = new ExtensionContext(extensionId, window, { isExtensionPage: true });
+      let context = new ExtensionContext(extensionId, window, {isExtensionPage: true});
       this.extensionPageWindows.set(winId, context);
     }
 
@@ -553,7 +553,7 @@ var DocumentManager = {
       }
     }
 
-    MessageChannel.abortResponses({ extensionId });
+    MessageChannel.abortResponses({extensionId});
 
     this.extensionCount--;
     if (this.extensionCount == 0) {
@@ -681,11 +681,11 @@ class ExtensionGlobal {
                           .getInterface(Ci.nsIDOMWindowUtils)
                           .outerWindowID;
 
-    global.sendAsyncMessage("Extension:TopWindowID", { windowId: this.windowId });
+    global.sendAsyncMessage("Extension:TopWindowID", {windowId: this.windowId});
   }
 
   uninit() {
-    this.global.sendAsyncMessage("Extension:RemoveTopWindowID", { windowId: this.windowId });
+    this.global.sendAsyncMessage("Extension:RemoveTopWindowID", {windowId: this.windowId});
   }
 
   get messageFilter() {
@@ -697,7 +697,7 @@ class ExtensionGlobal {
     };
   }
 
-  receiveMessage({ target, messageName, recipient, data }) {
+  receiveMessage({target, messageName, recipient, data}) {
     switch (messageName) {
       case "Extension:Capture":
         return this.handleExtensionCapture(data.width, data.height, data.options);
@@ -734,12 +734,12 @@ class ExtensionGlobal {
   handleExtensionExecute(target, recipient, options) {
     let deferred = PromiseUtils.defer();
     let script = new Script(options, deferred);
-    let { extensionId } = recipient;
+    let {extensionId} = recipient;
     DocumentManager.executeScript(target, extensionId, script);
     return deferred.promise;
   }
 
-  handleWebNavigationGetFrame({ frameId }) {
+  handleWebNavigationGetFrame({frameId}) {
     return WebNavigationFrames.getFrame(this.global.docShell, frameId);
   }
 
diff --git a/toolkit/components/extensions/ExtensionManagement.jsm b/toolkit/components/extensions/ExtensionManagement.jsm
index 58f1b975899..9b5c61ff509 100644
--- a/toolkit/components/extensions/ExtensionManagement.jsm
+++ b/toolkit/components/extensions/ExtensionManagement.jsm
@@ -228,7 +228,7 @@ const API_LEVELS = Object.freeze({
 // Finds the API Level ("FULL_PRIVILEGES", "CONTENTSCRIPT_PRIVILEGES", "NO_PRIVILEGES")
 // with a given a window object.
 function getAPILevelForWindow(window, addonId) {
-  const { NO_PRIVILEGES, CONTENTSCRIPT_PRIVILEGES, FULL_PRIVILEGES } = API_LEVELS;
+  const {NO_PRIVILEGES, CONTENTSCRIPT_PRIVILEGES, FULL_PRIVILEGES} = API_LEVELS;
 
   // Non WebExtension URLs and WebExtension URLs from a different extension
   // has no access to APIs.
diff --git a/toolkit/components/extensions/MessageChannel.jsm b/toolkit/components/extensions/MessageChannel.jsm
index 1d4bf1b0932..7f581ee4b65 100644
--- a/toolkit/components/extensions/MessageChannel.jsm
+++ b/toolkit/components/extensions/MessageChannel.jsm
@@ -149,16 +149,16 @@ class FilteringMessageManager {
    * Receives a message from our message manager, maps it to a handler, and
    * passes the result to our message callback.
    */
-  receiveMessage({ data, target }) {
+  receiveMessage({data, target}) {
     let handlers = Array.from(this.getHandlers(data.messageName, data.recipient));
 
     let result = {};
     if (handlers.length == 0) {
-      result.error = { result: MessageChannel.RESULT_NO_HANDLER,
-                       message: "No matching message handler" };
+      result.error = {result: MessageChannel.RESULT_NO_HANDLER,
+                      message: "No matching message handler"};
     } else if (handlers.length > 1) {
-      result.error = { result: MessageChannel.RESULT_MULTIPLE_HANDLERS,
-                       message: `Multiple matching handlers for ${data.messageName}` };
+      result.error = {result: MessageChannel.RESULT_MULTIPLE_HANDLERS,
+                      message: `Multiple matching handlers for ${data.messageName}`};
     } else {
       result.handler = handlers[0];
     }
@@ -414,7 +414,7 @@ this.MessageChannel = {
    */
   sendMessage(target, messageName, data, recipient = {}, sender = {}) {
     let channelId = gChannelId++;
-    let message = { messageName, channelId, sender, recipient, data };
+    let message = {messageName, channelId, sender, recipient, data};
 
     let deferred = PromiseUtils.defer();
     deferred.messageFilter = {};
@@ -446,11 +446,11 @@ this.MessageChannel = {
    * Each handler object is a `MessageReceiver` object as passed to
    * `addListener`.
    */
-  _handleMessage({ handler, error }, data) {
+  _handleMessage({handler, error}, data) {
     // The target passed to `receiveMessage` is sometimes a message manager
     // owner instead of a message manager, so make sure to convert it to a
     // message manager first if necessary.
-    let { target } = data;
+    let {target} = data;
     if (!(target instanceof Ci.nsIMessageSender)) {
       target = target.messageManager;
     }
@@ -513,7 +513,7 @@ this.MessageChannel = {
    * Each handler object is a deferred object created by `sendMessage`, and
    * should be resolved or rejected based on the contents of the response.
    */
-  _handleResponse({ handler, error }, data) {
+  _handleResponse({handler, error}, data) {
     if (error) {
       // If we have an error at this point, we have handler to report it to,
       // so just log it.
diff --git a/toolkit/components/extensions/ext-alarms.js b/toolkit/components/extensions/ext-alarms.js
index 98542fb0b96..3783f3e2783 100644
--- a/toolkit/components/extensions/ext-alarms.js
+++ b/toolkit/components/extensions/ext-alarms.js
@@ -1,6 +1,6 @@
 "use strict";
 
-var { classes: Cc, interfaces: Ci, utils: Cu } = Components;
+var {classes: Cc, interfaces: Ci, utils: Cu} = Components;
 
 Cu.import("resource://gre/modules/ExtensionUtils.jsm");
 var {
diff --git a/toolkit/components/extensions/ext-backgroundPage.js b/toolkit/components/extensions/ext-backgroundPage.js
index c3895a1c32b..1deca087116 100644
--- a/toolkit/components/extensions/ext-backgroundPage.js
+++ b/toolkit/components/extensions/ext-backgroundPage.js
@@ -1,6 +1,6 @@
 "use strict";
 
-var { interfaces: Ci, utils: Cu } = Components;
+var {interfaces: Ci, utils: Cu} = Components;
 
 Cu.import("resource://gre/modules/Services.jsm");
 
diff --git a/toolkit/components/extensions/ext-cookies.js b/toolkit/components/extensions/ext-cookies.js
index 0f5db9a52a5..4305f23595b 100644
--- a/toolkit/components/extensions/ext-cookies.js
+++ b/toolkit/components/extensions/ext-cookies.js
@@ -1,6 +1,6 @@
 "use strict";
 
-const { interfaces: Ci, utils: Cu } = Components;
+const {interfaces: Ci, utils: Cu} = Components;
 
 Cu.import("resource://gre/modules/ExtensionUtils.jsm");
 Cu.import("resource://gre/modules/NetUtil.jsm");
@@ -280,7 +280,7 @@ extensions.registerSchemaAPI("cookies", "cookies", (extension, context) => {
         let expiry = isSession ? 0 : details.expirationDate;
         // Ignore storeID.
 
-        let cookieAttrs = { host: details.domain, path: path, isSecure: secure };
+        let cookieAttrs = {host: details.domain, path: path, isSecure: secure};
         if (!checkSetCookiePermissions(extension, uri, cookieAttrs)) {
           return Promise.reject({message: `Permission denied to set cookie ${JSON.stringify(details)}`});
         }
diff --git a/toolkit/components/extensions/ext-downloads.js b/toolkit/components/extensions/ext-downloads.js
index 8a319579943..75fc621ab81 100644
--- a/toolkit/components/extensions/ext-downloads.js
+++ b/toolkit/components/extensions/ext-downloads.js
@@ -1,6 +1,6 @@
 "use strict";
 
-var { classes: Cc, interfaces: Ci, utils: Cu } = Components;
+var {classes: Cc, interfaces: Ci, utils: Cu} = Components;
 
 Cu.import("resource://gre/modules/ExtensionUtils.jsm");
 const {
diff --git a/toolkit/components/extensions/ext-notifications.js b/toolkit/components/extensions/ext-notifications.js
index 7e5802c980d..c9d8c09f465 100644
--- a/toolkit/components/extensions/ext-notifications.js
+++ b/toolkit/components/extensions/ext-notifications.js
@@ -1,6 +1,6 @@
 "use strict";
 
-var { classes: Cc, interfaces: Ci, utils: Cu } = Components;
+var {classes: Cc, interfaces: Ci, utils: Cu} = Components;
 
 Cu.import("resource://gre/modules/ExtensionUtils.jsm");
 var {
diff --git a/toolkit/components/extensions/ext-runtime.js b/toolkit/components/extensions/ext-runtime.js
index c22a72c7edf..48a485a66b4 100644
--- a/toolkit/components/extensions/ext-runtime.js
+++ b/toolkit/components/extensions/ext-runtime.js
@@ -1,6 +1,6 @@
 "use strict";
 
-var { classes: Cc, interfaces: Ci, utils: Cu } = Components;
+var {classes: Cc, interfaces: Ci, utils: Cu} = Components;
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "AppConstants",
@@ -48,7 +48,7 @@ extensions.registerSchemaAPI("runtime", null, (extension, context) => {
         let recipient = {extensionId: extensionId ? extensionId : extension.id};
 
         if (!GlobalManager.extensionMap.has(recipient.extensionId)) {
-          return context.wrapPromise(Promise.reject({ message: "Invalid extension ID" }),
+          return context.wrapPromise(Promise.reject({message: "Invalid extension ID"}),
                                      responseCallback);
         }
         return context.messenger.sendMessage(Services.cpmm, message, recipient, responseCallback);
@@ -95,11 +95,11 @@ extensions.registerSchemaAPI("runtime", null, (extension, context) => {
         try {
           uri = NetUtil.newURI(url);
         } catch (e) {
-          return Promise.reject({ message: `Invalid URL: ${JSON.stringify(url)}` });
+          return Promise.reject({message: `Invalid URL: ${JSON.stringify(url)}`});
         }
 
         if (uri.scheme != "http" && uri.scheme != "https") {
-          return Promise.reject({ message: "url must have the scheme http or https" });
+          return Promise.reject({message: "url must have the scheme http or https"});
         }
 
         extension.uninstallURL = url;
diff --git a/toolkit/components/extensions/ext-storage.js b/toolkit/components/extensions/ext-storage.js
index 6396ae921a9..8f7aec16d73 100644
--- a/toolkit/components/extensions/ext-storage.js
+++ b/toolkit/components/extensions/ext-storage.js
@@ -1,6 +1,6 @@
 "use strict";
 
-var { classes: Cc, interfaces: Ci, utils: Cu } = Components;
+var {classes: Cc, interfaces: Ci, utils: Cu} = Components;
 
 XPCOMUtils.defineLazyModuleGetter(this, "ExtensionStorage",
                                   "resource://gre/modules/ExtensionStorage.jsm");
diff --git a/toolkit/components/extensions/ext-webNavigation.js b/toolkit/components/extensions/ext-webNavigation.js
index 5e4de435c99..0a3811aa0dd 100644
--- a/toolkit/components/extensions/ext-webNavigation.js
+++ b/toolkit/components/extensions/ext-webNavigation.js
@@ -1,6 +1,6 @@
 "use strict";
 
-var { classes: Cc, interfaces: Ci, utils: Cu } = Components;
+var {classes: Cc, interfaces: Ci, utils: Cu} = Components;
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 
@@ -83,11 +83,11 @@ extensions.registerSchemaAPI("webNavigation", "webNavigation", (extension, conte
       getAllFrames(details) {
         let tab = TabManager.getTab(details.tabId);
         if (!tab) {
-          return Promise.reject({ message: `No tab found with tabId: ${details.tabId}`});
+          return Promise.reject({message: `No tab found with tabId: ${details.tabId}`});
         }
 
-        let { innerWindowID, messageManager } = tab.linkedBrowser;
-        let recipient = { innerWindowID };
+        let {innerWindowID, messageManager} = tab.linkedBrowser;
+        let recipient = {innerWindowID};
 
         return context.sendMessage(messageManager, "WebNavigation:GetAllFrames", {}, recipient)
                       .then((results) => results.map(convertGetFrameResult.bind(null, details.tabId)));
@@ -95,7 +95,7 @@ extensions.registerSchemaAPI("webNavigation", "webNavigation", (extension, conte
       getFrame(details) {
         let tab = TabManager.getTab(details.tabId);
         if (!tab) {
-          return Promise.reject({ message: `No tab found with tabId: ${details.tabId}`});
+          return Promise.reject({message: `No tab found with tabId: ${details.tabId}`});
         }
 
         let recipient = {
@@ -103,11 +103,11 @@ extensions.registerSchemaAPI("webNavigation", "webNavigation", (extension, conte
         };
 
         let mm = tab.linkedBrowser.messageManager;
-        return context.sendMessage(mm, "WebNavigation:GetFrame", { options: details }, recipient)
+        return context.sendMessage(mm, "WebNavigation:GetFrame", {options: details}, recipient)
                       .then((result) => {
                         return result ?
                           convertGetFrameResult(details.tabId, result) :
-                          Promise.reject({ message: `No frame found with frameId: ${details.frameId}`});
+                          Promise.reject({message: `No frame found with frameId: ${details.frameId}`});
                       });
       },
     },
diff --git a/toolkit/components/extensions/ext-webRequest.js b/toolkit/components/extensions/ext-webRequest.js
index e3bc693a31b..793d08a2c89 100644
--- a/toolkit/components/extensions/ext-webRequest.js
+++ b/toolkit/components/extensions/ext-webRequest.js
@@ -1,6 +1,6 @@
 "use strict";
 
-var { classes: Cc, interfaces: Ci, utils: Cu } = Components;
+var {classes: Cc, interfaces: Ci, utils: Cu} = Components;
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 
diff --git a/toolkit/components/extensions/test/mochitest/file_ext_test_api_injection.js b/toolkit/components/extensions/test/mochitest/file_ext_test_api_injection.js
index 93ea99924d0..06dfae65ecf 100644
--- a/toolkit/components/extensions/test/mochitest/file_ext_test_api_injection.js
+++ b/toolkit/components/extensions/test/mochitest/file_ext_test_api_injection.js
@@ -1,12 +1,12 @@
 "use strict";
 
-var { interfaces: Ci } = Components;
+var {interfaces: Ci} = Components;
 
 Components.utils.import("resource://gre/modules/Services.jsm");
 
 Services.console.registerListener(function listener(message) {
   if (/WebExt Privilege Escalation/.test(message.message)) {
     Services.console.unregisterListener(listener);
-    sendAsyncMessage("console-message", { message: message.message });
+    sendAsyncMessage("console-message", {message: message.message});
   }
 });
diff --git a/toolkit/components/extensions/test/mochitest/test_ext_background_runtime_connect_params.html b/toolkit/components/extensions/test/mochitest/test_ext_background_runtime_connect_params.html
index 03397b9bc04..8296ec335ca 100644
--- a/toolkit/components/extensions/test/mochitest/test_ext_background_runtime_connect_params.html
+++ b/toolkit/components/extensions/test/mochitest/test_ext_background_runtime_connect_params.html
@@ -19,7 +19,7 @@ function backgroundScript() {
 
   const invalid_connect_params = [
     // too many params
-    ["fake-extensions-id", { name: "fake-conn-name" }, "unexpected third params"],
+    ["fake-extensions-id", {name: "fake-conn-name"}, "unexpected third params"],
     // invalid params format
     [{}, {}],
     ["fake-extensions-id", "invalid-connect-info-format"],
@@ -56,7 +56,7 @@ function backgroundScript() {
     assertInvalidConnectParamsException(params);
   }
 
-  browser.runtime.connect(browser.runtime.id, { name: "check-results"});
+  browser.runtime.connect(browser.runtime.id, {name: "check-results"});
 }
 
 let extensionData = {
diff --git a/toolkit/components/extensions/test/mochitest/test_ext_contentscript_create_iframe.html b/toolkit/components/extensions/test/mochitest/test_ext_contentscript_create_iframe.html
index 564fea6fb99..867c0107700 100644
--- a/toolkit/components/extensions/test/mochitest/test_ext_contentscript_create_iframe.html
+++ b/toolkit/components/extensions/test/mochitest/test_ext_contentscript_create_iframe.html
@@ -27,21 +27,21 @@
 add_task(function* test_contentscript_create_iframe() {
   function backgroundScript() {
     browser.runtime.onMessage.addListener((msg, sender) => {
-      let { name, availableAPIs, manifest, testGetManifest } = msg;
+      let {name, availableAPIs, manifest, testGetManifest} = msg;
       let hasExtTabsAPI = availableAPIs.indexOf("tabs") > 0;
       let hasExtWindowsAPI = availableAPIs.indexOf("windows") > 0;
 
       browser.test.assertFalse(hasExtTabsAPI, "the created iframe should not be able to use privileged APIs (tabs)");
       browser.test.assertFalse(hasExtWindowsAPI, "the created iframe should not be able to use privileged APIs (windows)");
 
-      let { applications: { gecko: { id: expectedManifestGeckoId } } } = chrome.runtime.getManifest();
-      let { applications: { gecko: { id: actualManifestGeckoId } } } = manifest;
+      let {applications: {gecko: {id: expectedManifestGeckoId}}} = chrome.runtime.getManifest();
+      let {applications: {gecko: {id: actualManifestGeckoId}}} = manifest;
 
       browser.test.assertEq(actualManifestGeckoId, expectedManifestGeckoId,
                             "the add-on manifest should be accessible from the created iframe"
       );
 
-      let { applications: { gecko: { id: testGetManifestGeckoId } } } = testGetManifest;
+      let {applications: {gecko: {id: testGetManifestGeckoId}}} = testGetManifest;
 
       browser.test.assertEq(testGetManifestGeckoId, expectedManifestGeckoId,
                               "GET_MANIFEST() returns manifest data before extension unload"
diff --git a/toolkit/components/extensions/test/mochitest/test_ext_cookies_permissions.html b/toolkit/components/extensions/test/mochitest/test_ext_cookies_permissions.html
index 3fa4ca6f79d..985563ee45d 100644
--- a/toolkit/components/extensions/test/mochitest/test_ext_cookies_permissions.html
+++ b/toolkit/components/extensions/test/mochitest/test_ext_cookies_permissions.html
@@ -36,7 +36,7 @@ function* testCookies(options) {
 
 
     // Try to access some cookies in various ways.
-    let { url, domain, secure } = options;
+    let {url, domain, secure} = options;
 
     let failures = 0;
     let tallyFailure = error => {
@@ -44,11 +44,11 @@ function* testCookies(options) {
     };
 
     awaitChanges.then(() => {
-      return browser.cookies.get({ url, name: "foo" });
+      return browser.cookies.get({url, name: "foo"});
     }).then(cookie => {
       browser.test.assertEq(options.shouldPass, cookie != null, "should pass == get cookie");
 
-      return browser.cookies.getAll({ domain });
+      return browser.cookies.getAll({domain});
     }).then(cookies => {
       if (options.shouldPass) {
         browser.test.assertEq(2, cookies.length, "expected number of cookies");
@@ -57,9 +57,9 @@ function* testCookies(options) {
       }
 
       return Promise.all([
-        browser.cookies.set({ url, domain, secure, name: "foo", "value": "baz", expirationDate: options.expiry }).catch(tallyFailure),
-        browser.cookies.set({ url, domain, secure, name: "bar", "value": "quux", expirationDate: options.expiry }).catch(tallyFailure),
-        browser.cookies.remove({ url, name: "deleted" }),
+        browser.cookies.set({url, domain, secure, name: "foo", "value": "baz", expirationDate: options.expiry}).catch(tallyFailure),
+        browser.cookies.set({url, domain, secure, name: "bar", "value": "quux", expirationDate: options.expiry}).catch(tallyFailure),
+        browser.cookies.remove({url, name: "deleted"}),
       ]);
     }).then(() => {
       if (options.shouldPass) {
diff --git a/toolkit/components/extensions/test/mochitest/test_ext_i18n.html b/toolkit/components/extensions/test/mochitest/test_ext_i18n.html
index 6de41c678d1..50e9ed97ab5 100644
--- a/toolkit/components/extensions/test/mochitest/test_ext_i18n.html
+++ b/toolkit/components/extensions/test/mochitest/test_ext_i18n.html
@@ -62,8 +62,8 @@ add_task(function* test_i18n() {
       "default_locale": "jp",
 
       content_scripts: [
-        { "matches": ["http://mochi.test/*/file_sample.html"],
-          "js": ["content.js"] },
+        {"matches": ["http://mochi.test/*/file_sample.html"],
+         "js": ["content.js"]},
       ],
     },
 
diff --git a/toolkit/components/extensions/test/xpcshell/head.js b/toolkit/components/extensions/test/xpcshell/head.js
index 71823e9e828..4dfe02e161f 100644
--- a/toolkit/components/extensions/test/xpcshell/head.js
+++ b/toolkit/components/extensions/test/xpcshell/head.js
@@ -1,6 +1,6 @@
 "use strict";
 
-const { classes: Cc, interfaces: Ci, utils: Cu, results: Cr } = Components;
+const {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components;
 
 Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
 
diff --git a/toolkit/components/extensions/test/xpcshell/test_ext_schemas.js b/toolkit/components/extensions/test/xpcshell/test_ext_schemas.js
index 9a7a1494a73..6f6b033db4c 100644
--- a/toolkit/components/extensions/test/xpcshell/test_ext_schemas.js
+++ b/toolkit/components/extensions/test/xpcshell/test_ext_schemas.js
@@ -384,28 +384,28 @@ add_task(function* () {
   root.testing.bar(true);
   verify("call", "testing", "bar", [null, true]);
 
-  root.testing.baz({ prop1: "hello", prop2: 22 });
-  verify("call", "testing", "baz", [{ prop1: "hello", prop2: 22 }]);
+  root.testing.baz({prop1: "hello", prop2: 22});
+  verify("call", "testing", "baz", [{prop1: "hello", prop2: 22}]);
 
-  root.testing.baz({ prop1: "hello" });
-  verify("call", "testing", "baz", [{ prop1: "hello", prop2: null }]);
+  root.testing.baz({prop1: "hello"});
+  verify("call", "testing", "baz", [{prop1: "hello", prop2: null}]);
 
-  root.testing.baz({ prop1: "hello", prop2: null });
-  verify("call", "testing", "baz", [{ prop1: "hello", prop2: null }]);
+  root.testing.baz({prop1: "hello", prop2: null});
+  verify("call", "testing", "baz", [{prop1: "hello", prop2: null}]);
 
-  Assert.throws(() => root.testing.baz({ prop2: 12 }),
+  Assert.throws(() => root.testing.baz({prop2: 12}),
                 /Property "prop1" is required/,
                 "should throw without required property");
 
-  Assert.throws(() => root.testing.baz({ prop1: "hi", prop3: 12 }),
+  Assert.throws(() => root.testing.baz({prop1: "hi", prop3: 12}),
                 /Property "prop3" is unsupported by Firefox/,
                 "should throw with unsupported property");
 
-  Assert.throws(() => root.testing.baz({ prop1: "hi", prop4: 12 }),
+  Assert.throws(() => root.testing.baz({prop1: "hi", prop4: 12}),
                 /Unexpected property "prop4"/,
                 "should throw with unexpected property");
 
-  Assert.throws(() => root.testing.baz({ prop1: 12 }),
+  Assert.throws(() => root.testing.baz({prop1: 12}),
                 /Expected string instead of 12/,
                 "should throw with wrong type");
 
diff --git a/toolkit/components/extensions/test/xpcshell/test_locale_converter.js b/toolkit/components/extensions/test/xpcshell/test_locale_converter.js
index 8715fa15025..e296a66127b 100644
--- a/toolkit/components/extensions/test/xpcshell/test_locale_converter.js
+++ b/toolkit/components/extensions/test/xpcshell/test_locale_converter.js
@@ -118,7 +118,7 @@ add_task(function* testInvalidUUID() {
   }, expectInvalidContextException);
 
   Assert.throws(() => {
-    let listener = { QueryInterface: XPCOMUtils.generateQI([Ci.nsIStreamListener]) };
+    let listener = {QueryInterface: XPCOMUtils.generateQI([Ci.nsIStreamListener])};
 
     convService.asyncConvertData(FROM_TYPE, TO_TYPE, listener, uri);
   }, expectInvalidContextException);
diff --git a/toolkit/modules/addons/MatchPattern.jsm b/toolkit/modules/addons/MatchPattern.jsm
index 5bd73bd3dd6..7699d5b2e52 100644
--- a/toolkit/modules/addons/MatchPattern.jsm
+++ b/toolkit/modules/addons/MatchPattern.jsm
@@ -153,7 +153,7 @@ MatchPattern.prototype = {
     // So, instead, we need to manually check our filters, and accept any
     // with hosts that end with our cookie's host.
 
-    let { host, isSecure } = cookie;
+    let {host, isSecure} = cookie;
 
     for (let matcher of this.matchers) {
       let schemes = matcher.schemes;
diff --git a/toolkit/modules/addons/WebRequest.jsm b/toolkit/modules/addons/WebRequest.jsm
index 3937e53b099..de2803fa86e 100644
--- a/toolkit/modules/addons/WebRequest.jsm
+++ b/toolkit/modules/addons/WebRequest.jsm
@@ -432,7 +432,7 @@ HttpObserverManager = {
 
   onChannelReplaced(oldChannel, newChannel) {
     this.runChannelListener(oldChannel, this.getLoadContext(oldChannel),
-                            "onRedirect", { redirectUrl: newChannel.URI.spec });
+                            "onRedirect", {redirectUrl: newChannel.URI.spec});
   },
 
   onStartRequest(channel, loadContext) {