Merge autoland to central. a=merge

Author: smolnar

accessible/html/HTMLFormControlAccessible.cpp

@@ -88,11 +88,11 @@ Relation HTMLRadioButtonAccessible::ComputeGroupAttributes(
   RefPtr<nsContentList> inputElms;
 
   nsCOMPtr<nsIFormControl> formControlNode(do_QueryInterface(mContent));
-  dom::Element* formElm = formControlNode->GetFormElement();
-  if (formElm)
+  if (dom::Element* formElm = formControlNode->GetFormElement()) {
     inputElms = NS_GetContentList(formElm, namespaceId, tagName);
-  else
+  } else {
     inputElms = NS_GetContentList(mContent->OwnerDoc(), namespaceId, tagName);
+  }
   NS_ENSURE_TRUE(inputElms, rel);
 
   uint32_t inputCount = inputElms->Length(false);

browser/base/content/browser.js

@@ -6359,10 +6359,6 @@ nsBrowserAccess.prototype = {
     );
   },
 
-  isTabContentWindow(aWindow) {
-    return gBrowser.browsers.some(browser => browser.contentWindow == aWindow);
-  },
-
   canClose() {
     return CanCloseWindow();
   },
@@ -9522,6 +9518,14 @@ if (AppConstants.NIGHTLY_BUILD) {
         return;
       }
 
