browser/base/content/test/webextensions/browser.ini

@@ -30,4 +30,5 @@ skip-if = !e10s
 [browser_permissions_unsigned.js]
 skip-if = require_signing
 [browser_update_checkForUpdates.js]
+skip-if = os == "win" && os_version == "6.1" # Skip on Azure - frequent failure
 [browser_update_interactive_noprompt.js]

browser/base/content/test/webrtc/browser.ini

@@ -23,8 +23,11 @@ skip-if =
 https_first_disabled = true
 skip-if =
   os == "linux" && bits == 64 # linux: bug 976544, Bug 1616011
+  os == "win" && os_version == "6.1" # Skip on Azure - frequent failure
 [browser_devices_get_user_media_anim.js]
 https_first_disabled = true
+skip-if =
+  os == "win" && os_version == "6.1" # Skip on Azure - frequent failure
 [browser_devices_get_user_media_by_device_id.js]
 https_first_disabled = true
 [browser_devices_get_user_media_default_permissions.js]
@@ -32,12 +35,14 @@ https_first_disabled = true
 [browser_devices_get_user_media_in_frame.js]
 https_first_disabled = true
 skip-if = debug # bug 1369731
+  os == "win" && os_version == "6.1" # Skip on Azure - frequent failure
 [browser_devices_get_user_media_in_xorigin_frame.js]
 https_first_disabled = true
 skip-if =
   debug # bug 1369731
   apple_silicon   # bug 1707735
   apple_catalina  # platform migration
+  os == "win" && os_version == "6.1" # Skip on Azure - frequent failure
 [browser_devices_get_user_media_in_xorigin_frame_chain.js]
 https_first_disabled = true
 [browser_devices_get_user_media_multi_process.js]

browser/base/content/test/webrtc/gracePeriod/browser.ini

@@ -11,3 +11,5 @@ prefs =
   privacy.webrtc.sharedTabWarning=false
 
 [../browser_devices_get_user_media_grace.js]
+skip-if =
+  os == "win" && os_version == "6.1" # Skip on Azure - frequent failure

browser/base/content/test/webrtc/legacyIndicator/browser.ini

@@ -14,15 +14,20 @@ prefs =
 [../browser_devices_get_user_media.js]
 skip-if = 
   (os == "linux") # linux: bug 976544, bug 1616011
+  os == "win" && os_version == "6.1" # Skip on Azure - frequent failure
 [../browser_devices_get_user_media_anim.js]
+skip-if =
+  os == "win" && os_version == "6.1" # Skip on Azure - frequent failure
 [../browser_devices_get_user_media_default_permissions.js]
 [../browser_devices_get_user_media_in_frame.js]
 skip-if = debug # bug 1369731
+  os == "win" && os_version == "6.1" # Skip on Azure - frequent failure
 [../browser_devices_get_user_media_in_xorigin_frame.js]
 skip-if =
   debug # bug 1369731
   apple_silicon   # bug 1707735
   apple_catalina  # platform migration
+  os == "win" && os_version == "6.1" # Skip on Azure - frequent failure
 [../browser_devices_get_user_media_in_xorigin_frame_chain.js]
 [../browser_devices_get_user_media_multi_process.js]
 skip-if =

browser/base/content/utilityOverlay.js

@@ -319,6 +319,7 @@ function openLinkIn(url, where, params) {
         url,
         null,
         null,
+        null,
         true,
         true,
         aReferrerInfo,
@@ -335,7 +336,17 @@ function openLinkIn(url, where, params) {
         );
         return;
       }
-      saveURL(url, null, null, true, true, aReferrerInfo, null, aInitiatingDoc);
+      saveURL(
+        url,
+        null,
+        null,
+        null,
+        true,
+        true,
+        aReferrerInfo,
+        null,
+        aInitiatingDoc
+      );
     }
     return;
   }
@@ -1046,6 +1057,10 @@ function buildHelpMenu() {
     "helpSafeMode"
   ).disabled = !Services.policies.isAllowed("safeMode");
 
