initial commit

2017-09-20 19:13:30 +02:00 · 2017-09-20 19:13:30 +02:00 · c93b53f9fc
commit c93b53f9fc
7 changed files with 755 additions and 0 deletions
--- a/disable-datasharing-infobar.patch
+++ b/disable-datasharing-infobar.patch
@ -0,0 +1,12 @@
+--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
+@@ -1636,9 +1636,6 @@ var gBrowserInit = {
+     // initialize the sync UI
+     gSync.init();
+ 
+-    if (AppConstants.MOZ_DATA_REPORTING)
+-      gDataNotificationInfoBar.init();
+-
+     gBrowserThumbnails.init();
+ 
+     gExtensionsNotifications.init();
--- a/disable-locationservice.patch
+++ b/disable-locationservice.patch
@ -0,0 +1,24 @@
+--- a/toolkit/components/search/nsSearchService.js
+++ b/toolkit/components/search/nsSearchService.js
+@@ -395,6 +395,10 @@ function migrateRegionPrefs() {
+     return;
+   }
+ 
+  // Prevent Firefox from contacting location.services.mozilla.com on a new profile
+  Services.prefs.setCharPref("browser.search.region", "US");
+  return;
+
+   // If we have 'isUS' but no 'countryCode' then we are almost certainly
+   // a profile from Fx 34/35 that set 'isUS' based purely on a timezone
+   // check. If this said they were US, we force region to be US.
+@@ -478,6 +482,10 @@ var ensureKnownCountryCode = async funct
+   // If we have a country-code already stored in our prefs we trust it.
+   let countryCode = Services.prefs.getCharPref("browser.search.countryCode", "");
+ 
+  // No countryCode set, use US as default, don't contact location.services.mozilla.com
+  Services.prefs.setCharPref("browser.search.countryCode", "US");
+  return;
+
+   if (!countryCode) {
+     // We don't have it cached, so fetch it. fetchCountryCode() will call
+     // storeCountryCode if it gets a result (even if that happens after the
--- a/disable-pocket.patch
+++ b/disable-pocket.patch
@ -0,0 +1,90 @@
+--- a/browser/extensions/moz.build
+++ b/browser/extensions/moz.build
+@@ -10,7 +10,6 @@ DIRS += [
+     'e10srollout',
+     'followonsearch',
+     'pdfjs',
+-    'pocket',
+     'screenshots',
+     'shield-recipe-client',
+     'webcompat',
+--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
+@@ -200,7 +200,7 @@ pref("extensions.{972ce4c6-7e08-4474-a28
+ pref("extensions.{972ce4c6-7e08-4474-a285-3208198ce6fd}.description", "chrome://browser/locale/browser.properties");
+ 
+ pref("extensions.webextensions.themes.enabled", true);
+-pref("extensions.webextensions.themes.icons.buttons", "back,forward,reload,stop,bookmark_star,bookmark_menu,downloads,home,app_menu,cut,copy,paste,new_window,new_private_window,save_page,print,history,full_screen,find,options,addons,developer,synced_tabs,open_file,sidebars,share_page,subscribe,text_encoding,email_link,forget,pocket");
+pref("extensions.webextensions.themes.icons.buttons", "back,forward,reload,stop,bookmark_star,bookmark_menu,downloads,home,app_menu,cut,copy,paste,new_window,new_private_window,save_page,print,history,full_screen,find,options,addons,developer,synced_tabs,open_file,sidebars,share_page,subscribe,text_encoding,email_link,forget");
+ 
+ pref("lightweightThemes.update.enabled", true);
+ pref("lightweightThemes.getMoreURL", "https://addons.mozilla.org/%LOCALE%/firefox/themes");
+@@ -1630,8 +1630,6 @@ pref("browser.migrate.chrome.history.max
+ // Enable browser frames for use on desktop.  Only exposed to chrome callers.
+ pref("dom.mozBrowserFramesEnabled", true);
+ 
+-pref("extensions.pocket.enabled", true);
+-
+ pref("signon.schemeUpgrades", true);
+ 
+ // "Simplify Page" feature in Print Preview. This feature is disabled by default
+--- a/browser/components/uitour/UITour.jsm
+++ b/browser/components/uitour/UITour.jsm
+@@ -188,11 +188,6 @@ this.UITour = {
+           aDocument.getElementById(buttonId) : null;
+       }
+     }],
+-    ["pocket", {
+-      allowAdd: true,
+-      query: "#pocket-button",
+-      widgetName: "pocket-button",
+-    }],
+     ["privateWindow", {
+       query(aDocument) {
+         let buttonId = gPhotonStructure ? "appMenu-private-window-button"
+@@ -1363,45 +1358,6 @@ this.UITour = {
+         popup.addEventListener("popupshown", onPopupShown);
+       }
+       aWindow.document.getElementById("identity-box").click();
+-    } else if (aMenuName == "pocket") {
+-      this.getTarget(aWindow, "pocket").then(async function onPocketTarget(target) {
+-        let widgetGroupWrapper = CustomizableUI.getWidget(target.widgetName);
+-        if (widgetGroupWrapper.type != "view" || !widgetGroupWrapper.viewId) {
+-          log.error("Can't open the pocket menu without a view");
+-          return;
+-        }
+-        let placement = CustomizableUI.getPlacementOfWidget(target.widgetName);
+-        if (!placement || !placement.area) {
+-          log.error("Can't open the pocket menu without a placement");
+-          return;
+-        }
+-
+-        if (placement.area == CustomizableUI.AREA_PANEL) {
+-          // Open the appMenu and wait for it if it's not already opened or showing a subview.
+-          await new Promise((resolve, reject) => {
+-            if (aWindow.PanelUI.panel.state != "closed") {
+-              if (aWindow.PanelUI.multiView.showingSubView) {
+-                reject("A subview is already showing");
+-                return;
+-              }
+-
+-              resolve();
+-              return;
+-            }
+-
+-            aWindow.PanelUI.panel.addEventListener("popupshown", function() {
+-              resolve();
+-            }, {once: true});
+-
+-            aWindow.PanelUI.show();
+-          });
+-        }
+-
+-        let widgetWrapper = widgetGroupWrapper.forWindow(aWindow);
+-        aWindow.PanelUI.showSubView(widgetGroupWrapper.viewId,
+-                                    widgetWrapper.anchor,
+-                                    placement.area);
+-      }).catch(log.error);
+     }
+   },
+ 
--- a/disable-reader.patch
+++ b/disable-reader.patch
@ -0,0 +1,99 @@
+--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
+@@ -71,7 +71,6 @@ XPCOMUtils.defineLazyGetter(this, "exten
+   ["ProcessHangMonitor", "resource:///modules/ProcessHangMonitor.jsm"],
+   ["PromiseUtils", "resource://gre/modules/PromiseUtils.jsm"],
+   ["ReaderMode", "resource://gre/modules/ReaderMode.jsm"],
+-  ["ReaderParent", "resource:///modules/ReaderParent.jsm"],
+   ["RecentWindow", "resource:///modules/RecentWindow.jsm"],
+   ["SessionStore", "resource:///modules/sessionstore/SessionStore.jsm"],
+   ["ShortcutUtils", "resource://gre/modules/ShortcutUtils.jsm"],
+@@ -4725,7 +4724,6 @@ var XULBrowserWindow = {
+       }
+     }
+     UpdateBackForwardCommands(gBrowser.webNavigation);
+-    ReaderParent.updateReaderButton(gBrowser.selectedBrowser);
+ 
+     gGestureSupport.restoreRotationState();
+ 
+--- a/browser/base/content/browser-sets.inc
+++ b/browser/base/content/browser-sets.inc
+@@ -48,7 +48,6 @@
+     <command id="View:PageSource" oncommand="BrowserViewSource(window.gBrowser.selectedBrowser);" observes="canViewSource"/>
+     <command id="View:PageInfo" oncommand="BrowserPageInfo();"/>
+     <command id="View:FullScreen" oncommand="BrowserFullScreen();"/>
+-    <command id="View:ReaderView" oncommand="ReaderParent.toggleReaderMode(event);"/>
+     <command id="cmd_find"
+              oncommand="gFindBar.onFindCommand();"
+              observes="isImage"/>
+--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
+@@ -902,10 +902,6 @@
+                        hidden="true"
+                        tooltiptext="&pageReportIcon.tooltip;"
+                        onmousedown="gPopupBlockerObserver.onReportButtonMousedown(event);"/>
+-                <image id="reader-mode-button"
+-                       class="urlbar-icon"
+-                       hidden="true"
+-                       onclick="ReaderParent.buttonClick(event);"/>
+                 <toolbarbutton id="urlbar-zoom-button"
+                        onclick="FullZoom.reset();"
+                        tooltip="dynamic-shortcut-tooltip"
+--- a/browser/components/nsBrowserGlue.js
+++ b/browser/components/nsBrowserGlue.js
+@@ -83,7 +83,6 @@ let initializedModules = {};
+   ["PluralForm", "resource://gre/modules/PluralForm.jsm"],
+   ["PrivateBrowsingUtils", "resource://gre/modules/PrivateBrowsingUtils.jsm"],
+   ["ProcessHangMonitor", "resource:///modules/ProcessHangMonitor.jsm"],
+-  ["ReaderParent", "resource:///modules/ReaderParent.jsm"],
+   ["RecentWindow", "resource:///modules/RecentWindow.jsm"],
+   ["RemotePrompt", "resource:///modules/RemotePrompt.jsm"],
+   ["SessionStore", "resource:///modules/sessionstore/SessionStore.jsm"],
+@@ -156,9 +155,6 @@ const listeners = {
+     "FormValidation:ShowPopup": ["FormValidationHandler"],
+     "FormValidation:HidePopup": ["FormValidationHandler"],
+     "Prompt:Open": ["RemotePrompt"],
+-    "Reader:ArticleGet": ["ReaderParent"],
+-    "Reader:FaviconRequest": ["ReaderParent"],
+-    "Reader:UpdateReaderButton": ["ReaderParent"],
+     // PLEASE KEEP THIS LIST IN SYNC WITH THE LISTENERS ADDED IN LoginManagerParent.init
+     "RemoteLogins:findLogins": ["LoginManagerParent"],
+     "RemoteLogins:findRecipes": ["LoginManagerParent"],
+--- a/browser/components/uitour/UITour.jsm
+++ b/browser/components/uitour/UITour.jsm
+@@ -32,8 +32,6 @@ XPCOMUtils.defineLazyModuleGetter(this,
+   "resource://gre/modules/PrivateBrowsingUtils.jsm");
+ XPCOMUtils.defineLazyModuleGetter(this, "ProfileAge",
+   "resource://gre/modules/ProfileAge.jsm");
+-XPCOMUtils.defineLazyModuleGetter(this, "ReaderParent",
+-  "resource:///modules/ReaderParent.jsm");
+ 
+ XPCOMUtils.defineLazyPreferenceGetter(this, "gPhotonStructure", "browser.photon.structure.enabled");
+ 
+@@ -663,15 +661,10 @@ this.UITour = {
+       }
+ 
+       case "forceShowReaderIcon": {
+-        ReaderParent.forceShowReaderIcon(browser);
+         break;
+       }
+ 
+       case "toggleReaderMode": {
+-        let targetPromise = this.getTarget(window, "readerMode-urlBar");
+-        targetPromise.then(target => {
+-          ReaderParent.toggleReaderMode({target: target.node});
+-        });
+         break;
+       }
+ 
+--- a/browser/modules/moz.build
+++ b/browser/modules/moz.build
+@@ -150,7 +150,6 @@
+     'PermissionUI.jsm',
+     'PluginContent.jsm',
+     'ProcessHangMonitor.jsm',
+-    'ReaderParent.jsm',
+     'RecentWindow.jsm',
+     'RemotePrompt.jsm',
+     'Sanitizer.jsm',
+
--- a/disable-sponsored-tiles.patch
+++ b/disable-sponsored-tiles.patch
@ -0,0 +1,96 @@
+--- a/browser/modules/DirectoryLinksProvider.jsm
+++ b/browser/modules/DirectoryLinksProvider.jsm
+@@ -86,7 +86,7 @@ var DirectoryLinksProvider = {
+    * @return  the selected locale or "en-US" if none is selected
+    */
+   get locale() {
+-    return Services.locale.getRequestedLocale() || "en-US";
+    return "en-US";
+   },
+ 
+   /**
+@@ -138,13 +138,6 @@ var DirectoryLinksProvider = {
+   },
+ 
+   _fetchAndCacheLinks: function DirectoryLinksProvider_fetchAndCacheLinks(uri) {
+-    // Replace with the same display locale used for selecting links data
+-    uri = uri.replace("%LOCALE%", this.locale);
+-    uri = uri.replace("%CHANNEL%", UpdateUtils.UpdateChannel);
+-
+-    return this._downloadJsonData(uri).then(json => {
+-      return OS.File.writeAtomic(this._directoryFilePath, json, {tmpPath: this._directoryFilePath + ".tmp"});
+-    });
+   },
+ 
+   /**
+@@ -153,33 +146,6 @@ var DirectoryLinksProvider = {
+    * @return promise resolved to json string, "{}" returned if status != 200
+    */
+   _downloadJsonData: function DirectoryLinksProvider__downloadJsonData(uri) {
+-    return new Promise((resolve, reject) => {
+-      let xmlHttp = this._newXHR();
+-
+-      xmlHttp.onload = function(aResponse) {
+-        let json = this.responseText;
+-        if (this.status && this.status != 200) {
+-          json = "{}";
+-        }
+-        resolve(json);
+-      };
+-
+-      xmlHttp.onerror = function(e) {
+-        reject("Fetching " + uri + " results in error code: " + e.target.status);
+-      };
+-
+-      try {
+-        xmlHttp.open("GET", uri);
+-        // Override the type so XHR doesn't complain about not well-formed XML
+-        xmlHttp.overrideMimeType(DIRECTORY_LINKS_TYPE);
+-        // Set the appropriate request type for servers that require correct types
+-        xmlHttp.setRequestHeader("Content-Type", DIRECTORY_LINKS_TYPE);
+-        xmlHttp.send();
+-      } catch (e) {
+-        reject("Error fetching " + uri);
+-        Cu.reportError(e);
+-      }
+-    });
+   },
+ 
+   /**
+@@ -187,30 +153,6 @@ var DirectoryLinksProvider = {
+    * @return promise resolved immediately if no download needed, or upon completion
+    */
+   _fetchAndCacheLinksIfNecessary: function DirectoryLinksProvider_fetchAndCacheLinksIfNecessary(forceDownload = false) {
+-    if (this._downloadDeferred) {
+-      // fetching links already - just return the promise
+-      return this._downloadDeferred.promise;
+-    }
+-
+-    if (forceDownload || this._needsDownload) {
+-      this._downloadDeferred = Promise.defer();
+-      this._fetchAndCacheLinks(this._linksURL).then(() => {
+-        // the new file was successfully downloaded and cached, so update a timestamp
+-        this._lastDownloadMS = Date.now();
+-        this._downloadDeferred.resolve();
+-        this._downloadDeferred = null;
+-        this._callObservers("onManyLinksChanged")
+-      },
+-      error => {
+-        this._downloadDeferred.resolve();
+-        this._downloadDeferred = null;
+-        this._callObservers("onDownloadFail");
+-      });
+-      return this._downloadDeferred.promise;
+-    }
+-
+-    // download is not needed
+-    return Promise.resolve();
+   },
+ 
+   /**
+@@ -376,3 +318,4 @@ var DirectoryLinksProvider = {
+     this._observers.clear();
+   }
+ };
+
+
--- a/disable-telemetry.patch
+++ b/disable-telemetry.patch
@ -0,0 +1,15 @@
+--- a/browser/confvars.sh
+++ b/browser/confvars.sh
+@@ -62,7 +62,11 @@ fi
+ MOZ_PROFILE_MIGRATOR=1
+ 
+ # Enable checking that add-ons are signed by the trusted root
+-MOZ_ADDON_SIGNING=1
+MOZ_ADDON_SIGNING=0
+ 
+ # Include the DevTools client, not just the server (which is the default)
+ MOZ_DEVTOOLS=all
+
+MOZ_DATA_REPORTING=0
+MOZ_TELEMETRY_REPORTING=0
+MOZ_SERVICES_HEALTHREPORT=0
--- a/preferences.patch
+++ b/preferences.patch
@ -0,0 +1,419 @@
+--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
+@@ -242,7 +242,7 @@ pref("general.autoScroll", true);
+ pref("browser.uidensity", 0);
+ 
+ // At startup, check if we're the default browser and prompt user if not.
+-pref("browser.shell.checkDefaultBrowser", true);
+pref("browser.shell.checkDefaultBrowser", false);
+ pref("browser.shell.shortcutFavicons",true);
+ pref("browser.shell.mostRecentDateSetAsDefault", "");
+ pref("browser.shell.skipDefaultBrowserCheckOnFirstRun", true);
+@@ -252,7 +252,7 @@ pref("browser.defaultbrowser.notificatio
+ 
+ // 0 = blank, 1 = home (browser.startup.homepage), 2 = last visited page, 3 = resume previous browser session
+ // The behavior of option 3 is detailed at: http://wiki.mozilla.org/Session_Restore
+-pref("browser.startup.page",                1);
+pref("browser.startup.page",                0);
+ pref("browser.startup.homepage",            "chrome://branding/locale/browserconfig.properties");
+ // Whether we should skip the homepage when opening the first-run page
+ pref("browser.startup.firstrunSkipsHomepage", true);
+@@ -325,7 +325,7 @@ pref("browser.urlbar.suggest.history",
+ pref("browser.urlbar.suggest.bookmark",             true);
+ pref("browser.urlbar.suggest.openpage",             true);
+ pref("browser.urlbar.suggest.searches",             true);
+-pref("browser.urlbar.userMadeSearchSuggestionsChoice", false);
+pref("browser.urlbar.userMadeSearchSuggestionsChoice", true);
+ // The suggestion opt-in notification will be shown on 4 different days.
+ pref("browser.urlbar.daysBeforeHidingSuggestionsPrompt", 4);
+ pref("browser.urlbar.lastSuggestionsPromptDate", 20160601);
+@@ -370,7 +370,7 @@ pref("browser.download.manager.resumeOnW
+ pref("browser.download.animateNotifications", true);
+ 
+ // This records whether or not the panel has been shown at least once.
+-pref("browser.download.panel.shown", false);
+pref("browser.download.panel.shown", true);
+ 
+ #ifndef XP_MACOSX
+ pref("browser.helperApps.deleteTempFileOnExit", true);
+@@ -453,7 +453,7 @@ pref("browser.photon.structure.enabled",
+ // Tabbed browser
+ pref("browser.tabs.closeWindowWithLastTab", true);
+ pref("browser.tabs.insertRelatedAfterCurrent", true);
+-pref("browser.tabs.warnOnClose", true);
+pref("browser.tabs.warnOnClose", false);
+ pref("browser.tabs.warnOnCloseOtherTabs", true);
+ pref("browser.tabs.warnOnOpen", true);
+ pref("browser.tabs.maxOpenBeforeWarn", 15);
+@@ -630,7 +630,7 @@ pref("browser.xul.error_pages.enabled",
+ pref("browser.xul.error_pages.expert_bad_cert", false);
+ 
+ // Enable captive portal detection.
+-pref("network.captive-portal-service.enabled", true);
+pref("network.captive-portal-service.enabled", false);
+ 
+ // If true, network link events will change the value of navigator.onLine
+ pref("network.manage-offline-status", true);
+@@ -1243,7 +1243,7 @@ pref("browser.newtab.preload", true);
+ // Remembers if the about:newtab intro has been shown
+ // NOTE: This preference is unused but was not removed in case
+ //       this information will be valuable in the future.
+-pref("browser.newtabpage.introShown", false);
+pref("browser.newtabpage.introShown", true);
+ 
+ // Toggles the content of 'about:newtab'. Shows the grid when enabled.
+ pref("browser.newtabpage.enabled", true);
+--- a/browser/branding/official/pref/firefox-branding.js
+++ b/browser/branding/official/pref/firefox-branding.js
+@@ -3,7 +3,7 @@
+  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+ 
+ pref("startup.homepage_override_url", "");
+-pref("startup.homepage_welcome_url", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/firstrun/");
+pref("startup.homepage_welcome_url", "about:blank");
+ pref("startup.homepage_welcome_url.additional", "");
+ // Interval: Time between checks for a new version (in seconds)
+ pref("app.update.interval", 43200); // 12 hours
+--- a/build/application.ini.in
+++ b/build/application.ini.in
+@@ -41,7 +41,7 @@ MaxVersion=@GRE_MILESTONE@
+ 
+ [XRE]
+ #ifdef MOZ_PROFILE_MIGRATOR
+-EnableProfileMigrator=1
+EnableProfileMigrator=0
+ #endif
+ 
+ #if MOZ_CRASHREPORTER
+--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
+@@ -30,7 +30,7 @@ pref("general.useragent.site_specific_ov
+ 
+ pref("general.config.obscure_value", 13); // for MCD .cfg files
+ 
+-pref("general.warnOnAboutConfig", true);
+pref("general.warnOnAboutConfig", false);
+ 
+ // maximum number of dated backups to keep at any time
+ pref("browser.bookmarks.max_backups",       5);
+@@ -397,7 +397,7 @@ pref("media.opus.enabled", true);
+ pref("media.wave.enabled", true);
+ pref("media.webm.enabled", true);
+ 
+-pref("media.eme.chromium-api.enabled", true);
+pref("media.eme.chromium-api.enabled", false);
+ pref("media.eme.chromium-api.video-shmems", 4);
+ 
+ #ifdef MOZ_APPLEMEDIA
+@@ -468,8 +468,8 @@ pref("media.webrtc.debug.aec_dump_max_si
+ #ifdef MOZ_WIDGET_GONK
+ pref("media.navigator.video.default_width", 320);
+ pref("media.navigator.video.default_height", 240);
+-pref("media.peerconnection.enabled", true);
+-pref("media.peerconnection.video.enabled", true);
+pref("media.peerconnection.enabled", false);
+pref("media.peerconnection.video.enabled", false);
+ pref("media.navigator.video.max_fs", 1200); // 640x480 == 1200mb
+ pref("media.navigator.video.max_fr", 30);
+ pref("media.navigator.video.h264.level", 12); // 0x42E00C - level 1.2
+@@ -1331,7 +1331,7 @@ pref("privacy.donottrackheader.enabled",
+ // the popup will be called when the popup is dismissed.
+ pref("privacy.permissionPrompts.showCloseButton", false);
+ // Enforce tracking protection in all modes
+-pref("privacy.trackingprotection.enabled",  false);
+pref("privacy.trackingprotection.enabled",  true);
+ // Enforce tracking protection in Private Browsing mode
+ pref("privacy.trackingprotection.pbmode.enabled",  true);
+ // Annotate channels based on the tracking protection list in all modes
+@@ -1641,7 +1641,7 @@ pref("network.http.network-changed.timeo
+ 
+ // The maximum number of current global half open sockets allowable
+ // when starting a new speculative connection.
+-pref("network.http.speculative-parallel-limit", 6);
+pref("network.http.speculative-parallel-limit", 0);
+ 
+ // Whether or not to block requests for non head js/css items (e.g. media)
+ // while those elements load.
+@@ -1949,7 +1949,7 @@ pref("network.dns.get-ttl", true);
+ pref("network.dnsCacheExpirationGracePeriod", 60);
+ 
+ // This preference can be used to turn off DNS prefetch.
+-pref("network.dns.disablePrefetch", false);
+pref("network.dns.disablePrefetch", true);
+ 
+ // This preference controls whether .onion hostnames are
+ // rejected before being given to DNS. RFC 7686
+@@ -1983,7 +1983,7 @@ pref("network.ftp.idleConnectionTimeout"
+ pref("network.dir.format", 2);
+ 
+ // enables the prefetch service (i.e., prefetching of <link rel="next"> URLs).
+-pref("network.prefetch-next", true);
+pref("network.prefetch-next", false);
+ 
+ // enables the predictive service
+ pref("network.predictor.enabled", true);
+@@ -2474,7 +2474,7 @@ pref("security.allow_chrome_frames_insid
+ pref("services.settings.server", "https://firefox.settings.services.mozilla.com/v1");
+ 
+ // Blocklist preferences
+-pref("extensions.blocklist.enabled", true);
+pref("extensions.blocklist.enabled", false);
+ // OneCRL freshness checking depends on this value, so if you change it,
+ // please also update security.onecrl.maximum_staleness_in_seconds.
+ pref("extensions.blocklist.interval", 86400);
+@@ -4090,7 +4090,7 @@ pref("browser.drag_out_of_frame_style",
+ 
+ // Middle-mouse handling
+ pref("middlemouse.paste", true);
+-pref("middlemouse.contentLoadURL", true);
+pref("middlemouse.contentLoadURL", false);
+ pref("middlemouse.openNewWindow", true);
+ pref("middlemouse.scrollbarPosition", true);
+ 
+@@ -4153,7 +4153,7 @@ pref("browser.drag_out_of_frame_style",
+ 
+ // Middle-mouse handling
+ pref("middlemouse.paste", true);
+-pref("middlemouse.contentLoadURL", true);
+pref("middlemouse.contentLoadURL", false);
+ pref("middlemouse.openNewWindow", true);
+ pref("middlemouse.scrollbarPosition", true);
+ 
+@@ -4511,7 +4511,7 @@ pref("signon.masterPasswordReprompt.time
+ 
+ // Satchel (Form Manager) prefs
+ pref("browser.formfill.debug",            false);
+-pref("browser.formfill.enable",           true);
+pref("browser.formfill.enable",           false);
+ pref("browser.formfill.expire_days",      180);
+ pref("browser.formfill.agedWeight",       2);
+ pref("browser.formfill.bucketSize",       1);
+@@ -4618,7 +4618,7 @@ pref("gl.multithreaded", true);
+ pref("gl.ignore-dx-interop2-blacklist", false);
+ 
+ pref("webgl.force-enabled", false);
+-pref("webgl.disabled", false);
+pref("webgl.disabled", true);
+ pref("webgl.disable-angle", false);
+ pref("webgl.disable-wgl", false);
+ pref("webgl.min_capability_mode", false);
+@@ -4832,13 +4832,13 @@ pref("layers.gralloc.disable", false);
+ pref("webrender.highlight-painted-layers", false);
+ 
+ // Enable/Disable the geolocation API for content
+-pref("geo.enabled", true);
+pref("geo.enabled", false);
+ 
+ // Timeout for outbound network geolocation provider XHR
+ pref("geo.wifi.xhr.timeout", 60000);
+ 
+ // Enable/Disable the orientation API for content
+-pref("device.sensors.enabled", true);
+pref("device.sensors.enabled", false);
+ 
+ // Enable/Disable the device storage API for content
+ pref("device.storage.enabled", false);
+@@ -4950,7 +4950,7 @@ pref("dom.vibrator.max_vibrate_ms", 1000
+ pref("dom.vibrator.max_vibrate_list_len", 128);
+ 
+ // Battery API
+-pref("dom.battery.enabled", true);
+pref("dom.battery.enabled", false);
+ 
+ // Push
+ 
+@@ -5102,8 +5102,8 @@ pref("social.directories", "https://acti
+ // remote-install allows any website to activate a provider, with extended UI
+ // notifying user of installation. we can later pref off remote install if
+ // necessary. This does not affect whitelisted and directory installs.
+-pref("social.remote-install.enabled", true);
+-pref("social.toast-notifications.enabled", true);
+pref("social.remote-install.enabled", false);
+pref("social.toast-notifications.enabled", false);
+ 
+ // Disable idle observer fuzz, because only privileged content can access idle
+ // observers (bug 780507).
+@@ -5241,26 +5241,26 @@ pref("dom.flyweb.enabled", false);
+ pref("dom.mapped_arraybuffer.enabled", true);
+ 
+ // The tables used for Safebrowsing phishing and malware checks.
+-pref("urlclassifier.malwareTable", "goog-malware-shavar,goog-unwanted-shavar,test-malware-simple,test-unwanted-simple");
+pref("urlclassifier.malwareTable", "");
+ 
+ #ifdef MOZILLA_OFFICIAL
+ // In the official build, we are allowed to use google's private
+ // phishing list "goog-phish-shavar". See Bug 1288840.
+-pref("urlclassifier.phishTable", "goog-phish-shavar,test-phish-simple");
+pref("urlclassifier.phishTable", "");
+ #else
+-pref("urlclassifier.phishTable", "googpub-phish-shavar,test-phish-simple");
+pref("urlclassifier.phishTable", "");
+ #endif
+ 
+ // Tables for application reputation.
+ #ifdef NIGHTLY_BUILD
+-pref("urlclassifier.downloadAllowTable", "goog-downloadwhite-digest256,goog-downloadwhite-proto");
+-pref("urlclassifier.downloadBlockTable", "goog-badbinurl-shavar,goog-badbinurl-proto");
+pref("urlclassifier.downloadAllowTable", "");
+pref("urlclassifier.downloadBlockTable", "");
+ #else
+-pref("urlclassifier.downloadAllowTable", "goog-downloadwhite-digest256");
+-pref("urlclassifier.downloadBlockTable", "goog-badbinurl-shavar");
+pref("urlclassifier.downloadAllowTable", "");
+pref("urlclassifier.downloadBlockTable", "");
+ #endif // NIGHTLY_BUILD
+ 
+-pref("urlclassifier.disallow_completions", "test-malware-simple,test-phish-simple,test-unwanted-simple,test-track-simple,test-trackwhite-simple,test-block-simple,test-flashallow-simple,testexcept-flashallow-simple,test-flash-simple,testexcept-flash-simple,test-flashsubdoc-simple,testexcept-flashsubdoc-simple,goog-downloadwhite-digest256,base-track-digest256,mozstd-trackwhite-digest256,content-track-digest256,mozplugin-block-digest256,mozplugin2-block-digest256,block-flash-digest256,except-flash-digest256,allow-flashallow-digest256,except-flashallow-digest256,block-flashsubdoc-digest256,except-flashsubdoc-digest256,except-flashinfobar-digest256");
+pref("urlclassifier.disallow_completions", "");
+ 
+ // The table and update/gethash URLs for Safebrowsing phishing and malware
+ // checks.
+@@ -5282,55 +5282,55 @@ pref("urlclassifier.update.timeout_ms",
+ pref("urlclassifier.alternate_error_page", "blocked");
+ 
+ // Enable phishing protection
+-pref("browser.safebrowsing.phishing.enabled", true);
+pref("browser.safebrowsing.phishing.enabled", false);
+ 
+ // Enable malware protection
+-pref("browser.safebrowsing.malware.enabled", true);
+pref("browser.safebrowsing.malware.enabled", false);
+ 
+-pref("browser.safebrowsing.downloads.enabled", true);
+-pref("browser.safebrowsing.downloads.remote.enabled", true);
+pref("browser.safebrowsing.downloads.enabled", false);
+pref("browser.safebrowsing.downloads.remote.enabled", false);
+ pref("browser.safebrowsing.downloads.remote.timeout_ms", 10000);
+ pref("browser.safebrowsing.downloads.remote.url", "https://sb-ssl.google.com/safebrowsing/clientreport/download?key=%GOOGLE_API_KEY%");
+-pref("browser.safebrowsing.downloads.remote.block_dangerous",            true);
+-pref("browser.safebrowsing.downloads.remote.block_dangerous_host",       true);
+-pref("browser.safebrowsing.downloads.remote.block_potentially_unwanted", true);
+-pref("browser.safebrowsing.downloads.remote.block_uncommon",             true);
+pref("browser.safebrowsing.downloads.remote.block_dangerous",            false);
+pref("browser.safebrowsing.downloads.remote.block_dangerous_host",       false);
+pref("browser.safebrowsing.downloads.remote.block_potentially_unwanted", false);
+pref("browser.safebrowsing.downloads.remote.block_uncommon",             false);
+ pref("browser.safebrowsing.debug", false);
+ 
+ // The protocol version we communicate with google server.
+ pref("browser.safebrowsing.provider.google.pver", "2.2");
+-pref("browser.safebrowsing.provider.google.lists", "goog-badbinurl-shavar,goog-downloadwhite-digest256,goog-phish-shavar,googpub-phish-shavar,goog-malware-shavar,goog-unwanted-shavar");
+-pref("browser.safebrowsing.provider.google.updateURL", "https://safebrowsing.google.com/safebrowsing/downloads?client=SAFEBROWSING_ID&appver=%MAJOR_VERSION%&pver=2.2&key=%GOOGLE_API_KEY%");
+-pref("browser.safebrowsing.provider.google.gethashURL", "https://safebrowsing.google.com/safebrowsing/gethash?client=SAFEBROWSING_ID&appver=%MAJOR_VERSION%&pver=2.2");
+-pref("browser.safebrowsing.provider.google.reportURL", "https://safebrowsing.google.com/safebrowsing/diagnostic?client=%NAME%&hl=%LOCALE%&site=");
+-pref("browser.safebrowsing.provider.google.reportPhishMistakeURL", "https://%LOCALE%.phish-error.mozilla.com/?hl=%LOCALE%&url=");
+-pref("browser.safebrowsing.provider.google.reportMalwareMistakeURL", "https://%LOCALE%.malware-error.mozilla.com/?hl=%LOCALE%&url=");
+pref("browser.safebrowsing.provider.google.lists", "");
+pref("browser.safebrowsing.provider.google.updateURL", "");
+pref("browser.safebrowsing.provider.google.gethashURL", "");
+pref("browser.safebrowsing.provider.google.reportURL", "");
+pref("browser.safebrowsing.provider.google.reportPhishMistakeURL", "");
+pref("browser.safebrowsing.provider.google.reportMalwareMistakeURL", "");
+ 
+ 
+ // Prefs for v4.
+ pref("browser.safebrowsing.provider.google4.pver", "4");
+-pref("browser.safebrowsing.provider.google4.lists", "goog-badbinurl-proto,goog-downloadwhite-proto,goog-phish-proto,googpub-phish-proto,goog-malware-proto,goog-unwanted-proto");
+-pref("browser.safebrowsing.provider.google4.updateURL", "https://safebrowsing.googleapis.com/v4/threatListUpdates:fetch?$ct=application/x-protobuf&key=%GOOGLE_API_KEY%&$httpMethod=POST");
+pref("browser.safebrowsing.provider.google4.lists", "");
+pref("browser.safebrowsing.provider.google4.updateURL", "");
+ #ifdef NIGHTLY_BUILD
+-pref("browser.safebrowsing.provider.google4.gethashURL", "https://safebrowsing.googleapis.com/v4/fullHashes:find?$ct=application/x-protobuf&key=%GOOGLE_API_KEY%&$httpMethod=POST");
+pref("browser.safebrowsing.provider.google4.gethashURL", "");
+ #else
+ pref("browser.safebrowsing.provider.google4.gethashURL", "");
+ #endif // NIGHTLY_BUILD
+-pref("browser.safebrowsing.provider.google4.reportURL", "https://safebrowsing.google.com/safebrowsing/diagnostic?client=%NAME%&hl=%LOCALE%&site=");
+-pref("browser.safebrowsing.provider.google4.reportPhishMistakeURL", "https://%LOCALE%.phish-error.mozilla.com/?hl=%LOCALE%&url=");
+-pref("browser.safebrowsing.provider.google4.reportMalwareMistakeURL", "https://%LOCALE%.malware-error.mozilla.com/?hl=%LOCALE%&url=");
+pref("browser.safebrowsing.provider.google4.reportURL", "");
+pref("browser.safebrowsing.provider.google4.reportPhishMistakeURL", "");
+pref("browser.safebrowsing.provider.google4.reportMalwareMistakeURL", "");
+ 
+-pref("browser.safebrowsing.reportPhishURL", "https://%LOCALE%.phish-report.mozilla.com/?hl=%LOCALE%&url=");
+pref("browser.safebrowsing.reportPhishURL", "");
+ 
+ // The table and global pref for blocking plugin content
+-pref("browser.safebrowsing.blockedURIs.enabled", true);
+-pref("urlclassifier.blockedTable", "test-block-simple,mozplugin-block-digest256");
+pref("browser.safebrowsing.blockedURIs.enabled", false);
+pref("urlclassifier.blockedTable", "");
+ 
+ // The protocol version we communicate with mozilla server.
+ pref("browser.safebrowsing.provider.mozilla.pver", "2.2");
+-pref("browser.safebrowsing.provider.mozilla.lists", "base-track-digest256,mozstd-trackwhite-digest256,content-track-digest256,mozplugin-block-digest256,mozplugin2-block-digest256,block-flash-digest256,except-flash-digest256,allow-flashallow-digest256,except-flashallow-digest256,block-flashsubdoc-digest256,except-flashsubdoc-digest256,except-flashinfobar-digest256");
+-pref("browser.safebrowsing.provider.mozilla.updateURL", "https://shavar.services.mozilla.com/downloads?client=SAFEBROWSING_ID&appver=%MAJOR_VERSION%&pver=2.2");
+-pref("browser.safebrowsing.provider.mozilla.gethashURL", "https://shavar.services.mozilla.com/gethash?client=SAFEBROWSING_ID&appver=%MAJOR_VERSION%&pver=2.2");
+pref("browser.safebrowsing.provider.mozilla.lists", "");
+pref("browser.safebrowsing.provider.mozilla.updateURL", "");
+pref("browser.safebrowsing.provider.mozilla.gethashURL", "");
+ // Set to a date in the past to force immediate download in new profiles.
+ pref("browser.safebrowsing.provider.mozilla.nextupdatetime", "1");
+ // Block lists for tracking protection. The name values will be used as the keys
+@@ -5428,10 +5428,10 @@ pref("dom.wakelock.enabled", false);
+ // The URL of the Firefox Accounts auth server backend
+ pref("identity.fxaccounts.auth.uri", "https://api.accounts.firefox.com/v1");
+ 
+-pref("beacon.enabled", true);
+pref("beacon.enabled", false);
+ 
+ // Camera prefs
+-pref("camera.control.face_detection.enabled", true);
+pref("camera.control.face_detection.enabled", false);
+ 
+ 
+ // SW Cache API
+@@ -5484,7 +5484,7 @@ pref("browser.search.suggest.enabled", t
+ pref("browser.search.reset.enabled", false);
+ pref("browser.search.reset.whitelist", "");
+ pref("browser.search.geoSpecificDefaults", false);
+-pref("browser.search.geoip.url", "https://location.services.mozilla.com/v1/country?key=%MOZILLA_API_KEY%");
+pref("browser.search.geoip.url", "");
+ pref("browser.search.geoip.timeout", 3000);
+ 
+ #ifdef MOZ_OFFICIAL_BRANDING
+@@ -5499,7 +5499,7 @@ pref("browser.search.official", true);
+ //pref("media.gmp-manager.url.override", "");
+ 
+ // Update service URL for GMP install/updates:
+-pref("media.gmp-manager.url", "https://aus5.mozilla.org/update/3/GMP/%VERSION%/%BUILD_ID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/update.xml");
+pref("media.gmp-manager.url", "");
+ 
+ // When |media.gmp-manager.cert.requireBuiltIn| is true or not specified the
+ // final certificate and all certificates the connection is redirected to before
+@@ -5524,15 +5524,15 @@ pref("media.gmp-manager.cert.requireBuil
+ // IMPORTANT! app.update.certs.* prefs should also be updated if these
+ // are updated.
+ pref("media.gmp-manager.cert.checkAttributes", true);
+-pref("media.gmp-manager.certs.1.issuerName", "CN=DigiCert SHA2 Secure Server CA,O=DigiCert Inc,C=US");
+-pref("media.gmp-manager.certs.1.commonName", "aus5.mozilla.org");
+-pref("media.gmp-manager.certs.2.issuerName", "CN=thawte SSL CA - G2,O=\"thawte, Inc.\",C=US");
+-pref("media.gmp-manager.certs.2.commonName", "aus5.mozilla.org");
+pref("media.gmp-manager.certs.1.issuerName", "");
+pref("media.gmp-manager.certs.1.commonName", "");
+pref("media.gmp-manager.certs.2.issuerName", "");
+pref("media.gmp-manager.certs.2.commonName", "");
+ #endif
+ 
+ // Whether or not to perform reader mode article parsing on page load.
+ // If this pref is disabled, we will never show a reader mode icon in the toolbar.
+-pref("reader.parse-on-load.enabled", true);
+pref("reader.parse-on-load.enabled", false);
+ 
+ // After what size document we don't bother running Readability on it
+ // because it'd slow things down too much
+--- a/toolkit/components/telemetry/healthreport-prefs.js
+++ b/toolkit/components/telemetry/healthreport-prefs.js
+@@ -4,9 +4,9 @@
+ 
+ /* global pref */
+ 
+-pref("datareporting.healthreport.infoURL", "https://www.mozilla.org/legal/privacy/firefox.html#health-report");
+pref("datareporting.healthreport.infoURL", "");
+ 
+ // Health Report is enabled by default on all channels.
+-pref("datareporting.healthreport.uploadEnabled", true);
+pref("datareporting.healthreport.uploadEnabled", false);
+ 
+-pref("datareporting.healthreport.about.reportUrl", "https://fhr.cdn.mozilla.net/%LOCALE%/v4/");
+pref("datareporting.healthreport.about.reportUrl", "");