+      const openNonFissionWindowOption = Services.prefs.getBoolPref(
+        "fission.openNonFissionWindowOption",
+        false
+      );
+      if (!openNonFissionWindowOption) {
+        return;
+      }
+
       let newFissionWindow = document.getElementById("Tools:FissionWindow");
       let newNonFissionWindow = document.getElementById(
         "Tools:NonFissionWindow"

browser/components/BrowserGlue.jsm

@@ -3252,7 +3252,7 @@ BrowserGlue.prototype = {
   _migrateUI: function BG__migrateUI() {
     // Use an increasing number to keep track of the current migration state.
     // Completely unrelated to the current Firefox release number.
-    const UI_VERSION = 98;
+    const UI_VERSION = 99;
     const BROWSER_DOCURL = AppConstants.BROWSER_CHROME_URL;
 
     if (!Services.prefs.prefHasUserValue("browser.migration.version")) {
@@ -3884,6 +3884,10 @@ BrowserGlue.prototype = {
       Services.prefs.clearUserPref("browser.search.cohort");
     }
 
+    if (currentUIVersion < 99) {
+      Services.prefs.clearUserPref("security.tls.version.enable-deprecated");
+    }
+
     // Update the migration version.
     Services.prefs.setIntPref("browser.migration.version", UI_VERSION);
   },

browser/components/enterprisepolicies/tests/xpcshell/head.js

@@ -18,6 +18,9 @@ const { FileTestUtils } = ChromeUtils.import(
 const { PermissionTestUtils } = ChromeUtils.import(
   "resource://testing-common/PermissionTestUtils.jsm"
 );
+const { EnterprisePolicyTesting } = ChromeUtils.import(
+  "resource://testing-common/EnterprisePolicyTesting.jsm"
+);
 
 updateAppInfo({
   name: "XPCShell",
@@ -32,47 +35,15 @@ let policies = Cc["@mozilla.org/enterprisepolicies;1"].getService(
 );
 policies.observe(null, "policies-startup", null);
 
-// Any changes to this function should also be made to the corresponding version
-// in browser/components/enterprisepolicies/tests/browser/head.js
 async function setupPolicyEngineWithJson(json, customSchema) {
-  let filePath;
-  if (typeof json == "object") {
-    filePath = FileTestUtils.getTempFile("policies.json").path;
-
-    // This file gets automatically deleted by FileTestUtils
-    // at the end of the test run.
-    await OS.File.writeAtomic(filePath, JSON.stringify(json), {
-      encoding: "utf-8",
-    });
-  } else {
-    filePath = do_get_file(json ? json : "non-existing-file.json").path;
-  }
-
-  Services.prefs.setStringPref("browser.policies.alternatePath", filePath);
-
-  let promise = new Promise(resolve => {
-    Services.obs.addObserver(function observer() {
-      Services.obs.removeObserver(
-        observer,
-        "EnterprisePolicies:AllPoliciesApplied"
-      );
-      resolve();
-    }, "EnterprisePolicies:AllPoliciesApplied");
-  });
-
-  // Clear any previously used custom schema
-  Cu.unload("resource:///modules/policies/schema.jsm");
-
-  if (customSchema) {
-    let schemaModule = ChromeUtils.import(
-      "resource:///modules/policies/schema.jsm",
-      null
+  if (typeof json != "object") {
+    let filePath = do_get_file(json ? json : "non-existing-file.json").path;
+    return EnterprisePolicyTesting.setupPolicyEngineWithJson(
+      filePath,
+      customSchema
     );
-    schemaModule.schema = customSchema;
   }
-
-  Services.obs.notifyObservers(null, "EnterprisePolicies:Restart");
-  return promise;
+  return EnterprisePolicyTesting.setupPolicyEngineWithJson(json, customSchema);
 }
 
 function checkLockedPref(prefName, prefValue) {

browser/components/migration/360seProfileMigrator.jsm

@@ -206,6 +206,7 @@ Bookmarks.prototype = {
           MigrationUtils.SOURCE_BOOKMARK_ROOTS_BOOKMARKS_TOOLBAR;
         let parentGuid = PlacesUtils.bookmarks.toolbarGuid;
         if (
+          !Services.prefs.getBoolPref("browser.toolbars.bookmarks.2h2020") &&
           !MigrationUtils.isStartupMigration &&
           PlacesUtils.getChildCountForFolder(
             PlacesUtils.bookmarks.toolbarGuid

browser/components/migration/ChromeProfileMigrator.jsm

@@ -251,6 +251,7 @@ async function GetBookmarksResource(
             errorGatherer
           );
           if (
+            !Services.prefs.getBoolPref("browser.toolbars.bookmarks.2h2020") &&
             !MigrationUtils.isStartupMigration &&
             PlacesUtils.getChildCountForFolder(
               PlacesUtils.bookmarks.toolbarGuid
@@ -276,6 +277,7 @@ async function GetBookmarksResource(
           let parentGuid = PlacesUtils.bookmarks.menuGuid;
           let bookmarks = convertBookmarks(roots.other.children, errorGatherer);
           if (
+            !Services.prefs.getBoolPref("browser.toolbars.bookmarks.2h2020") &&
             !MigrationUtils.isStartupMigration &&
             PlacesUtils.getChildCountForFolder(PlacesUtils.bookmarks.menuGuid) >
               PlacesUIUtils.NUM_TOOLBAR_BOOKMARKS_TO_UNHIDE

browser/components/migration/EdgeProfileMigrator.jsm

@@ -401,6 +401,7 @@ EdgeBookmarksMigrator.prototype = {
         MigrationUtils.SOURCE_BOOKMARK_ROOTS_BOOKMARKS_MENU;
       let parentGuid = PlacesUtils.bookmarks.menuGuid;
       if (
+        !Services.prefs.getBoolPref("browser.toolbars.bookmarks.2h2020") &&
         !MigrationUtils.isStartupMigration &&
         PlacesUtils.getChildCountForFolder(parentGuid) >
           PlacesUIUtils.NUM_TOOLBAR_BOOKMARKS_TO_UNHIDE
@@ -417,6 +418,7 @@ EdgeBookmarksMigrator.prototype = {
         MigrationUtils.SOURCE_BOOKMARK_ROOTS_BOOKMARKS_TOOLBAR;
       let parentGuid = PlacesUtils.bookmarks.toolbarGuid;
       if (
+        !Services.prefs.getBoolPref("browser.toolbars.bookmarks.2h2020") &&
         !MigrationUtils.isStartupMigration &&
         PlacesUtils.getChildCountForFolder(parentGuid) >
           PlacesUIUtils.NUM_TOOLBAR_BOOKMARKS_TO_UNHIDE

browser/components/migration/MSMigrationUtils.jsm

@@ -449,6 +449,7 @@ Bookmarks.prototype = {
     }
 
     if (
+      !Services.prefs.getBoolPref("browser.toolbars.bookmarks.2h2020") &&
       !MigrationUtils.isStartupMigration &&
       PlacesUtils.getChildCountForFolder(aDestFolderGuid) >
         PlacesUIUtils.NUM_TOOLBAR_BOOKMARKS_TO_UNHIDE

browser/components/migration/SafariProfileMigrator.jsm

@@ -150,6 +150,7 @@ Bookmarks.prototype = {
       case this.MENU_COLLECTION: {
         folderGuid = PlacesUtils.bookmarks.menuGuid;
         if (
+          !Services.prefs.getBoolPref("browser.toolbars.bookmarks.2h2020") &&
           !MigrationUtils.isStartupMigration &&
           PlacesUtils.getChildCountForFolder(folderGuid) >
             PlacesUIUtils.NUM_TOOLBAR_BOOKMARKS_TO_UNHIDE
@@ -166,6 +167,7 @@ Bookmarks.prototype = {
       case this.TOOLBAR_COLLECTION: {
         folderGuid = PlacesUtils.bookmarks.toolbarGuid;
         if (
+          !Services.prefs.getBoolPref("browser.toolbars.bookmarks.2h2020") &&
           !MigrationUtils.isStartupMigration &&
           PlacesUtils.getChildCountForFolder(folderGuid) >
             PlacesUIUtils.NUM_TOOLBAR_BOOKMARKS_TO_UNHIDE

browser/components/migration/tests/unit/test_Chrome_bookmarks.js

@@ -96,6 +96,7 @@ async function testBookmarks(migratorKey, subDirs, folderName) {
   Assert.ok(await migrator.isSourceAvailable());
 
   let itemsSeen = { bookmarks: 0, folders: 0 };
+  let gotImportedFolderWrapper = false;
   let listener = events => {
     for (let event of events) {
       // "From " comes from the string `importedBookmarksFolder`
@@ -104,6 +105,7 @@ async function testBookmarks(migratorKey, subDirs, folderName) {
         event.itemType == PlacesUtils.bookmarks.TYPE_FOLDER
       ) {
         Assert.equal(event.title, folderName, "Bookmark folder name");
+        gotImportedFolderWrapper = true;
       } else {
         itemsSeen[
           event.itemType == PlacesUtils.bookmarks.TYPE_FOLDER
@@ -143,6 +145,11 @@ async function testBookmarks(migratorKey, subDirs, folderName) {
 
   Assert.equal(itemsSeen.bookmarks, 200, "Should have seen 200 bookmarks.");
   Assert.equal(itemsSeen.folders, 10, "Should have seen 10 folders.");
+  Assert.equal(
+    gotImportedFolderWrapper,
+    !Services.prefs.getBoolPref("browser.toolbars.bookmarks.2h2020"),
+    "Should only get a 'From BrowserX' folder when the 2h2020 pref is disabled"
+  );
   Assert.equal(
     MigrationUtils._importQuantities.bookmarks,
     itemsSeen.bookmarks + itemsSeen.folders,