Merge mozilla-central to inbound. a=merge CLOSED TREE

Cargo.lock

@@ -622,28 +622,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "encoding_c"
-version = "0.8.0"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "encoding_rs 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "encoding_rs 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "encoding_glue"
 version = "0.1.0"
 dependencies = [
- "encoding_rs 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "encoding_rs 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "nserror 0.1.0",
  "nsstring 0.1.0",
 ]
 
 [[package]]
 name = "encoding_rs"
-version = "0.7.2"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "cfg-if 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "simd 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "simd 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -839,7 +839,7 @@ dependencies = [
  "cose-c 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "cubeb-pulse 0.2.0",
  "cubeb-sys 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "encoding_c 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "encoding_c 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "encoding_glue 0.1.0",
  "env_logger 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "geckoservo 0.0.1",
@@ -1830,7 +1830,7 @@ dependencies = [
 
 [[package]]
 name = "simd"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -2561,8 +2561,8 @@ dependencies = [
 "checksum dwrote 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b26e30aaa6bf31ec830db15fec14ed04f0f2ecfcc486ecfce88c55d3389b237f"
 "checksum either 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "18785c1ba806c258137c937e44ada9ee7e69a37e3c72077542cd2f069d78562a"
 "checksum ena 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "cabe5a5078ac8c506d3e4430763b1ba9b609b1286913e7d08e581d1c2de9b7e5"
-"checksum encoding_c 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "93ec52324ca72f423237a413ca0e1c60654c8b3d0934fcd5fd888508dfcc4ba7"
-"checksum encoding_rs 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "98fd0f24d1fb71a4a6b9330c8ca04cbd4e7cc5d846b54ca74ff376bc7c9f798d"
+"checksum encoding_c 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "769ecb8b33323998e482b218c0d13cd64c267609023b4b7ec3ee740714c318ee"
+"checksum encoding_rs 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c6848cbd169668c2338be9940ac8968179edcd8704248e1e0c885a306c42772e"
 "checksum env_logger 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0561146661ae44c579e993456bc76d11ce1e0c7d745e57b2fa7146b6e49fa2ad"
 "checksum error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ff511d5dc435d703f4971bc399647c9bc38e20cb41452e3b9feb4765419ed3f3"
 "checksum euclid 0.17.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c95fd0d455f114291a3109286bd387bd423770058474a2d3f38b712cd661df60"
@@ -2675,7 +2675,7 @@ dependencies = [
 "checksum serde 1.0.58 (registry+https://github.com/rust-lang/crates.io-index)" = "34e9df8efbe7a2c12ceec1fc8744d56ae3374d8ae325f4a0028949d16433d554"
 "checksum serde_bytes 0.10.4 (registry+https://github.com/rust-lang/crates.io-index)" = "adb6e51a6b3696b301bc221d785f898b4457c619b51d7ce195a6d20baecb37b3"
 "checksum serde_derive 1.0.58 (git+https://github.com/servo/serde?branch=deserialize_from_enums7)" = "<none>"
-"checksum simd 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3dd0805c7363ab51a829a1511ad24b6ed0349feaa756c4bc2f977f9f496e6673"
+"checksum simd 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ed3686dd9418ebcc3a26a0c0ae56deab0681e53fe899af91f5bbcee667ebffb1"
 "checksum siphasher 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2ffc669b726f2bc9a3bcff66e5e23b56ba6bf70e22a34c3d7b6d0b3450b65b84"
 "checksum slab 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "17b4fcaed89ab08ef143da37bc52adbcc04d4a69014f4c1208d6b51f0c47bc23"
 "checksum smallbitvec 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5c63726029f0069f88467873e47f392575f28f9f16b72ac65465263db4b3a13c"

browser/base/content/test/plugins/browser_plugin_reloading.js

@@ -66,6 +66,7 @@ add_task(async function() {
   await ContentTask.spawn(gTestBrowser, null, async function() {
     let plugin = content.document.getElementById("test");
     let npobj1 = Cu.waiveXrays(plugin).getObjectValue();
+    // eslint-disable-next-line no-self-assign
     plugin.src = plugin.src;
     let pluginsDiffer = false;
     try {

browser/base/content/test/plugins/head.js

@@ -174,6 +174,7 @@ function promiseReloadPlugin(aId, aBrowser) {
   let browser = aBrowser || gTestBrowser;
   return ContentTask.spawn(browser, aId, async function(contentId) {
     let plugin = content.document.getElementById(contentId);
+    // eslint-disable-next-line no-self-assign
     plugin.src = plugin.src;
   });
 }

browser/base/content/test/static/browser_all_files_referenced.js

@@ -12,7 +12,6 @@ var isDevtools = SimpleTest.harnessParameters.subsuite == "devtools";
 
 var gExceptionPaths = [
   "chrome://browser/content/defaultthemes/",
-  "chrome://browser/locale/searchplugins/",
   "resource://app/defaults/settings/blocklists/",
   "resource://app/defaults/settings/main/",
   "resource://app/defaults/settings/pinning/",
@@ -36,6 +35,9 @@ var gExceptionPaths = [
   // Exclude all the metadata paths under the country metadata folder because these
   // paths will be concatenated in FormAutofillUtils.jsm based on different country/region.
   "resource://formautofill/addressmetadata/",
+
+  // Exclude all search-plugins because they aren't referenced by filename
+  "resource://search-plugins/",
 ];
 
 // These are not part of the omni.ja file, so we find them only when running

browser/base/jar.mn

@@ -117,4 +117,3 @@ browser.jar:
 % override chrome://global/locale/appstrings.properties chrome://browser/locale/appstrings.properties
 % override chrome://global/locale/netError.dtd chrome://browser/locale/netError.dtd
 % override chrome://mozapps/locale/downloads/settingsChange.dtd chrome://browser/locale/downloads/settingsChange.dtd
-% resource search-plugins chrome://browser/locale/searchplugins/

browser/components/places/content/editBookmark.js

@@ -858,14 +858,16 @@ var gEditItemOverlay = {
 
     // XXXmano: add a separate "New Folder" string at some point...
     let title = this._element("newFolderButton").label;
-    await PlacesTransactions.NewFolder({ parentGuid: ip.guid, title,
-                                         index: await ip.getIndex() })
-                            .transact().catch(Cu.reportError);
+    let guid = await PlacesTransactions.NewFolder({
+      parentGuid: ip.guid,
+      title,
+      index: await ip.getIndex()
+    }).transact().catch(Cu.reportError);
 
     this._folderTree.focus();
-    this._folderTree.selectItems([ip.itemId]);
+    this._folderTree.selectItems([ip.guid]);
     PlacesUtils.asContainer(this._folderTree.selectedNode).containerOpen = true;
-    this._folderTree.selectItems([this._lastNewItem]);
+    this._folderTree.selectItems([guid]);
     this._folderTree.startEditing(this._folderTree.view.selection.currentIndex,
                                   this._folderTree.columns.getFirstColumn());
   },
@@ -1034,10 +1036,7 @@ var gEditItemOverlay = {
     });
   },
 
-  onItemAdded(aItemId, aParentId, aIndex, aItemType, aURI) {
-    this._lastNewItem = aItemId;
-  },
-
+  onItemAdded() {},
   onItemRemoved() { },
   onBeginUpdateBatch() { },
   onEndUpdateBatch() { },

browser/components/places/content/places.js

@@ -105,24 +105,19 @@ var PlacesOrganizer = {
       this._places.view.selection.selectEventsSuppressed = true;
     try {
       for (let container of hierarchy) {
-        switch (typeof container) {
-          case "number":
+        if (typeof container != "string") {
+          throw new Error("Invalid container type found: " + container);
+        }
+
+        try {
+          this.selectLeftPaneBuiltIn(container);
+        } catch (ex) {
+          if (container.substr(0, 6) == "place:") {
+            this._places.selectPlaceURI(container);
+          } else {
+            // Must be a guid.
             this._places.selectItems([container], false);
-            break;
-          case "string":
-            try {
-              this.selectLeftPaneBuiltIn(container);
-            } catch (ex) {
-              if (container.substr(0, 6) == "place:") {
-                this._places.selectPlaceURI(container);
-              } else {
-                // May be a guid.
-                this._places.selectItems([container], false);
-              }
-            }
-            break;
-          default:
-            throw new Error("Invalid container type found: " + container);
+          }
         }
         PlacesUtils.asContainer(this._places.selectedNode).containerOpen = true;
       }
@@ -377,7 +372,7 @@ var PlacesOrganizer = {
   openFlatContainer: function PO_openFlatContainerFlatContainer(aContainer) {
     if (aContainer.itemId != -1) {
       PlacesUtils.asContainer(this._places.selectedNode).containerOpen = true;
-      this._places.selectItems([aContainer.itemId], false);
+      this._places.selectItems([aContainer.bookmarkGuid], false);
     } else if (PlacesUtils.nodeIsQuery(aContainer)) {
       this._places.selectPlaceURI(aContainer.uri);
     }

browser/components/places/content/tree.xml

@@ -549,11 +549,9 @@
       <!-- This method will select the first node in the tree that matches
            each given item guid. It will open any folder nodes that it needs
            to in order to show the selected items.
-           Note: An array of ids or guids (or a mixture) may be passed as aIDs.
-           Passing IDs should be considered deprecated.
       -->
       <method name="selectItems">
-        <parameter name="aIDs"/>
+        <parameter name="aGuids"/>
         <parameter name="aOpenContainers"/>
         <body><![CDATA[
           // Never open containers in flat lists.
@@ -565,7 +563,7 @@
           if (aOpenContainers === undefined)
             aOpenContainers = true;
 
-          var ids = aIDs; // don't manipulate the caller's array
+          var guids = aGuids; // don't manipulate the caller's array
 
           // Array of nodes found by findNodes which are to be selected
           var nodes = [];
@@ -581,8 +579,8 @@
 
           /**
            * Recursively search through a node's children for items
-           * with the given IDs. When a matching item is found, remove its ID
-           * from the IDs array, and add the found node to the nodes dictionary.
+           * with the given GUIDs. When a matching item is found, remove its GUID
+           * from the GUIDs array, and add the found node to the nodes dictionary.
            *
            * NOTE: This method will leave open any node that had matching items
            * in its subtree.
@@ -592,29 +590,22 @@
             // See if node matches an ID we wanted; add to results.
             // For simple folder queries, check both itemId and the concrete
             // item id.
-            var index = ids.indexOf(node.itemId);
-            if (index == -1 &&
-                node.type == Ci.nsINavHistoryResultNode.RESULT_TYPE_FOLDER_SHORTCUT)
-              index = ids.indexOf(PlacesUtils.asQuery(node).folderItemId);
-
+            var index = guids.indexOf(node.bookmarkGuid);
             if (index == -1) {
-              index = ids.indexOf(node.bookmarkGuid);
-              if (index == -1) {
-                let concreteGuid = PlacesUtils.getConcreteItemGuid(node);
-                if (concreteGuid != node.bookmarkGuid) {
-                  index = ids.indexOf(concreteGuid);
-                }
+              let concreteGuid = PlacesUtils.getConcreteItemGuid(node);
+              if (concreteGuid != node.bookmarkGuid) {
+                index = guids.indexOf(concreteGuid);
               }
             }
 
             if (index != -1) {
               nodes.push(node);
               foundOne = true;
-              ids.splice(index, 1);
+              guids.splice(index, 1);
             }
 
             var concreteGuid = PlacesUtils.getConcreteItemGuid(node);
-            if (ids.length == 0 || !PlacesUtils.nodeIsContainer(node) ||
+            if (guids.length == 0 || !PlacesUtils.nodeIsContainer(node) ||
                 checkedGuidsSet.has(concreteGuid))
               return foundOne;
 
@@ -634,7 +625,7 @@
             // this node if we don't find any additional results here.
             var previousOpenness = node.containerOpen;
             node.containerOpen = true;
-            for (var child = 0; child < node.childCount && ids.length > 0; child++) {
+            for (var child = 0; child < node.childCount && guids.length > 0; child++) {
               var childNode = node.getChild(child);
               var found = findNodes(childNode);
               if (!foundOne)

browser/components/places/tests/browser/browser_library_left_pane_select_hierarchy.js

@@ -21,10 +21,7 @@ add_task(async function() {
     }],
   });
 
-  let folder1Id = await PlacesUtils.promiseItemId(items[0].guid);
-  let folder2Id = await PlacesUtils.promiseItemId(items[1].guid);
-
-  hierarchy.push(folder1Id, folder2Id);
+  hierarchy.push(items[0].guid, items[1].guid);
 
   let library = await promiseLibrary();
 

browser/components/search/content/search.xml

@@ -67,6 +67,7 @@
           return;
 
         Services.obs.addObserver(this, "browser-search-engine-modified");
+        Services.obs.addObserver(this, "browser-search-service");
 
         this._initialized = true;
 
@@ -114,6 +115,7 @@
           this._initialized = false;
 
           Services.obs.removeObserver(this, "browser-search-engine-modified");
+          Services.obs.removeObserver(this, "browser-search-service");
         }
 
         // Make sure to break the cycle from _textbox to us. Otherwise we leak
@@ -183,7 +185,8 @@
         <parameter name="aTopic"/>
         <parameter name="aVerb"/>
         <body><![CDATA[
-          if (aTopic == "browser-search-engine-modified") {
+          if (aTopic == "browser-search-engine-modified" ||
+              (aTopic == "browser-search-service" && aVerb == "init-complete")) {
             // Make sure the engine list is refetched next time it's needed
             this._engines = null;
 
@@ -1306,6 +1309,7 @@
         // Add weak referenced observers to invalidate our cached list of engines.
         Services.prefs.addObserver("browser.search.hiddenOneOffs", this, true);
         Services.obs.addObserver(this, "browser-search-engine-modified", true);
+        Services.obs.addObserver(this, "browser-search-service", true);
 
         // Rebuild the buttons when the theme changes.  See bug 1357800 for
         // details.  Summary: On Linux, switching between themes can cause a row

browser/components/search/jar.mn

@@ -6,3 +6,7 @@ browser.jar:
         content/browser/search/search.xml                           (content/search.xml)
         content/browser/search/searchReset.xhtml                    (content/searchReset.xhtml)
         content/browser/search/searchReset.js                       (content/searchReset.js)
+
+        searchplugins/                                              (searchplugins/**)
+
+% resource search-plugins %searchplugins/

browser/components/search/searchplugins/list.json

@@ -447,7 +447,7 @@
         ]
       }
     },
-    "ja-JP-mac": {
+    "ja-JP-macos": {
       "default": {
         "searchOrder": ["Google", "Yahoo! JAPAN", "Bing", "Amazon.co.jp", "楽天市場", "ヤフオク!", "教えて！goo", "Twitter", "Wikipedia (ja)"],
         "visibleDefaultEngines": [