+  document.getElementById(
+    "troubleShooting"
+  ).disabled = !Services.policies.isAllowed("aboutSupport");
+
   let supportMenu = Services.policies.getSupportMenu();
   if (supportMenu) {
     let menuitem = document.getElementById("helpPolicySupport");

browser/base/content/webext-panels.js

@@ -43,7 +43,6 @@ function getBrowser(panel) {
   browser.setAttribute("context", "contentAreaContextMenu");
   browser.setAttribute("tooltip", "aHTMLTooltip");
   browser.setAttribute("autocompletepopup", "PopupAutoComplete");
-  browser.setAttribute("selectmenulist", "ContentSelectDropdown");
 
   // Ensure that the browser is going to run in the same bc group as the other
   // extension pages from the same addon.

browser/base/content/webext-panels.xhtml

@@ -59,20 +59,5 @@
                               gContextMenu = null;">
 #include browser-context.inc
     </menupopup>
-
-    <!-- for select dropdowns. The menupopup is what shows the list of options,
-         and the popuponly menulist makes things like the menuactive attributes
-         work correctly on the menupopup. ContentSelectDropdown expects the
-         popuponly menulist to be its immediate parent. -->
-    <menulist popuponly="true" id="ContentSelectDropdown" hidden="true">
-      <menupopup rolluponmousewheel="true"
-                 id="ContentSelectDropdownPopup"
-                 activateontab="true" position="after_start"
-                 level="parent"
-#ifdef XP_WIN
-                 consumeoutsideclicks="false" ignorekeys="shortcuts"
-#endif
-        />
-    </menulist>
   </popupset>
 </window>

browser/base/jar.mn

@@ -106,8 +106,9 @@ browser.jar:
         content/browser/spotlight.js                  (content/spotlight.js)
 *       content/browser/default-bookmarks.html        (content/default-bookmarks.html)
 
+        content/browser/languageNotification.js       (content/languageNotification.js)
+
 % override chrome://global/content/netError.xhtml chrome://browser/content/certerror/aboutNetError.xhtml
 
 # L10n resources and overrides.
-% override chrome://global/locale/appstrings.properties chrome://browser/locale/appstrings.properties
 % override chrome://global/locale/netError.dtd chrome://browser/locale/netError.dtd

browser/base/moz.build

@@ -87,6 +87,9 @@ if CONFIG["OS_ARCH"] == "WINNT" and CONFIG["MOZ_DEFAULT_BROWSER_AGENT"]:
     # Impacts `/toolkit/content/license.html`.
     DEFINES["MOZ_DEFAULT_BROWSER_AGENT"] = True
 
+if CONFIG["BASE_BROWSER_UPDATE"]:
+    DEFINES["BASE_BROWSER_UPDATE"] = True
+
 JAR_MANIFESTS += ["jar.mn"]
 
 GeneratedFile(

browser/components/BrowserContentHandler.jsm

@@ -37,6 +37,9 @@ XPCOMUtils.defineLazyGetter(this, "gSystemPrincipal", () =>
 );
 XPCOMUtils.defineLazyGlobalGetters(this, [URL]);
 
+const FORK_VERSION_PREF =
+  "browser.startup.homepage_override.basebrowser.version";
+
 // One-time startup homepage override configurations
 const ONCE_DOMAINS = ["mozilla.org", "firefox.com"];
 const ONCE_PREF = "browser.startup.homepage_override.once";
@@ -100,7 +103,8 @@ const OVERRIDE_NEW_BUILD_ID = 3;
  * Returns:
  *  OVERRIDE_NEW_PROFILE if this is the first run with a new profile.
  *  OVERRIDE_NEW_MSTONE if this is the first run with a build with a different
- *                      Gecko milestone (i.e. right after an upgrade).
+ *                      Gecko milestone or fork version (i.e. right after an
+ *                      upgrade).
  *  OVERRIDE_NEW_BUILD_ID if this is the first run with a new build ID of the
  *                        same Gecko milestone (i.e. after a nightly upgrade).
  *  OVERRIDE_NONE otherwise.
@@ -117,6 +121,8 @@ function needHomepageOverride(prefb) {
 
   var mstone = Services.appinfo.platformVersion;
 
+  var savedForkVersion = prefb.getCharPref(FORK_VERSION_PREF, null);
+
   var savedBuildID = prefb.getCharPref(
     "browser.startup.homepage_override.buildID",
     ""
@@ -138,9 +144,16 @@ function needHomepageOverride(prefb) {
 
     prefb.setCharPref("browser.startup.homepage_override.mstone", mstone);
     prefb.setCharPref("browser.startup.homepage_override.buildID", buildID);
+    prefb.setCharPref(FORK_VERSION_PREF, AppConstants.BASE_BROWSER_VERSION);
     return savedmstone ? OVERRIDE_NEW_MSTONE : OVERRIDE_NEW_PROFILE;
   }
 
+  if (AppConstants.BASE_BROWSER_VERSION != savedForkVersion) {
+    prefb.setCharPref("browser.startup.homepage_override.buildID", buildID);
+    prefb.setCharPref(FORK_VERSION_PREF, AppConstants.BASE_BROWSER_VERSION);
+    return OVERRIDE_NEW_MSTONE;
+  }
+
   if (buildID != savedBuildID) {
     prefb.setCharPref("browser.startup.homepage_override.buildID", buildID);
     return OVERRIDE_NEW_BUILD_ID;
@@ -651,6 +664,10 @@ nsBrowserContentHandler.prototype = {
         "browser.startup.homepage_override.buildID",
         "unknown"
       );
+
+      // We do the same for the fork version.
+      let old_forkVersion = prefb.getCharPref(FORK_VERSION_PREF, null);
+
       override = needHomepageOverride(prefb);
       if (override != OVERRIDE_NONE) {
         switch (override) {
@@ -662,8 +679,8 @@ nsBrowserContentHandler.prototype = {
             additionalPage = Services.urlFormatter.formatURLPref(
               "startup.homepage_welcome_url.additional"
             );
-            // Turn on 'later run' pages for new profiles.
-            LaterRun.enabled = true;
+            // Disable 'later run' pages for new profiles (tor-browser#41568)
+            LaterRun.enabled = false;
             break;
           case OVERRIDE_NEW_MSTONE:
             // Check whether we will restore a session. If we will, we assume
@@ -677,9 +694,10 @@ nsBrowserContentHandler.prototype = {
               "startup.homepage_override_url"
             );
             let update = UpdateManager.readyUpdate;
+            let old_version = old_forkVersion ? old_forkVersion : old_mstone;
             if (
               update &&
-              Services.vc.compare(update.appVersion, old_mstone) > 0
+              Services.vc.compare(update.appVersion, old_version) > 0
             ) {
               overridePage = getPostUpdateOverridePage(update, overridePage);
               // Send the update ping to signal that the update was successful.
@@ -687,6 +705,10 @@ nsBrowserContentHandler.prototype = {
             }
 
             overridePage = overridePage.replace("%OLD_VERSION%", old_mstone);
+            overridePage = overridePage.replace(
+              "%OLD_BASE_BROWSER_VERSION%",
+              old_forkVersion
+            );
             break;
           case OVERRIDE_NEW_BUILD_ID:
             if (UpdateManager.readyUpdate) {

browser/components/BrowserGlue.jsm

@@ -18,13 +18,9 @@ const { AppConstants } = ChromeUtils.import(
 );
 
 XPCOMUtils.defineLazyModuleGetters(this, {
-  AboutNewTab: "resource:///modules/AboutNewTab.jsm",
   ActorManagerParent: "resource://gre/modules/ActorManagerParent.jsm",
   AddonManager: "resource://gre/modules/AddonManager.jsm",
   AppMenuNotifications: "resource://gre/modules/AppMenuNotifications.jsm",
-  ASRouterDefaultConfig:
-    "resource://activity-stream/lib/ASRouterDefaultConfig.jsm",
-  ASRouterNewTabHook: "resource://activity-stream/lib/ASRouterNewTabHook.jsm",
   ASRouter: "resource://activity-stream/lib/ASRouter.jsm",
   AsyncShutdown: "resource://gre/modules/AsyncShutdown.jsm",
   BackgroundUpdate: "resource://gre/modules/BackgroundUpdate.jsm",
@@ -79,7 +75,6 @@ XPCOMUtils.defineLazyModuleGetters(this, {
   RFPHelper: "resource://gre/modules/RFPHelper.jsm",
   SafeBrowsing: "resource://gre/modules/SafeBrowsing.jsm",
   Sanitizer: "resource:///modules/Sanitizer.jsm",
-  SaveToPocket: "chrome://pocket/content/SaveToPocket.jsm",
   ScreenshotsUtils: "resource:///modules/ScreenshotsUtils.jsm",
   SearchSERPTelemetry: "resource:///modules/SearchSERPTelemetry.jsm",
   SessionStartup: "resource:///modules/sessionstore/SessionStartup.jsm",
@@ -226,28 +221,6 @@ let JSWINDOWACTORS = {
     remoteTypes: ["privilegedabout"],
   },
 
-  AboutNewTab: {
-    parent: {
-      moduleURI: "resource:///actors/AboutNewTabParent.jsm",
-    },
-    child: {
-      moduleURI: "resource:///actors/AboutNewTabChild.jsm",
-      events: {
-        DOMContentLoaded: {},
-        pageshow: {},
-        visibilitychange: {},
-      },
-    },
-    // The wildcard on about:newtab is for the ?endpoint query parameter
-    // that is used for snippets debugging. The wildcard for about:home
-    // is similar, and also allows for falling back to loading the
-    // about:home document dynamically if an attempt is made to load
-    // about:home?jscache from the AboutHomeStartupCache as a top-level
-    // load.
-    matches: ["about:home*", "about:welcome", "about:newtab*"],
-    remoteTypes: ["privilegedabout"],
-  },
-
   AboutPlugins: {
     parent: {
       moduleURI: "resource:///actors/AboutPluginsParent.jsm",
@@ -263,26 +236,6 @@ let JSWINDOWACTORS = {
     matches: ["about:plugins"],
   },
 
-  AboutPocket: {
-    parent: {
-      moduleURI: "resource:///actors/AboutPocketParent.jsm",
-    },
-    child: {
-      moduleURI: "resource:///actors/AboutPocketChild.jsm",
-
-      events: {
-        DOMDocElementInserted: { capture: true },
-      },
-    },
-
-    matches: [
-      "about:pocket-saved*",
-      "about:pocket-signup*",
-      "about:pocket-home*",
-      "about:pocket-style-guide*",
-    ],
-  },
-
   AboutPrivateBrowsing: {
     parent: {
       moduleURI: "resource:///actors/AboutPrivateBrowsingParent.jsm",
@@ -717,27 +670,6 @@ let JSWINDOWACTORS = {
     matches: ["about:studies*"],
   },
 
-  ASRouter: {
-    parent: {
-      moduleURI: "resource:///actors/ASRouterParent.jsm",
-    },
-    child: {
-      moduleURI: "resource:///actors/ASRouterChild.jsm",
-      events: {
-        // This is added so the actor instantiates immediately and makes
-        // methods available to the page js on load.
-        DOMDocElementInserted: {},
-      },
-    },
-    matches: [
-      "about:home*",
-      "about:newtab*",
-      "about:welcome*",
-      "about:privatebrowsing",
-    ],
-    remoteTypes: ["privilegedabout"],
-  },
-
   SwitchDocumentDirection: {
     child: {
       moduleURI: "resource:///actors/SwitchDocumentDirectionChild.jsm",
@@ -1248,6 +1180,20 @@ BrowserGlue.prototype = {
     // handle any UI migration
     this._migrateUI();
 
+    // Clear possibly auto enabled enterprise_roots prefs (see bug 40166)
+    if (
+      !Services.prefs.getBoolPref(
+        "security.certerrors.mitm.auto_enable_enterprise_roots"
+      ) &&
+      Services.prefs.getBoolPref(
+        "security.enterprise_roots.auto-enabled",
+        false
+      )
+    ) {
+      Services.prefs.clearUserPref("security.enterprise_roots.enabled");
+      Services.prefs.clearUserPref("security.enterprise_roots.auto-enabled");
+    }
+
     if (!Services.prefs.prefHasUserValue(PREF_PDFJS_ISDEFAULT_CACHE_STATE)) {
       PdfJs.checkIsDefault(this._isNewProfile);
     }
@@ -1262,8 +1208,6 @@ BrowserGlue.prototype = {
       Normandy.init();
     }
 
-    SaveToPocket.init();
-
     AboutHomeStartupCache.init();
 
     Services.obs.notifyObservers(null, "browser-ui-startup-complete");
@@ -1586,8 +1530,6 @@ BrowserGlue.prototype = {
 
   // the first browser window has finished initializing
   _onFirstWindowLoaded: function BG__onFirstWindowLoaded(aWindow) {
-    AboutNewTab.init();
-
     TabCrashHandler.init();
 
     ProcessHangMonitor.init();
@@ -1679,7 +1621,9 @@ BrowserGlue.prototype = {
     this._firstWindowTelemetry(aWindow);
     this._firstWindowLoaded();
 
-    this._collectStartupConditionsTelemetry();
+    if (AppConstants.MOZ_TELEMETRY_REPORTING) {
+      this._collectStartupConditionsTelemetry();
+    }
 
     // Set the default favicon size for UI views that use the page-icon protocol.
     PlacesUtils.favicons.setDefaultIconURIPreferredSize(
@@ -1990,9 +1934,14 @@ BrowserGlue.prototype = {
       () => PageDataService.uninit(),
       () => PageThumbs.uninit(),
       () => NewTabUtils.uninit(),
-      () => Normandy.uninit(),
+
+      () => {
+        if (AppConstants.MOZ_NORMANDY) {
+          Normandy.uninit();
+        }
+      },
+
       () => RFPHelper.uninit(),
-      () => ASRouterNewTabHook.destroy(),
       () => UpdateListener.reset(),
     ];
 
@@ -2069,19 +2018,21 @@ BrowserGlue.prototype = {
     // There is no pref for this add-on because it shouldn't be disabled.
     const ID = "addons-search-detection@mozilla.com";
 
-    let addon = await AddonManager.getAddonByID(ID);
+    try {
+      let addon = await AddonManager.getAddonByID(ID);
 
-    // first time install of addon and install on firefox update
-    addon =
-      (await AddonManager.maybeInstallBuiltinAddon(
-        ID,
-        "2.0.0",
-        "resource://builtin-addons/search-detection/"
-      )) || addon;
+      // first time install of addon and install on firefox update
+      addon =
+        (await AddonManager.maybeInstallBuiltinAddon(
+          ID,
+          "2.0.0",
+          "resource://builtin-addons/search-detection/"
+        )) || addon;
 
-    if (!addon.isActive) {
-      addon.enable();
-    }
+      if (addon && !addon.isActive) {
+        addon.enable();
+      }
+    } catch (e) {}
   },
 
   _monitorHTTPSOnlyPref() {
@@ -2331,8 +2282,6 @@ BrowserGlue.prototype = {
     this._monitorScreenshotsPref();
     this._monitorWebcompatReporterPref();
     this._monitorHTTPSOnlyPref();
-    this._monitorIonPref();
-    this._monitorIonStudies();
     this._setupSearchDetection();
 
     this._monitorGPCPref();
@@ -2627,11 +2576,23 @@ BrowserGlue.prototype = {
 
       {
         task: () => {
-          // Init the url query stripping list.
-          let urlQueryStrippingListService = Cc[
-            "@mozilla.org/query-stripping-list-service;1"
-          ].getService(Ci.nsIURLQueryStrippingListService);
-          urlQueryStrippingListService.init();
+          // tor-browser#40788: Do not initialize
+          // nsIURLQueryStrippingListService to prevent it from initializing
+          // its remote settings if it's disabled.
+          // See also https://bugzilla.mozilla.org/show_bug.cgi?id=1812594
+          let enabledPref = "privacy.query_stripping.enabled";
+          let enabledPBMPref = "privacy.query_stripping.enabled.pbmode";
+
+          if (
+            Services.prefs.getBoolPref(enabledPref, false) ||
+            Services.prefs.getBoolPref(enabledPBMPref, false)
+          ) {
+            // Init the url query stripping list.
+            let urlQueryStrippingListService = Cc[
+              "@mozilla.org/query-stripping-list-service;1"
+            ].getService(Ci.nsIURLQueryStrippingListService);
+            urlQueryStrippingListService.init();
+          }
         },
       },
 
@@ -2701,12 +2662,6 @@ BrowserGlue.prototype = {
         },
       },
 
-      {
-        task: () => {
-          ASRouterNewTabHook.createInstance(ASRouterDefaultConfig());
-        },
-      },
-
       {
         condition: AppConstants.MOZ_UPDATE_AGENT,
         task: () => {
@@ -2861,13 +2816,21 @@ BrowserGlue.prototype = {
         }
       },
 
-      () => BrowserUsageTelemetry.reportProfileCount(),
+      () => {
+        if (AppConstants.MOZ_TELEMETRY_REPORTING) {
+          BrowserUsageTelemetry.reportProfileCount();
+        }
+      },
 
       () => OsEnvironment.reportAllowedAppSources(),
 
       () => Services.search.runBackgroundChecks(),
 
-      () => BrowserUsageTelemetry.reportInstallationTelemetry(),
+      () => {
+        if (AppConstants.MOZ_TELEMETRY_REPORTING) {
+          BrowserUsageTelemetry.reportInstallationTelemetry();
+        }
+      },
     ];
 
     for (let task of idleTasks) {
@@ -5792,12 +5755,8 @@ var AboutHomeStartupCache = {
       return { pageInputStream: null, scriptInputStream: null };
     }
 
-    let state = AboutNewTab.activityStream.store.getState();
-    return new Promise(resolve => {
-      this._cacheDeferred = resolve;
-      this.log.trace("Parent is requesting cache streams.");
-      this._procManager.sendAsyncMessage(this.CACHE_REQUEST_MESSAGE, { state });
-    });
+    this.log.error("Activity Stream is disabled.");
+    return { pageInputStream: null, scriptInputStream: null };
   },
 
   /**

browser/components/about/AboutRedirector.cpp

@@ -70,12 +70,14 @@ static const RedirEntry kRedirMap[] = {
          nsIAboutModule::URI_CAN_LOAD_IN_PRIVILEGEDABOUT_PROCESS |
          nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
          nsIAboutModule::IS_SECURE_CHROME_UI},
+#ifndef BASE_BROWSER_VERSION
     {"firefoxview", "chrome://browser/content/firefoxview.html",
      nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::IS_SECURE_CHROME_UI |
          nsIAboutModule::HIDE_FROM_ABOUTABOUT},
+#endif
     {"policies", "chrome://browser/content/policies/aboutPolicies.html",
      nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::IS_SECURE_CHROME_UI},
-    {"privatebrowsing", "chrome://browser/content/aboutPrivateBrowsing.html",
+    {"privatebrowsing", "about:blank",
      nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
          nsIAboutModule::URI_MUST_LOAD_IN_CHILD | nsIAboutModule::ALLOW_SCRIPT |
          nsIAboutModule::URI_CAN_LOAD_IN_PRIVILEGEDABOUT_PROCESS},
@@ -106,6 +108,7 @@ static const RedirEntry kRedirMap[] = {
          nsIAboutModule::URI_CAN_LOAD_IN_PRIVILEGEDABOUT_PROCESS |
          nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
          nsIAboutModule::ALLOW_SCRIPT},
+#ifndef BASE_BROWSER_VERSION
     {"pocket-saved", "chrome://pocket/content/panels/saved.html",
      nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
          nsIAboutModule::URI_CAN_LOAD_IN_CHILD | nsIAboutModule::ALLOW_SCRIPT |
@@ -122,6 +125,7 @@ static const RedirEntry kRedirMap[] = {
      nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
          nsIAboutModule::URI_CAN_LOAD_IN_CHILD | nsIAboutModule::ALLOW_SCRIPT |
          nsIAboutModule::HIDE_FROM_ABOUTABOUT},
+#endif
     {"preferences", "chrome://browser/content/preferences/preferences.xhtml",
      nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::IS_SECURE_CHROME_UI},
     {"downloads",
@@ -133,14 +137,6 @@ static const RedirEntry kRedirMap[] = {
          nsIAboutModule::HIDE_FROM_ABOUTABOUT},
     {"restartrequired", "chrome://browser/content/aboutRestartRequired.xhtml",
      nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::HIDE_FROM_ABOUTABOUT},
-    {"protections", "chrome://browser/content/protections.html",
-     nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
-         nsIAboutModule::URI_MUST_LOAD_IN_CHILD | nsIAboutModule::ALLOW_SCRIPT |
-         nsIAboutModule::URI_CAN_LOAD_IN_PRIVILEGEDABOUT_PROCESS |
-         nsIAboutModule::IS_SECURE_CHROME_UI},
-    {"ion", "chrome://browser/content/ion.html",
-     nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::HIDE_FROM_ABOUTABOUT |
-         nsIAboutModule::IS_SECURE_CHROME_UI},
 };
 
 static nsAutoCString GetAboutModuleName(nsIURI* aURI) {
@@ -194,7 +190,8 @@ AboutRedirector::NewChannel(nsIURI* aURI, nsILoadInfo* aLoadInfo,
       // enabled about:newtab. Disabled about:newtab page uses fallback.
       if (path.EqualsLiteral("home") ||
           (StaticPrefs::browser_newtabpage_enabled() &&
-           path.EqualsLiteral("newtab"))) {
+           path.EqualsLiteral("newtab")) ||
+          path.EqualsLiteral("privatebrowsing")) {
         nsCOMPtr<nsIAboutNewTabService> aboutNewTabService =
             do_GetService("@mozilla.org/browser/aboutnewtab-service;1", &rv);
         NS_ENSURE_SUCCESS(rv, rv);

browser/components/about/components.conf

@@ -12,17 +12,10 @@ pages = [
     'home',
     'logins',
     'loginsimportreport',
-    'firefoxview',
     'newtab',
-    'ion',
-    'pocket-home',
-    'pocket-saved',
-    'pocket-signup',
-    'pocket-style-guide',
     'policies',
     'preferences',
     'privatebrowsing',
-    'protections',
     'profiling',
     'reader',
     'restartrequired',

browser/components/aboutlogins/AboutLoginsParent.jsm

@@ -62,6 +62,7 @@ XPCOMUtils.defineLazyGetter(this, "AboutLoginsL10n", () => {
 const ABOUT_LOGINS_ORIGIN = "about:logins";
 const AUTH_TIMEOUT_MS = 5 * 60 * 1000; // 5 minutes
 const PRIMARY_PASSWORD_NOTIFICATION_ID = "primary-password-login-required";
+const NOCERTDB_PREF = "security.nocertdb";
 
 // about:logins will always use the privileged content process,
 // even if it is disabled for other consumers such as about:newtab.
@@ -323,6 +324,7 @@ class AboutLoginsParent extends JSWindowActorParent {
         importVisible:
           Services.policies.isAllowed("profileImport") &&
           AppConstants.platform != "linux",
+        canCreateLogins: !Services.prefs.getBoolPref(NOCERTDB_PREF, false),
       });
 
       await AboutLogins.sendAllLoginRelatedObjects(

browser/components/aboutlogins/content/aboutLogins.css

@@ -62,6 +62,11 @@ login-item[data-editing="true"] + login-intro,
   display: none;
 }
 
+/* Do not promote Mozilla Sync. */
+login-intro {
+  display: none !important;
+}
+
 .heading-wrapper {
   display: flex;
   justify-content: center;

browser/components/aboutlogins/content/aboutLogins.js

@@ -22,6 +22,9 @@ const gElements = {
       ".menuitem-remove-all-logins"
     );
   },
+  get createNewLoginButton() {
+    return this.loginList.shadowRoot.querySelector(".create-login-button");
+  },
 };
 
 let numberOfLogins = 0;
@@ -128,6 +131,9 @@ window.addEventListener("AboutLoginsChromeToContent", event => {
       gElements.loginList.setSortDirection(event.detail.value.selectedSort);
       document.documentElement.classList.add("initialized");
       gElements.loginList.classList.add("initialized");
+      if (!event.detail.value.canCreateLogins) {
+        gElements.createNewLoginButton.disabled = true;
+      }
       break;
     }
     case "ShowLoginItemError": {

browser/components/aboutlogins/content/components/fxaccounts-button.css

@@ -8,6 +8,11 @@
   align-items: center;
 }
 
+/* Do not promote Mozilla Sync. */
+.logged-out-view {
+  display: none !important;
+}
+
 .fxaccounts-extra-text {
   /* Only show at most 3 lines of text to limit the
      text from overflowing the header. */

browser/components/attribution/AttributionCode.jsm

@@ -66,6 +66,7 @@ const ATTR_CODE_KEYS = [
   "ua",
   "dltoken",
   "msstoresignedin",
+  "dlsource",
 ];
 
 let gCachedAttrData = null;

browser/components/attribution/test/xpcshell/head.js

@@ -64,6 +64,12 @@ let validAttrCodes = [
     code: "dltoken%3Dc18f86a3-f228-4d98-91bb-f90135c0aa9c",
     parsed: { dltoken: "c18f86a3-f228-4d98-91bb-f90135c0aa9c" },
   },
+  {
+    code: "dlsource%3Dsome-dl-source",
+    parsed: {
+      dlsource: "some-dl-source",
+    },
+  },
 ];
 
 let invalidAttrCodes = [

browser/components/customizableui/CustomizableUI.jsm

@@ -65,6 +65,11 @@ const kSubviewEvents = ["ViewShowing", "ViewHiding"];
  */
 var kVersion = 17;
 
+/**
+ * The current version for base browser.
+ */
+var kVersionBaseBrowser = 1;
+
 /**
  * Buttons removed from built-ins by version they were removed. kVersion must be
  * bumped any time a new id is added to this. Use the button id as key, and
@@ -218,6 +223,7 @@ var CustomizableUIInternal = {
     this._updateForNewVersion();
     this._updateForNewProtonVersion();
     this._markObsoleteBuiltinButtonsSeen();
+    this._updateForBaseBrowser();
 
     this.registerArea(
       CustomizableUI.AREA_FIXED_OVERFLOW_PANEL,
@@ -236,10 +242,15 @@ var CustomizableUIInternal = {
       Services.policies.isAllowed("removeHomeButtonByDefault")
         ? null
         : "home-button",
-      "spring",
+      // Don't want springs either side of the urlbar. tor-browser#41736
       "urlbar-container",
-      "spring",
-      "save-to-pocket-button",
+      // save-to-pocket-button is entirely disabled. See tor-browser#18886 and
+      // tor-browser#31602.
+      // Base-browser additions tor-browser#41736. If you want to add to, remove
+      // from, or rearrange this list, then bump the kVersionBaseBrowser and
+      // update existing saved states in _updateForBaseBrowser.
+      "security-level-button",
+      "new-identity-button",
       "downloads-button",
       AppConstants.MOZ_DEV_EDITION ? "developer-button" : null,
       "fxa-toolbar-menu-button",
@@ -255,6 +266,10 @@ var CustomizableUIInternal = {
       },
       true
     );
+    // navbarPlacements does not match the initial default XHTML layout.
+    // Therefore we always need to rebuild the navbar area when
+    // registerToolbarNode is called. tor-browser#41736
+    gDirtyAreaCache.add(CustomizableUI.AREA_NAVBAR);
 
     if (AppConstants.MENUBAR_CAN_AUTOHIDE) {
       this.registerArea(
@@ -687,6 +702,104 @@ var CustomizableUIInternal = {
     }
   },
 
+  _updateForBaseBrowser() {
+    if (!gSavedState) {
+      // Use the defaults.
+      return;
+    }
+
+    const currentVersion = gSavedState.currentVersionBaseBrowser;
+
+    if (currentVersion < 1) {
+      // NOTE: In base-browser/tor-browser version 12.5a5, and earlier, the
+      // toolbar was configured by setting the full JSON string for the default
+      // "browser.uiCustomization.state" preference value. The disadvantage is
+      // that we could not update this value in a way that existing users (who
+      // would have non-default preference values) would also get the desired
+      // change (e.g. for adding or removing a button).
+      //
+      // With tor-browser#41736 we want to switch to changing the toolbar
+      // dynamically like firefox. Therefore, this first version transfer simply
+      // gets the toolbar into the same state we wanted before, away from the
+      // default firefox state.
+      //
+      // If an existing user state aligned with the previous default
+      // "browser.uiCustomization.state" then this shouldn't visibly change
+      // anything.
+      // If a user explicitly customized the toolbar to go back to the firefox
+      // default, then this may undo those changes.
+      const navbarPlacements =
+        gSavedState.placements[CustomizableUI.AREA_NAVBAR];
+      if (navbarPlacements) {
+        const getBeforeAfterUrlbar = () => {
+          // NOTE: The urlbar is non-removable from the navbar, so should have
+          // an index.
+          const index = navbarPlacements.indexOf("urlbar-container");
+          let after = index + 1;
+          if (
+            after < navbarPlacements.length &&
+            navbarPlacements[after] === "search-container"
+          ) {
+            // Skip past the search-container.
+            after++;
+          }
+          return { before: index - 1, after };
+        };
+
+        // Remove the urlbar springs either side of the urlbar.
+        const { before, after } = getBeforeAfterUrlbar();
+        if (
+          after < navbarPlacements.length &&
+          this.matchingSpecials(navbarPlacements[after], "spring")
+        ) {
+          // Remove the spring after.
+          navbarPlacements.splice(after, 1);
+          // NOTE: The `before` index does not change.
+        }
+        if (
+          before >= 0 &&
+          this.matchingSpecials(navbarPlacements[before], "spring")
+        ) {
+          // Remove the spring before.
+          navbarPlacements.splice(before, 1);
+        }
+
+        // Make sure the security-level-button and new-identity-button appears
+        // in the toolbar.
+        for (const id of ["new-identity-button", "security-level-button"]) {
+          let alreadyAdded = false;
+          for (const placements of Object.values(gSavedState.placements)) {
+            if (placements.includes(id)) {
+              alreadyAdded = true;
+              break;
+            }
+          }
+          if (alreadyAdded) {
+            continue;
+          }
+
+          // Add to the nav-bar, after the urlbar-container.
+          // NOTE: We have already removed the spring after the urlbar.
+          navbarPlacements.splice(getBeforeAfterUrlbar().after, 0, id);
+        }
+      }
+
+      // Remove save-to-pocket-button. See tor-browser#18886 and
+      // tor-browser#31602.
+      for (const placements of Object.values(gSavedState.placements)) {
+        let buttonIndex = placements.indexOf("save-to-pocket-button");
+        if (buttonIndex != -1) {
+          placements.splice(buttonIndex, 1);
+        }
+      }
+
+      // Remove unused fields that used to be part of
+      // "browser.uiCustomization.state".
+      delete gSavedState.placements["PanelUI-contents"];
+      delete gSavedState.placements["addon-bar"];
+    }
+  },
+
   _placeNewDefaultWidgetsInArea(aArea) {
     let futurePlacedWidgets = gFuturePlacements.get(aArea);
     let savedPlacements =
@@ -2501,6 +2614,10 @@ var CustomizableUIInternal = {
       gSavedState.currentVersion = 0;
     }
 
+    if (!("currentVersionBaseBrowser" in gSavedState)) {
+      gSavedState.currentVersionBaseBrowser = 0;
+    }
+
     gSeenWidgets = new Set(gSavedState.seen || []);
     gDirtyAreaCache = new Set(gSavedState.dirtyAreaCache || []);
     gNewElementCount = gSavedState.newElementCount || 0;
@@ -2579,6 +2696,7 @@ var CustomizableUIInternal = {
       seen: gSeenWidgets,
       dirtyAreaCache: gDirtyAreaCache,
       currentVersion: kVersion,
+      currentVersionBaseBrowser: kVersionBaseBrowser,
       newElementCount: gNewElementCount,
     };