Backed out 2 changesets (bug 1363421) for assertions in test_enterjit_osr.js on Windows xpcshell tests a=backout

Backed out changeset 722236d77865 (bug 1363421)
Backed out changeset 8a9e10fae26c (bug 1363421)

MozReview-Commit-ID: 93rH7BqbgHP

browser/components/nsBrowserGlue.js

@@ -34,7 +34,7 @@ XPCOMUtils.defineLazyServiceGetter(this, "AlertsService", "@mozilla.org/alerts-s
           RemotePrompt:false, SelfSupportBackend:false, SessionStore:false,
           ShellService:false, SimpleServiceDiscovery:false, TabCrashHandler:false,
           Task:false, UITour:false, WebChannel:false,
-          WindowsRegistry:false, webrtcUI:false */
+          WindowsRegistry:false, webrtcUI:false, UserAgentOverrides: false */
 
 /**
  * IF YOU ADD OR REMOVE FROM THIS LIST, PLEASE UPDATE THE LIST ABOVE AS WELL.
@@ -90,6 +90,7 @@ let initializedModules = {};
   ["WebChannel", "resource://gre/modules/WebChannel.jsm"],
   ["WindowsRegistry", "resource://gre/modules/WindowsRegistry.jsm"],
   ["webrtcUI", "resource:///modules/webrtcUI.jsm", "init"],
+  ["UserAgentOverrides", "resource://gre/modules/UserAgentOverrides.jsm"],
 ].forEach(([name, resource, init]) => {
   if (init) {
     XPCOMUtils.defineLazyGetter(this, name, () => {
@@ -531,6 +532,8 @@ BrowserGlue.prototype = {
       // and e10s are active together.
       E10SAccessibilityCheck.init();
     }
+
+    UserAgentOverrides.init();
   },
 
   // cleanup (called on application shutdown)
@@ -574,6 +577,8 @@ BrowserGlue.prototype = {
     os.removeObserver(this, "browser-search-engine-modified");
     os.removeObserver(this, "flash-plugin-hang");
     os.removeObserver(this, "xpi-signature-changed");
+
+    UserAgentOverrides.uninit();
   },
 
   _onAppDefaults: function BG__onAppDefaults() {

browser/installer/package-manifest.in

@@ -359,8 +359,6 @@
 @RESPATH@/components/BrowserElementParent.js
 @RESPATH@/components/FeedProcessor.manifest
 @RESPATH@/components/FeedProcessor.js
-@RESPATH@/components/UAOverridesBootstrapper.js
-@RESPATH@/components/UAOverridesBootstrapper.manifest
 @RESPATH@/components/WellKnownOpportunisticUtils.js
 @RESPATH@/components/WellKnownOpportunisticUtils.manifest
 #ifndef XP_MACOSX

mobile/android/chrome/content/browser.js

@@ -458,6 +458,7 @@ var BrowserApp = {
     CharacterEncoding.init();
     ActivityObserver.init();
     RemoteDebugger.init();
+    UserAgentOverrides.init();
     DesktopUserAgent.init();
     Distribution.init();
     Tabs.init();

mobile/android/installer/package-manifest.in

@@ -278,8 +278,6 @@
 @BINPATH@/components/BrowserElementParent.js
 @BINPATH@/components/FeedProcessor.manifest
 @BINPATH@/components/FeedProcessor.js
-@BINPATH@/components/UAOverridesBootstrapper.js
-@BINPATH@/components/UAOverridesBootstrapper.manifest
 @BINPATH@/components/WellKnownOpportunisticUtils.js
 @BINPATH@/components/WellKnownOpportunisticUtils.manifest
 @BINPATH@/components/mozProtocolHandler.js

netwerk/protocol/http/UAOverridesBootstrapper.js

@@ -1,36 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-"use strict";
-
-const Ci = Components.interfaces;
-const Cu = Components.utils;
-
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-Cu.import("resource://gre/modules/Services.jsm");
-Cu.import("resource://gre/modules/UserAgentOverrides.jsm");
-
-function UAOverridesBootstrapper() {
-  this.init();
-}
-
-UAOverridesBootstrapper.prototype = {
-  init: function uaob_init() {
-    Services.obs.addObserver(this, "profile-change-net-teardown", false);
-    UserAgentOverrides.init();
-  },
-
-  observe: function uaob_observe(aSubject, aTopic, aData) {
-    if (aTopic == "profile-change-net-teardown") {
-      Services.obs.removeObserver(this, "profile-change-net-teardown");
-      UserAgentOverrides.uninit();
-    }
-  },
-
-  QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver]),
-  classID: Components.ID("{965b0ca8-155b-11e7-93ae-92361f002671}")
-};
-
-const components = [UAOverridesBootstrapper];
-this.NSGetFactory = XPCOMUtils.generateNSGetFactory(components);

netwerk/protocol/http/UAOverridesBootstrapper.manifest

@@ -1,3 +0,0 @@
-# UAOverridesBootstrapper.js
-component {965b0ca8-155b-11e7-93ae-92361f002671} UAOverridesBootstrapper.js process=main
-contract @mozilla.org/network/ua-overrides-bootstrapper;1 {965b0ca8-155b-11e7-93ae-92361f002671} process=main

netwerk/protocol/http/UserAgentOverrides.jsm

@@ -14,15 +14,11 @@ Components.utils.import("resource://gre/modules/Services.jsm");
 Components.utils.import("resource://gre/modules/UserAgentUpdates.jsm");
 
 const PREF_OVERRIDES_ENABLED = "general.useragent.site_specific_overrides";
+const DEFAULT_UA = Cc["@mozilla.org/network/protocol;1?name=http"]
+                     .getService(Ci.nsIHttpProtocolHandler)
+                     .userAgent;
 const MAX_OVERRIDE_FOR_HOST_CACHE_SIZE = 250;
 
-// lazy load nsHttpHandler to improve startup performance.
-XPCOMUtils.defineLazyGetter(this, "DEFAULT_UA", function() {
-  return Cc["@mozilla.org/network/protocol;1?name=http"]
-           .getService(Ci.nsIHttpProtocolHandler)
-           .userAgent;
-});
-
 var gPrefBranch;
 var gOverrides = new Map;
 var gUpdatedOverrides;

netwerk/protocol/http/moz.build

@@ -119,8 +119,6 @@ LOCAL_INCLUDES += [
 ]
 
 EXTRA_COMPONENTS += [
-    'UAOverridesBootstrapper.js',
-    'UAOverridesBootstrapper.manifest',
     'WellKnownOpportunisticUtils.js',
     'WellKnownOpportunisticUtils.manifest',
 ]

netwerk/protocol/http/nsHttpHandler.cpp

@@ -487,11 +487,6 @@ nsHttpHandler::Init()
     if (pc) {
         pc->GetParentalControlsEnabled(&mParentalControlEnabled);
     }
-
-    if (XRE_IsParentProcess()) {
-        // Load UserAgentOverrides.jsm before any HTTP request is issued.
-        nsCOMPtr<nsISupports> temp = do_GetService("@mozilla.org/network/ua-overrides-bootstrapper;1");
-    }
     return NS_OK;
 }