Bug 1421376 - Change various instances of manually calling getService to use Services.jsm in browser/. r=mossop

MozReview-Commit-ID: FW3X2fkOwK2 --HG-- extra : rebase_source : f71e053e18017d675d4ea4d758e2552adcf5adc6
2017-11-28 19:21:33 +00:00 · 2017-11-28 19:21:33 +00:00 · f99ae4c2a9
--- a/browser/base/content/aboutDialog-appUpdater.js
+++ b/browser/base/content/aboutDialog-appUpdater.js
@ -237,17 +237,14 @@ appUpdater.prototype =
      return;
    }

-    let appStartup = Components.classes["@mozilla.org/toolkit/app-startup;1"].
-                     getService(Components.interfaces.nsIAppStartup);
-
    // If already in safe mode restart in safe mode (bug 327119)
    if (Services.appinfo.inSafeMode) {
-      appStartup.restartInSafeMode(Components.interfaces.nsIAppStartup.eAttemptQuit);
+      Services.startup.restartInSafeMode(Components.interfaces.nsIAppStartup.eAttemptQuit);
      return;
    }

-    appStartup.quit(Components.interfaces.nsIAppStartup.eAttemptQuit |
-                    Components.interfaces.nsIAppStartup.eRestart);
+    Services.startup.quit(Components.interfaces.nsIAppStartup.eAttemptQuit |
+                          Components.interfaces.nsIAppStartup.eRestart);
  },

  /**
--- a/browser/base/content/browser-addons.js
+++ b/browser/base/content/browser-addons.js
@ -274,7 +274,7 @@ var gXPInstallObserver = {
      options.removeOnDismissal = true;
      options.persistent = false;

-      let secHistogram = Components.classes["@mozilla.org/base/telemetry;1"].getService(Ci.nsITelemetry).getHistogramById("SECURITY_UI");
+      let secHistogram = Services.telemetry.getHistogramById("SECURITY_UI");
      secHistogram.add(Ci.nsISecurityUITelemetry.WARNING_ADDON_ASKING_PREVENTED);
      let popup = PopupNotifications.show(browser, notificationID,
                                          messageString, anchorID,
@ -285,7 +285,7 @@ var gXPInstallObserver = {
      messageString = gNavigatorBundle.getFormattedString("xpinstallPromptMessage",
                        [brandShortName]);

-      let secHistogram = Components.classes["@mozilla.org/base/telemetry;1"].getService(Ci.nsITelemetry).getHistogramById("SECURITY_UI");
+      let secHistogram = Services.telemetry.getHistogramById("SECURITY_UI");
      action = {
        label: gNavigatorBundle.getString("xpinstallPromptAllowButton"),
        accessKey: gNavigatorBundle.getString("xpinstallPromptAllowButton.accesskey"),
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@ -1257,9 +1257,7 @@ var gBrowserInit = {

    if (!gMultiProcessBrowser) {
      // There is a Content:Click message manually sent from content.
-      Cc["@mozilla.org/eventlistenerservice;1"]
-        .getService(Ci.nsIEventListenerService)
-        .addSystemEventListener(gBrowser, "click", contentAreaClick, true);
+      Services.els.addSystemEventListener(gBrowser, "click", contentAreaClick, true);
    }

    // hook up UI through progress listener
@ -7076,14 +7074,12 @@ function ReportFalseDeceptiveSite() {
      if (reportUrl) {
        openUILinkIn(reportUrl, "tab");
      } else {
-        let promptService = Cc["@mozilla.org/embedcomp/prompt-service;1"].
-                            getService(Ci.nsIPromptService);
        let bundle =
          Services.strings.createBundle("chrome://browser/locale/safebrowsing/safebrowsing.properties");
-        promptService.alert(window,
-                            bundle.GetStringFromName("errorReportFalseDeceptiveTitle"),
-                            bundle.formatStringFromName("errorReportFalseDeceptiveMessage",
-                                                        [message.data.blockedInfo.provider], 1));
+        Services.prompt.alert(window,
+                              bundle.GetStringFromName("errorReportFalseDeceptiveTitle"),
+                              bundle.formatStringFromName("errorReportFalseDeceptiveMessage",
+                                                          [message.data.blockedInfo.provider], 1));
        }
    };
    mm.addMessageListener("DeceptiveBlockedDetails:Result", onMessage);
@ -7101,8 +7097,8 @@ function ReportFalseDeceptiveSite() {
 * Currently supported built-ins are LOCALE, APP, and any value from nsIXULAppInfo, uppercased.
 */
 function formatURL(aFormat, aIsPref) {
-  var formatter = Cc["@mozilla.org/toolkit/URLFormatterService;1"].getService(Ci.nsIURLFormatter);
-  return aIsPref ? formatter.formatURLPref(aFormat) : formatter.formatURL(aFormat);
+  return aIsPref ? Services.urlFormatter.formatURLPref(aFormat) :
+                   Services.urlFormatter.formatURL(aFormat);
 }

 /**
--- a/browser/base/content/content.js
+++ b/browser/base/content/content.js
@ -459,9 +459,7 @@ AboutBlockedSiteListener.init(this);

 var ClickEventHandler = {
  init: function init() {
-    Cc["@mozilla.org/eventlistenerservice;1"]
-      .getService(Ci.nsIEventListenerService)
-      .addSystemEventListener(global, "click", this, true);
+    Services.els.addSystemEventListener(global, "click", this, true);
  },

  handleEvent(event) {
--- a/browser/base/content/nsContextMenu.js
+++ b/browser/base/content/nsContextMenu.js
@ -1024,9 +1024,7 @@ nsContextMenu.prototype = {
      if (AppConstants.platform == "macosx") {
        // On Mac, the Set Desktop Background window is not modal.
        // Don't open more than one Set Desktop Background window.
-        const wm = Cc["@mozilla.org/appshell/window-mediator;1"].
-                   getService(Ci.nsIWindowMediator);
-        let dbWin = wm.getMostRecentWindow("Shell:SetDesktopBackground");
+        let dbWin = Services.wm.getMostRecentWindow("Shell:SetDesktopBackground");
        if (dbWin) {
          dbWin.gSetBackground.init(image, imageName);
          dbWin.focus();
@ -1079,20 +1077,14 @@ nsContextMenu.prototype = {
        // some other error occured; notify the user...
        if (!Components.isSuccessCode(aRequest.status)) {
          try {
-            const sbs = Cc["@mozilla.org/intl/stringbundle;1"].
-                        getService(Ci.nsIStringBundleService);
-            const bundle = sbs.createBundle(
+            const bundle = Services.strings.createBundle(
                    "chrome://mozapps/locale/downloads/downloads.properties");

            const title = bundle.GetStringFromName("downloadErrorAlertTitle");
            const msg = bundle.GetStringFromName("downloadErrorGeneric");

-            const promptSvc = Cc["@mozilla.org/embedcomp/prompt-service;1"].
-                              getService(Ci.nsIPromptService);
-            const wm = Cc["@mozilla.org/appshell/window-mediator;1"].
-                       getService(Ci.nsIWindowMediator);
-            let window = wm.getOuterWindowWithId(windowID);
-            promptSvc.alert(window, title, msg);
+            let window = Services.wm.getOuterWindowWithId(windowID);
+            Services.prompt.alert(window, title, msg);
          } catch (ex) {}
          return;
        }
@ -1397,8 +1389,7 @@ nsContextMenu.prototype = {

    var version = "-";
    try {
-      version = Cc["@mozilla.org/xre/app-info;1"].
-                getService(Ci.nsIXULAppInfo).version;
+      version = Services.appinfo.version;
    } catch (e) { }

    uri = uri.replace(/%LOCALE%/, escape(locale)).replace(/%VERSION%/, version);
--- a/browser/base/content/pageinfo/pageInfo.js
+++ b/browser/base/content/pageinfo/pageInfo.js
@ -333,9 +333,7 @@ function onLoadPageInfo() {

  /* Select the requested tab, if the name is specified */
  loadTab(args);
-  Components.classes["@mozilla.org/observer-service;1"]
-            .getService(Components.interfaces.nsIObserverService)
-            .notifyObservers(window, "page-info-dialog-loaded");
+  Services.obs.notifyObservers(window, "page-info-dialog-loaded");
 }

 function loadPageInfo(frameOuterWindowID, imageElement, browser) {
@ -412,9 +410,7 @@ function resetPageInfo(args) {
  /* Reset Media tab */
  var mediaTab = document.getElementById("mediaTab");
  if (!mediaTab.hidden) {
-    Components.classes["@mozilla.org/observer-service;1"]
-              .getService(Components.interfaces.nsIObserverService)
-              .removeObserver(imagePermissionObserver, "perm-changed");
+    Services.obs.removeObserver(imagePermissionObserver, "perm-changed");
    mediaTab.hidden = true;
  }
  gImageView.clear();
@ -435,9 +431,7 @@ function resetPageInfo(args) {
 function onUnloadPageInfo() {
  // Remove the observer, only if there is at least 1 image.
  if (!document.getElementById("mediaTab").hidden) {
-    Components.classes["@mozilla.org/observer-service;1"]
-              .getService(Components.interfaces.nsIObserverService)
-              .removeObserver(imagePermissionObserver, "perm-changed");
+    Services.obs.removeObserver(imagePermissionObserver, "perm-changed");
  }

  /* Call registered overlay unload functions */
@ -595,9 +589,7 @@ function addImage(imageViewRow) {
    // Add the observer, only once.
    if (gImageView.data.length == 1) {
      document.getElementById("mediaTab").hidden = false;
-      Components.classes["@mozilla.org/observer-service;1"]
-                .getService(Components.interfaces.nsIObserverService)
-                .addObserver(imagePermissionObserver, "perm-changed");
+      Services.obs.addObserver(imagePermissionObserver, "perm-changed");
    }
  } else {
    var i = gImageHash[url][type][alt];
@ -683,9 +675,7 @@ function selectSaveFolder(aCallback) {
  fp.init(window, titleText, nsIFilePicker.modeGetFolder);
  fp.appendFilters(nsIFilePicker.filterAll);
  try {
-    let prefs = Components.classes[PREFERENCES_CONTRACTID].
-                getService(Components.interfaces.nsIPrefBranch);
-    let initialDir = prefs.getComplexValue("browser.download.dir", nsIFile);
+    let initialDir = Services.prefs.getComplexValue("browser.download.dir", nsIFile);
    if (initialDir) {
      fp.displayDirectory = initialDir;
    }
@ -961,11 +951,9 @@ function makePreview(row) {
 function makeBlockImage(url) {
  var permissionManager = Components.classes[PERMISSION_CONTRACTID]
                                    .getService(nsIPermissionManager);
-  var prefs = Components.classes[PREFERENCES_CONTRACTID]
-                        .getService(Components.interfaces.nsIPrefBranch);

  var checkbox = document.getElementById("blockImage");
-  var imagePref = prefs.getIntPref("permissions.default.image");
+  var imagePref = Services.prefs.getIntPref("permissions.default.image");
  if (!(/^https?:/.test(url)) || imagePref == 2)
    // We can't block the images from this host because either is is not
    // for http(s) or we don't load images at all
--- a/browser/base/content/pageinfo/permissions.js
+++ b/browser/base/content/pageinfo/permissions.js
@ -43,9 +43,7 @@ function onLoadPermission(uri, principal) {

    for (var i of gPermissions)
      initRow(i);
-    var os = Components.classes["@mozilla.org/observer-service;1"]
-                       .getService(Components.interfaces.nsIObserverService);
-    os.addObserver(permissionObserver, "perm-changed");
+    Services.obs.addObserver(permissionObserver, "perm-changed");
    onUnloadRegistry.push(onUnloadPermission);
    permTab.hidden = false;
  } else
@ -53,9 +51,7 @@ function onLoadPermission(uri, principal) {
 }

 function onUnloadPermission() {
-  var os = Components.classes["@mozilla.org/observer-service;1"]
-                     .getService(Components.interfaces.nsIObserverService);
-  os.removeObserver(permissionObserver, "perm-changed");
+  Services.obs.removeObserver(permissionObserver, "perm-changed");

  if (gUsageRequest) {
    gUsageRequest.cancel();
--- a/browser/base/content/pageinfo/security.js
+++ b/browser/base/content/pageinfo/security.js
@ -148,15 +148,11 @@ var security = {
   * Open the cookie manager window
   */
  viewCookies() {
-    var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"]
-                       .getService(Components.interfaces.nsIWindowMediator);
-    var win = wm.getMostRecentWindow("Browser:Cookies");
-    var eTLDService = Components.classes["@mozilla.org/network/effective-tld-service;1"].
-                      getService(Components.interfaces.nsIEffectiveTLDService);
+    var win = Services.wm.getMostRecentWindow("Browser:Cookies");

    var eTLD;
    try {
-      eTLD = eTLDService.getBaseDomain(this.uri);
+      eTLD = Services.eTLD.getBaseDomain(this.uri);
    } catch (e) {
      // getBaseDomain will fail if the host is an IP address or is empty
      eTLD = this.uri.asciiHost;
@ -333,10 +329,7 @@ function viewCertHelper(parent, cert) {
 * Return true iff we have cookies for uri
 */
 function hostHasCookies(uri) {
-  var cookieManager = Components.classes["@mozilla.org/cookiemanager;1"]
-                                .getService(Components.interfaces.nsICookieManager);
-
-  return cookieManager.countCookiesFromHost(uri.asciiHost) > 0;
+  return Services.cookies.countCookiesFromHost(uri.asciiHost) > 0;
 }

 /**
@ -344,9 +337,7 @@ function hostHasCookies(uri) {
 * saved passwords
 */
 function realmHasPasswords(uri) {
-  var passwordManager = Components.classes["@mozilla.org/login-manager;1"]
-                                  .getService(Components.interfaces.nsILoginManager);
-  return passwordManager.countLogins(uri.prePath, "", "") > 0;
+  return Services.logins.countLogins(uri.prePath, "", "") > 0;
 }

 /**
--- a/browser/base/content/sanitize.js
+++ b/browser/base/content/sanitize.js
@ -203,9 +203,7 @@ Sanitizer.prototype = {
        try {
          // Cache doesn't consult timespan, nor does it have the
          // facility for timespan-based eviction.  Wipe it.
-          let cache = Cc["@mozilla.org/netwerk/cache-storage-service;1"]
-                        .getService(Ci.nsICacheStorageService);
-          cache.clear();
+          Services.cache2.clear();
        } catch (ex) {
          seenException = ex;
        }
@ -235,18 +233,16 @@ Sanitizer.prototype = {
        // Clear cookies.
        TelemetryStopwatch.start("FX_SANITIZE_COOKIES_2", refObj);
        try {
-          let cookieMgr = Components.classes["@mozilla.org/cookiemanager;1"]
-                                    .getService(Ci.nsICookieManager);
          if (range) {
            // Iterate through the cookies and delete any created after our cutoff.
-            let cookiesEnum = cookieMgr.enumerator;
+            let cookiesEnum = Services.cookies.enumerator;
            while (cookiesEnum.hasMoreElements()) {
              let cookie = cookiesEnum.getNext().QueryInterface(Ci.nsICookie2);

              if (cookie.creationTime > range[0]) {
                // This cookie was created after our cutoff, clear it
-                cookieMgr.remove(cookie.host, cookie.name, cookie.path,
-                                 false, cookie.originAttributes);
+                Services.cookies.remove(cookie.host, cookie.name, cookie.path,
+                                        false, cookie.originAttributes);

                if (++yieldCounter % YIELD_PERIOD == 0) {
                  await new Promise(resolve => setTimeout(resolve, 0)); // Don't block the main thread too long
@ -255,7 +251,7 @@ Sanitizer.prototype = {
            }
          } else {
            // Remove everything
-            cookieMgr.removeAll();
+            Services.cookies.removeAll();
            await new Promise(resolve => setTimeout(resolve, 0)); // Don't block the main thread too long
          }
        } catch (ex) {
@ -832,9 +828,7 @@ Sanitizer.clearPluginData = async function(range) {
 Sanitizer._prefs = null;
 Sanitizer.__defineGetter__("prefs", function() {
  return Sanitizer._prefs ? Sanitizer._prefs
-    : Sanitizer._prefs = Components.classes["@mozilla.org/preferences-service;1"]
-                         .getService(Components.interfaces.nsIPrefService)
-                         .getBranch(Sanitizer.PREF_DOMAIN);
+    : Sanitizer._prefs = Services.prefs.getBranch(Sanitizer.PREF_DOMAIN);
 });

 // Shows sanitization UI
--- a/browser/base/content/test/about/browser_aboutHome_snippets.js
+++ b/browser/base/content/test/about/browser_aboutHome_snippets.js
@ -26,9 +26,7 @@ add_task(async function() {

  await withSnippetsMap(
    () => {
-      Cc["@mozilla.org/observer-service;1"]
-        .getService(Ci.nsIObserverService)
-        .notifyObservers(null, "cookie-changed", "cleared");
+      Services.obs.notifyObservers(null, "cookie-changed", "cleared");
    },
    function() {
      isnot(content.gSnippetsMap.get("snippets-last-update"), null,
@ -235,4 +233,3 @@ async function withSnippetsMap(setupFn, testFn, testArgs = null, parentFn = null
    }
  });
 }
-
--- a/browser/base/content/test/general/browser_blockHPKP.js
+++ b/browser/base/content/test/general/browser_blockHPKP.js
@ -23,8 +23,6 @@

 const gSSService = Cc["@mozilla.org/ssservice;1"]
                     .getService(Ci.nsISiteSecurityService);
-const gIOService = Cc["@mozilla.org/network/io-service;1"]
-                    .getService(Ci.nsIIOService);

 const kPinningDomain = "include-subdomains.pinning-dynamic.example.com";
 const khpkpPinninEnablePref = "security.cert_pinning.process_headers_from_non_builtin_roots";
@ -41,7 +39,7 @@ function test() {
  registerCleanupFunction(function() {
    Services.prefs.clearUserPref(kpkpEnforcementPref);
    Services.prefs.clearUserPref(khpkpPinninEnablePref);
-    let uri = gIOService.newURI("https://" + kPinningDomain);
+    let uri = Services.io.newURI("https://" + kPinningDomain);
    gSSService.removeState(Ci.nsISiteSecurityService.HEADER_HPKP, uri, 0);
  });
  whenNewTabLoaded(window, loadPinningPage);
--- a/browser/base/content/test/general/browser_bug1297539.js
+++ b/browser/base/content/test/general/browser_bug1297539.js
@ -32,8 +32,7 @@ function getTransferableFromClipboard(asHTML) {
  } else {
    trans.addDataFlavor("text/unicode");
  }
-  let clip = Cc["@mozilla.org/widget/clipboard;1"].getService(Ci.nsIClipboard);
-  clip.getData(trans, Ci.nsIClipboard.kGlobalClipboard);
+  Services.clipboard.getData(trans, Ci.nsIClipboard.kGlobalClipboard);
  return trans;
 }

--- a/browser/base/content/test/general/browser_bug409624.js
+++ b/browser/base/content/test/general/browser_bug409624.js
@ -23,16 +23,12 @@ add_task(async function test() {
                       });
  });

-  let prefService = Cc["@mozilla.org/preferences-service;1"]
-                    .getService(Components.interfaces.nsIPrefService);
-
  let tempScope = {};
-  Cc["@mozilla.org/moz/jssubscript-loader;1"].getService(Ci.mozIJSSubScriptLoader)
-                                             .loadSubScript("chrome://browser/content/sanitize.js", tempScope);
+  Services.scriptloader.loadSubScript("chrome://browser/content/sanitize.js", tempScope);
  let Sanitizer = tempScope.Sanitizer;
  let s = new Sanitizer();
  s.prefDomain = "privacy.cpd.";
-  let prefBranch = prefService.getBranch(s.prefDomain);
+  let prefBranch = Services.prefs.getBranch(s.prefDomain);

  prefBranch.setBoolPref("cache", false);
  prefBranch.setBoolPref("cookies", false);
--- a/browser/base/content/test/general/browser_bug413915.js
+++ b/browser/base/content/test/general/browser_bug413915.js
@ -3,8 +3,7 @@ XPCOMUtils.defineLazyModuleGetter(this, "Feeds",

 function test() {
  var exampleUri = makeURI("http://example.com/");
-  var secman = Cc["@mozilla.org/scriptsecuritymanager;1"].getService(Ci.nsIScriptSecurityManager);
-  var principal = secman.createCodebasePrincipal(exampleUri, {});
+  var principal = Services.scriptSecurityManager.createCodebasePrincipal(exampleUri, {});

  function testIsFeed(aTitle, aHref, aType, aKnown) {
    var link = {
--- a/browser/base/content/test/general/browser_bug537013.js
+++ b/browser/base/content/test/general/browser_bug537013.js
@ -11,8 +11,7 @@ var texts = [
  "To err is human; to forgive is not company policy."
 ];

-var Clipboard = Cc["@mozilla.org/widget/clipboard;1"].getService(Ci.nsIClipboard);
-var HasFindClipboard = Clipboard.supportsFindClipboard();
+var HasFindClipboard = Services.clipboard.supportsFindClipboard();

 function addTabWithText(aText, aCallback) {
  let newTab = BrowserTestUtils.addTab(gBrowser, "data:text/html;charset=utf-8,<h1 id='h1'>" +
--- a/browser/base/content/test/general/browser_bug567306.js
+++ b/browser/base/content/test/general/browser_bug567306.js
@ -4,8 +4,7 @@

 var {Ci: interfaces, Cc: classes} = Components;

-var Clipboard = Cc["@mozilla.org/widget/clipboard;1"].getService(Ci.nsIClipboard);
-var HasFindClipboard = Clipboard.supportsFindClipboard();
+var HasFindClipboard = Services.clipboard.supportsFindClipboard();

 add_task(async function() {
  let newwindow = await BrowserTestUtils.openNewBrowserWindow();
@ -47,4 +46,3 @@ add_task(async function() {
  findBar.close();
  await promiseWindowClosed(newwindow);
 });
-
--- a/browser/base/content/test/general/browser_documentnavigation.js
+++ b/browser/base/content/test/general/browser_documentnavigation.js
@ -49,11 +49,9 @@ async function expectFocusOnF6(backward, expectedDocument, expectedElement, onCo
      }

      contentExpectedElement.addEventListener("focus", function() {
-        const contentFM = Components.classes["@mozilla.org/focus-manager;1"].
-                            getService(Components.interfaces.nsIFocusManager);
-        let details = contentFM.focusedWindow.document.documentElement.id;
-        if (contentFM.focusedElement) {
-          details += "," + contentFM.focusedElement.id;
+        let details = Services.focus.focusedWindow.document.documentElement.id;
+        if (Services.focus.focusedElement) {
+          details += "," + Services.focus.focusedElement.id;
        }

        sendSyncMessage("BrowserTest:FocusChanged", { details });
--- a/browser/base/content/test/general/browser_drag.js
+++ b/browser/base/content/test/general/browser_drag.js
@ -1,10 +1,8 @@
 function test() {
  waitForExplicitFinish();

-  let scriptLoader = Cc["@mozilla.org/moz/jssubscript-loader;1"].
-                     getService(Ci.mozIJSSubScriptLoader);
  let EventUtils = {};
-  scriptLoader.loadSubScript("chrome://mochikit/content/tests/SimpleTest/EventUtils.js", EventUtils);
+  Services.scriptloader.loadSubScript("chrome://mochikit/content/tests/SimpleTest/EventUtils.js", EventUtils);

  // ---- Test dragging the proxy icon ---
  var value = content.location.href;
--- a/browser/base/content/test/general/browser_homeDrop.js
+++ b/browser/base/content/test/general/browser_homeDrop.js
@ -9,10 +9,8 @@ add_task(async function() {
  homepageStr.data = "about:mozilla";
  await pushPrefs([HOMEPAGE_PREF, homepageStr, Ci.nsISupportsString]);

-  let scriptLoader = Cc["@mozilla.org/moz/jssubscript-loader;1"].
-                     getService(Ci.mozIJSSubScriptLoader);
  let EventUtils = {};
-  scriptLoader.loadSubScript("chrome://mochikit/content/tests/SimpleTest/EventUtils.js", EventUtils);
+  Services.scriptloader.loadSubScript("chrome://mochikit/content/tests/SimpleTest/EventUtils.js", EventUtils);

  // Since synthesizeDrop triggers the srcElement, need to use another button.
  let dragSrcElement = document.getElementById("downloads-button");
--- a/browser/base/content/test/general/browser_newTabDrop.js
+++ b/browser/base/content/test/general/browser_newTabDrop.js
@ -60,10 +60,8 @@ function dropText(text, expectedTabOpenCount = 0) {
 async function drop(dragData, expectedTabOpenCount = 0) {
  let dragDataString = JSON.stringify(dragData);
  info(`Starting test for datagData:${dragDataString}; expectedTabOpenCount:${expectedTabOpenCount}`);
-  let scriptLoader = Cc["@mozilla.org/moz/jssubscript-loader;1"].
-                     getService(Ci.mozIJSSubScriptLoader);
  let EventUtils = {};
-  scriptLoader.loadSubScript("chrome://mochikit/content/tests/SimpleTest/EventUtils.js", EventUtils);
+  Services.scriptloader.loadSubScript("chrome://mochikit/content/tests/SimpleTest/EventUtils.js", EventUtils);

  // Since synthesizeDrop triggers the srcElement, need to use another button.
  let dragSrcElement = document.getElementById("downloads-button");
--- a/browser/base/content/test/general/browser_newWindowDrop.js
+++ b/browser/base/content/test/general/browser_newWindowDrop.js
@ -73,10 +73,8 @@ function dropText(text, expectedWindowOpenCount = 0) {
 async function drop(dragData, expectedWindowOpenCount = 0) {
  let dragDataString = JSON.stringify(dragData);
  info(`Starting test for datagData:${dragDataString}; expectedWindowOpenCount:${expectedWindowOpenCount}`);
-  let scriptLoader = Cc["@mozilla.org/moz/jssubscript-loader;1"].
-                     getService(Ci.mozIJSSubScriptLoader);
  let EventUtils = {};
-  scriptLoader.loadSubScript("chrome://mochikit/content/tests/SimpleTest/EventUtils.js", EventUtils);
+  Services.scriptloader.loadSubScript("chrome://mochikit/content/tests/SimpleTest/EventUtils.js", EventUtils);

  // Since synthesizeDrop triggers the srcElement, need to use another button.
  let dragSrcElement = document.getElementById("downloads-button");
--- a/browser/base/content/test/general/browser_purgehistory_clears_sh.js
+++ b/browser/base/content/test/general/browser_purgehistory_clears_sh.js
@ -37,9 +37,7 @@ add_task(async function purgeHistoryTest() {


    let tmp = {};
-    Cc["@mozilla.org/moz/jssubscript-loader;1"]
-      .getService(Ci.mozIJSSubScriptLoader)
-      .loadSubScript("chrome://browser/content/sanitize.js", tmp);
+    Services.scriptloader.loadSubScript("chrome://browser/content/sanitize.js", tmp);

    let {Sanitizer} = tmp;
    let sanitizer = new Sanitizer();
--- a/browser/base/content/test/general/browser_sanitize-passwordDisabledHosts.js
+++ b/browser/base/content/test/general/browser_sanitize-passwordDisabledHosts.js
@ -2,20 +2,17 @@
 // clearing site-specific settings in Clear Recent History dialog

 var tempScope = {};
-Cc["@mozilla.org/moz/jssubscript-loader;1"].getService(Ci.mozIJSSubScriptLoader)
-                                           .loadSubScript("chrome://browser/content/sanitize.js", tempScope);
+Services.scriptloader.loadSubScript("chrome://browser/content/sanitize.js", tempScope);
 var Sanitizer = tempScope.Sanitizer;

 add_task(async function() {
  // getLoginSavingEnabled always returns false if password capture is disabled.
  await SpecialPowers.pushPrefEnv({"set": [["signon.rememberSignons", true]]});

-  var pwmgr = Cc["@mozilla.org/login-manager;1"].getService(Ci.nsILoginManager);
-
  // Add a disabled host
-  pwmgr.setLoginSavingEnabled("http://example.com", false);
+  Services.logins.setLoginSavingEnabled("http://example.com", false);
  // Sanity check
-  is(pwmgr.getLoginSavingEnabled("http://example.com"), false,
+  is(Services.logins.getLoginSavingEnabled("http://example.com"), false,
     "example.com should be disabled for password saving since we haven't cleared that yet.");

  // Set up the sanitizer to just clear siteSettings
@ -37,7 +34,7 @@ add_task(async function() {
  await s.sanitize();

  // Make sure it's gone
-  is(pwmgr.getLoginSavingEnabled("http://example.com"), true,
+  is(Services.logins.getLoginSavingEnabled("http://example.com"), true,
     "example.com should be enabled for password saving again now that we've cleared.");

  await SpecialPowers.popPrefEnv();
--- a/browser/base/content/test/general/browser_sanitize-sitepermissions.js
+++ b/browser/base/content/test/general/browser_sanitize-sitepermissions.js
@ -1,8 +1,7 @@
 // Bug 380852 - Delete permission manager entries in Clear Recent History

 var tempScope = {};
-Cc["@mozilla.org/moz/jssubscript-loader;1"].getService(Ci.mozIJSSubScriptLoader)
-                                           .loadSubScript("chrome://browser/content/sanitize.js", tempScope);
+Services.scriptloader.loadSubScript("chrome://browser/content/sanitize.js", tempScope);
 var Sanitizer = tempScope.Sanitizer;

 function countPermissions() {
--- a/browser/base/content/test/general/browser_sanitize-timespans.js
+++ b/browser/base/content/test/general/browser_sanitize-timespans.js
@ -11,8 +11,7 @@ const kMsecPerMin = 60 * 1000;
 const kUsecPerMin = 60 * 1000000;

 var tempScope = {};
-Cc["@mozilla.org/moz/jssubscript-loader;1"].getService(Ci.mozIJSSubScriptLoader)
-                                           .loadSubScript("chrome://browser/content/sanitize.js", tempScope);
+Services.scriptloader.loadSubScript("chrome://browser/content/sanitize.js", tempScope);
 var Sanitizer = tempScope.Sanitizer;

 var FormHistory = (Components.utils.import("resource://gre/modules/FormHistory.jsm", {})).FormHistory;
--- a/browser/base/content/test/general/browser_save_link-perwindowpb.js
+++ b/browser/base/content/test/general/browser_save_link-perwindowpb.js
@ -181,15 +181,12 @@ function test() {
 }

 /* import-globals-from ../../../../../toolkit/content/tests/browser/common/mockTransfer.js */
-Cc["@mozilla.org/moz/jssubscript-loader;1"]
-  .getService(Ci.mozIJSSubScriptLoader)
-  .loadSubScript("chrome://mochitests/content/browser/toolkit/content/tests/browser/common/mockTransfer.js",
-                 this);
+Services.scriptloader.loadSubScript(
+  "chrome://mochitests/content/browser/toolkit/content/tests/browser/common/mockTransfer.js",
+  this);

 function createTemporarySaveDirectory() {
-  var saveDir = Cc["@mozilla.org/file/directory_service;1"]
-                  .getService(Ci.nsIProperties)
-                  .get("TmpD", Ci.nsIFile);
+  var saveDir = Services.dirsvc.get("TmpD", Ci.nsIFile);
  saveDir.append("testsavedir");
  if (!saveDir.exists()) {
    info("create testsavedir!");
--- a/browser/base/content/test/general/browser_save_link_when_window_navigates.js
+++ b/browser/base/content/test/general/browser_save_link_when_window_navigates.js
@ -9,15 +9,11 @@ const ALWAYS_DOWNLOAD_DIR_PREF = "browser.download.useDownloadDir";
 const UCT_URI = "chrome://mozapps/content/downloads/unknownContentType.xul";

 /* import-globals-from ../../../../../toolkit/content/tests/browser/common/mockTransfer.js */
-Cc["@mozilla.org/moz/jssubscript-loader;1"]
-  .getService(Ci.mozIJSSubScriptLoader)
-  .loadSubScript("chrome://mochitests/content/browser/toolkit/content/tests/browser/common/mockTransfer.js",
+Services.scriptloader.loadSubScript("chrome://mochitests/content/browser/toolkit/content/tests/browser/common/mockTransfer.js",
                 this);

 function createTemporarySaveDirectory() {
-  var saveDir = Cc["@mozilla.org/file/directory_service;1"]
-                  .getService(Ci.nsIProperties)
-                  .get("TmpD", Ci.nsIFile);
+  var saveDir = Services.dirsvc.get("TmpD", Ci.nsIFile);
  saveDir.append("testsavedir");
  if (!saveDir.exists()) {
    info("create testsavedir!");
--- a/browser/base/content/test/general/browser_save_private_link_perwindowpb.js
+++ b/browser/base/content/test/general/browser_save_private_link_perwindowpb.js
@ -3,9 +3,7 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */

 function createTemporarySaveDirectory() {
-  var saveDir = Cc["@mozilla.org/file/directory_service;1"]
-                  .getService(Ci.nsIProperties)
-                  .get("TmpD", Ci.nsIFile);
+  var saveDir = Services.dirsvc.get("TmpD", Ci.nsIFile);
  saveDir.append("testsavedir");
  if (!saveDir.exists())
    saveDir.create(Ci.nsIFile.DIRECTORY_TYPE, 0o755);
@ -29,10 +27,8 @@ function promiseNoCacheEntry(filename) {
    };
    function Visitor() {}

-    let cache = Cc["@mozilla.org/netwerk/cache-storage-service;1"]
-                .getService(Ci.nsICacheStorageService);
    let {LoadContextInfo} = Cu.import("resource://gre/modules/LoadContextInfo.jsm", null);
-    let storage = cache.diskCacheStorage(LoadContextInfo.default, false);
+    let storage = Services.cache2.diskCacheStorage(LoadContextInfo.default, false);
    storage.asyncVisitStorage(new Visitor(), true /* Do walk entries */);
  });
 }
@ -89,9 +85,7 @@ add_task(async function() {
  }, tab.linkedBrowser);
  await popupShown;

-  let cache = Cc["@mozilla.org/netwerk/cache-storage-service;1"]
-              .getService(Ci.nsICacheStorageService);
-  cache.clear();
+  Services.cache2.clear();

  let imageDownloaded = promiseImageDownloaded();
  // Select "Save Image As" option from context menu
@ -108,7 +102,5 @@ add_task(async function() {
 });

 /* import-globals-from ../../../../../toolkit/content/tests/browser/common/mockTransfer.js */
-Cc["@mozilla.org/moz/jssubscript-loader;1"]
-  .getService(Ci.mozIJSSubScriptLoader)
-  .loadSubScript("chrome://mochitests/content/browser/toolkit/content/tests/browser/common/mockTransfer.js",
+Services.scriptloader.loadSubScript("chrome://mochitests/content/browser/toolkit/content/tests/browser/common/mockTransfer.js",
                 this);
--- a/browser/base/content/test/general/browser_save_video.js
+++ b/browser/base/content/test/general/browser_save_video.js
@ -71,15 +71,11 @@ add_task(async function() {
 });

 /* import-globals-from ../../../../../toolkit/content/tests/browser/common/mockTransfer.js */
-Cc["@mozilla.org/moz/jssubscript-loader;1"]
-  .getService(Ci.mozIJSSubScriptLoader)
-  .loadSubScript("chrome://mochitests/content/browser/toolkit/content/tests/browser/common/mockTransfer.js",
+Services.scriptloader.loadSubScript("chrome://mochitests/content/browser/toolkit/content/tests/browser/common/mockTransfer.js",
                 this);

 function createTemporarySaveDirectory() {
-  var saveDir = Cc["@mozilla.org/file/directory_service;1"]
-                  .getService(Ci.nsIProperties)
-                  .get("TmpD", Ci.nsIFile);
+  var saveDir = Services.dirsvc.get("TmpD", Ci.nsIFile);
  saveDir.append("testsavedir");
  if (!saveDir.exists())
    saveDir.create(Ci.nsIFile.DIRECTORY_TYPE, 0o755);
--- a/browser/base/content/test/general/browser_save_video_frame.js
+++ b/browser/base/content/test/general/browser_save_video_frame.js
@ -8,9 +8,7 @@ const VIDEO_URL = "http://mochi.test:8888/browser/browser/base/content/test/gene
 * the "Save File" dialog.
 */
 /* import-globals-from ../../../../../toolkit/content/tests/browser/common/mockTransfer.js */
-Cc["@mozilla.org/moz/jssubscript-loader;1"]
-  .getService(Ci.mozIJSSubScriptLoader)
-  .loadSubScript("chrome://mochitests/content/browser/toolkit/content/tests/browser/common/mockTransfer.js",
+Services.scriptloader.loadSubScript("chrome://mochitests/content/browser/toolkit/content/tests/browser/common/mockTransfer.js",
                 this);

 /**
@ -20,9 +18,7 @@ Cc["@mozilla.org/moz/jssubscript-loader;1"]
 * @return nsIFile
 */
 function createTemporarySaveDirectory() {
-  let saveDir = Cc["@mozilla.org/file/directory_service;1"]
-                  .getService(Ci.nsIProperties)
-                  .get("TmpD", Ci.nsIFile);
+  let saveDir = Services.dirsvc.get("TmpD", Ci.nsIFile);
  saveDir.append("testsavedir");
  if (!saveDir.exists())
    saveDir.create(Ci.nsIFile.DIRECTORY_TYPE, 0o755);
--- a/browser/base/content/test/general/browser_tabDrop.js
+++ b/browser/base/content/test/general/browser_tabDrop.js
@ -60,10 +60,8 @@ function dropText(text, expectedTabOpenCount = 0) {
 async function drop(dragData, expectedTabOpenCount = 0) {
  let dragDataString = JSON.stringify(dragData);
  info(`Starting test for datagData:${dragDataString}; expectedTabOpenCount:${expectedTabOpenCount}`);
-  let scriptLoader = Cc["@mozilla.org/moz/jssubscript-loader;1"].
-                     getService(Ci.mozIJSSubScriptLoader);
  let EventUtils = {};
-  scriptLoader.loadSubScript("chrome://mochikit/content/tests/SimpleTest/EventUtils.js", EventUtils);
+  Services.scriptloader.loadSubScript("chrome://mochikit/content/tests/SimpleTest/EventUtils.js", EventUtils);

  let awaitDrop = BrowserTestUtils.waitForEvent(gBrowser.tabContainer, "drop");
  let actualTabOpenCount = 0;
--- a/browser/base/content/test/general/browser_tabfocus.js
+++ b/browser/base/content/test/general/browser_tabfocus.js
@ -63,9 +63,6 @@ function getFocusedElementForBrowser(browser, dontCheckExtraFocus = false) {
 }

 function focusInChild() {
-  var contentFM = Components.classes["@mozilla.org/focus-manager;1"].
-                      getService(Components.interfaces.nsIFocusManager);
-
  function getWindowDocId(target) {
    return (String(target.location).indexOf("1") >= 0) ? "window1" : "window2";
  }
@ -94,24 +91,24 @@ function focusInChild() {
  /* eslint-disable mozilla/no-cpows-in-tests */
  addMessageListener("Browser:GetFocusedElement", function getFocusedElement(message) {
    var focusedWindow = {};
-    var node = contentFM.getFocusedElementForWindow(content, false, focusedWindow);
+    var node = Services.focus.getFocusedElementForWindow(content, false, focusedWindow);
    var details = "Focus is " + (node ? node.id : "<none>");

    /* Check focus manager properties. Add an error onto the string if they are
       not what is expected which will cause matching to fail in the parent process. */
    let doc = content.document;
    if (!message.data.dontCheckExtraFocus) {
-      if (contentFM.focusedElement != node) {
+      if (Services.focus.focusedElement != node) {
        details += "<ERROR: focusedElement doesn't match>";
      }
-      if (contentFM.focusedWindow && contentFM.focusedWindow != content) {
+      if (Services.focus.focusedWindow && Services.focus.focusedWindow != content) {
        details += "<ERROR: focusedWindow doesn't match>";
      }
-      if ((contentFM.focusedWindow == content) != doc.hasFocus()) {
+      if ((Services.focus.focusedWindow == content) != doc.hasFocus()) {
        details += "<ERROR: child hasFocus() is not correct>";
      }
-      if ((contentFM.focusedElement && doc.activeElement != contentFM.focusedElement) ||
-          (!contentFM.focusedElement && doc.activeElement != doc.body)) {
+      if ((Services.focus.focusedElement && doc.activeElement != Services.focus.focusedElement) ||
+          (!Services.focus.focusedElement && doc.activeElement != doc.body)) {
        details += "<ERROR: child activeElement is not correct>";
      }
    }
--- a/browser/base/content/test/general/offlineByDefault.js
+++ b/browser/base/content/test/general/offlineByDefault.js
@ -1,12 +1,11 @@
 var offlineByDefault = {
  defaultValue: false,
-  prefBranch: SpecialPowers.Cc["@mozilla.org/preferences-service;1"].getService(SpecialPowers.Ci.nsIPrefBranch),
  set(allow) {
-    this.defaultValue = this.prefBranch.getBoolPref("offline-apps.allow_by_default", false);
-    this.prefBranch.setBoolPref("offline-apps.allow_by_default", allow);
+    this.defaultValue = SpecialPowers.Services.prefs.getBoolPref("offline-apps.allow_by_default", false);
+    SpecialPowers.Services.prefs.setBoolPref("offline-apps.allow_by_default", allow);
  },
  reset() {
-    this.prefBranch.setBoolPref("offline-apps.allow_by_default", this.defaultValue);
+    SpecialPowers.Services.prefs.setBoolPref("offline-apps.allow_by_default", this.defaultValue);
  }
 };

--- a/browser/base/content/test/general/test_offlineNotification.html
+++ b/browser/base/content/test/general/test_offlineNotification.html
@ -36,20 +36,14 @@ window.addEventListener("message", function(event) {

    if (++numFinished == 3) {
      // Clean up after ourself
-      var pm = Cc["@mozilla.org/permissionmanager;1"].
-               getService(SpecialPowers.Ci.nsIPermissionManager);
-      var ioService = Cc["@mozilla.org/network/io-service;1"]
-                        .getService(SpecialPowers.Ci.nsIIOService);
-      var uri1 = ioService.newURI(frames.testFrame.location);
-      var uri2 = ioService.newURI(frames.testFrame3.location);
+      var uri1 = SpecialPowers.Services.io.newURI(frames.testFrame.location);
+      var uri2 = SpecialPowers.Services.io.newURI(frames.testFrame3.location);

-      var ssm = Cc["@mozilla.org/scriptsecuritymanager;1"]
-                  .getService(SpecialPowers.Ci.nsIScriptSecurityManager);
-      var principal1 = ssm.createCodebasePrincipal(uri1, {});
-      var principal2 = ssm.createCodebasePrincipal(uri2, {});
+      var principal1 = SpecialPowers.Services.scriptSecurityManager.createCodebasePrincipal(uri1, {});
+      var principal2 = SpecialPowers.Services.scriptSecurityManager.createCodebasePrincipal(uri2, {});

-      pm.removeFromPrincipal(principal1, "offline-app");
-      pm.removeFromPrincipal(principal2, "offline-app");
+      SpecialPowers.Services.perms.removeFromPrincipal(principal1, "offline-app");
+      SpecialPowers.Services.perms.removeFromPrincipal(principal2, "offline-app");

      offlineByDefault.reset();

@ -109,9 +103,7 @@ function loaded() {
  // Click the notification panel's "Allow" button.  This should kick
  // off updates, which will eventually lead to getting messages from
  // the children.
-  var wm = SpecialPowers.Cc["@mozilla.org/appshell/window-mediator;1"].
-           getService(SpecialPowers.Ci.nsIWindowMediator);
-  var win = wm.getMostRecentWindow("navigator:browser");
+  var win = SpecialPowers.Services.wm.getMostRecentWindow("navigator:browser");
  var panel = win.PopupNotifications.panel;
  is(panel.childElementCount, 2, "2 notifications being displayed");
  panel.firstElementChild.button.click();
--- a/browser/base/content/test/newtab/browser_newtab_bug722273.js
+++ b/browser/base/content/test/newtab/browser_newtab_bug722273.js
@ -5,9 +5,7 @@ const NOW = Date.now() * 1000;
 const URL = "http://fake-site.com/";

 var tmp = {};
-Cc["@mozilla.org/moz/jssubscript-loader;1"]
-  .getService(Ci.mozIJSSubScriptLoader)
-  .loadSubScript("chrome://browser/content/sanitize.js", tmp);
+Services.scriptloader.loadSubScript("chrome://browser/content/sanitize.js", tmp);

 var {Sanitizer} = tmp;

--- a/browser/base/content/test/newtab/head.js
+++ b/browser/base/content/test/newtab/head.js
@ -19,9 +19,7 @@ var tmp = {};
 Cu.import("resource://gre/modules/NewTabUtils.jsm", tmp);
 Cu.import("resource:///modules/DirectoryLinksProvider.jsm", tmp);
 Cu.import("resource://testing-common/PlacesTestUtils.jsm", tmp);
-Cc["@mozilla.org/moz/jssubscript-loader;1"]
-  .getService(Ci.mozIJSSubScriptLoader)
-  .loadSubScript("chrome://browser/content/sanitize.js", tmp);
+Services.scriptloader.loadSubScript("chrome://browser/content/sanitize.js", tmp);
 var {NewTabUtils, Sanitizer, DirectoryLinksProvider, PlacesTestUtils} = tmp;

 var gWindow = window;
--- a/browser/base/content/test/performance/head.js
+++ b/browser/base/content/test/performance/head.js
@ -72,9 +72,6 @@ async function withReflowObserver(testFn, expectedReflows = [], win = window) {
    }
  };

-  let els = Cc["@mozilla.org/eventlistenerservice;1"]
-              .getService(Ci.nsIEventListenerService);
-
  // We're going to remove the reflows one by one as we see them so that
  // we can check for expected, unseen reflows, so let's clone the array.
  // While we're at it, for reflows that omit the "times" property, default
@ -141,7 +138,7 @@ async function withReflowObserver(testFn, expectedReflows = [], win = window) {
                    .QueryInterface(Ci.nsIDocShell);
  docShell.addWeakReflowObserver(observer);

-  els.addListenerForAllEvents(win, dirtyFrameFn, true);
+  Services.els.addListenerForAllEvents(win, dirtyFrameFn, true);

  try {
    dirtyFrameFn();
@ -157,7 +154,7 @@ async function withReflowObserver(testFn, expectedReflows = [], win = window) {
      }
    }

-    els.removeListenerForAllEvents(win, dirtyFrameFn, true);
+    Services.els.removeListenerForAllEvents(win, dirtyFrameFn, true);
    docShell.removeWeakReflowObserver(observer);
  }
 }
--- a/browser/base/content/test/permissions/browser_canvas_fingerprinting_resistance.js
+++ b/browser/base/content/test/permissions/browser_canvas_fingerprinting_resistance.js
@ -7,9 +7,7 @@
 "use strict";

 const kUrl = "https://example.com/";
-const kPrincipal = Components.classes["@mozilla.org/scriptsecuritymanager;1"]
-    .getService(Ci.nsIScriptSecurityManager)
-    .createCodebasePrincipal(Services.io.newURI(kUrl), {});
+const kPrincipal = Services.scriptSecurityManager.createCodebasePrincipal(Services.io.newURI(kUrl), {});
 const kPermission = "canvas/extractData";

 function initTab() {
--- a/browser/base/content/test/plugins/browser_blocking.js
+++ b/browser/base/content/test/plugins/browser_blocking.js
@ -34,8 +34,8 @@ add_task(async function() {
  await promiseTabLoadEvent(gBrowser.selectedTab, "data:text/html,<html>hi</html>");

  // Make sure the blocklist service(s) are running
-  Components.classes["@mozilla.org/extensions/blocklist;1"]
-            .getService(Components.interfaces.nsIBlocklistService);
+  // eslint-disable-next-line no-unused-expressions
+  Services.blocklist;
  let exmsg = await promiseInitContentBlocklistSvc(gBrowser.selectedBrowser);
  ok(!exmsg, "exception: " + exmsg);
 });
@ -313,4 +313,3 @@ add_task(async function() {
    Assert.ok(!objLoadingContent.activated, "Plugin should not be activated.");
  });
 });
-
--- a/browser/base/content/test/plugins/browser_bug797677.js
+++ b/browser/base/content/test/plugins/browser_bug797677.js
@ -10,7 +10,7 @@ add_task(async function() {
    clearAllPluginPermissions();
    setTestPluginEnabledState(Ci.nsIPluginTag.STATE_ENABLED, "Test Plug-in");
    setTestPluginEnabledState(Ci.nsIPluginTag.STATE_ENABLED, "Second Test Plug-in");
-    consoleService.unregisterListener(errorListener);
+    Services.console.unregisterListener(errorListener);
    gBrowser.removeCurrentTab();
    window.focus();
    gTestBrowser = null;
@ -19,15 +19,13 @@ add_task(async function() {
  gBrowser.selectedTab = BrowserTestUtils.addTab(gBrowser);
  gTestBrowser = gBrowser.selectedBrowser;

-  let consoleService = Cc["@mozilla.org/consoleservice;1"]
-                         .getService(Ci.nsIConsoleService);
  let errorListener = {
    observe(aMessage) {
      if (aMessage.message.includes("NS_ERROR_FAILURE"))
        gConsoleErrors++;
    }
  };
-  consoleService.registerListener(errorListener);
+  Services.console.registerListener(errorListener);

  await promiseTabLoadEvent(gBrowser.selectedTab, gTestRoot + "plugin_bug797677.html");

--- a/browser/base/content/test/plugins/browser_clearplugindata.js
+++ b/browser/base/content/test/plugins/browser_clearplugindata.js
@ -7,8 +7,7 @@ const testURL1 = gTestRoot + "browser_clearplugindata.html";
 const testURL2 = gTestRoot + "browser_clearplugindata_noage.html";

 var tempScope = {};
-Cc["@mozilla.org/moz/jssubscript-loader;1"].getService(Ci.mozIJSSubScriptLoader)
-                                           .loadSubScript("chrome://browser/content/sanitize.js", tempScope);
+Services.scriptloader.loadSubScript("chrome://browser/content/sanitize.js", tempScope);
 var Sanitizer = tempScope.Sanitizer;

 const pluginHostIface = Ci.nsIPluginHost;
--- a/browser/base/content/test/plugins/browser_pageInfo_plugins.js
+++ b/browser/base/content/test/plugins/browser_pageInfo_plugins.js
@ -4,8 +4,6 @@ var gNextTest = null;
 var gTestBrowser = null;
 var gPluginHost = Components.classes["@mozilla.org/plugin/host;1"]
                    .getService(Components.interfaces.nsIPluginHost);
-var gPermissionManager = Components.classes["@mozilla.org/permissionmanager;1"]
-                           .getService(Components.interfaces.nsIPermissionManager);
 var gTestPermissionString = gPluginHost.getPermissionStringForType("application/x-test");
 var gSecondTestPermissionString = gPluginHost.getPermissionStringForType("application/x-second-test");

@ -38,8 +36,8 @@ function pageInfoObserve(win, topic, data) {
 }

 function finishTest() {
-  gPermissionManager.remove(makeURI("http://127.0.0.1:8888/"), gTestPermissionString);
-  gPermissionManager.remove(makeURI("http://127.0.0.1:8888/"), gSecondTestPermissionString);
+  Services.perms.remove(makeURI("http://127.0.0.1:8888/"), gTestPermissionString);
+  Services.perms.remove(makeURI("http://127.0.0.1:8888/"), gSecondTestPermissionString);
  Services.prefs.clearUserPref("plugins.click_to_play");
  gBrowser.removeCurrentTab();

@ -47,7 +45,6 @@ function finishTest() {
  gNextTest = null;
  gTestBrowser = null;
  gPluginHost = null;
-  gPermissionManager = null;

  executeSoon(finish);
 }
@ -59,8 +56,8 @@ function test() {
  setTestPluginEnabledState(Ci.nsIPluginTag.STATE_ENABLED, "Second Test Plug-in");
  gBrowser.selectedTab = BrowserTestUtils.addTab(gBrowser);
  gTestBrowser = gBrowser.selectedBrowser;
-  gPermissionManager.remove(makeURI("http://127.0.0.1:8888/"), gTestPermissionString);
-  gPermissionManager.remove(makeURI("http://127.0.0.1:8888/"), gSecondTestPermissionString);
+  Services.perms.remove(makeURI("http://127.0.0.1:8888/"), gTestPermissionString);
+  Services.perms.remove(makeURI("http://127.0.0.1:8888/"), gSecondTestPermissionString);
  doOnPageLoad(gHttpTestRoot + "plugin_two_types.html", testPart1a);
 }

@ -140,8 +137,8 @@ function testPart3() {
     "part 3: Second test plugin should be marked as PLUGIN_DISABLED");

  // reset permissions
-  gPermissionManager.remove(makeURI("http://127.0.0.1:8888/"), gTestPermissionString);
-  gPermissionManager.remove(makeURI("http://127.0.0.1:8888/"), gSecondTestPermissionString);
+  Services.perms.remove(makeURI("http://127.0.0.1:8888/"), gTestPermissionString);
+  Services.perms.remove(makeURI("http://127.0.0.1:8888/"), gSecondTestPermissionString);
  // check that changing the permissions affects the radio state in the
  // open Page Info window
  let testRadioGroup = gPageInfo.document.getElementById(gTestPermissionString + "RadioGroup");
@ -158,8 +155,8 @@ function testPart3() {
 // immediately influences Page Info.
 function testPart4a() {
  // simulate "allow" from the doorhanger
-  gPermissionManager.add(gTestBrowser.currentURI, gTestPermissionString, Ci.nsIPermissionManager.ALLOW_ACTION);
-  gPermissionManager.add(gTestBrowser.currentURI, gSecondTestPermissionString, Ci.nsIPermissionManager.ALLOW_ACTION);
+  Services.perms.add(gTestBrowser.currentURI, gTestPermissionString, Ci.nsIPermissionManager.ALLOW_ACTION);
+  Services.perms.add(gTestBrowser.currentURI, gSecondTestPermissionString, Ci.nsIPermissionManager.ALLOW_ACTION);

  // check (again) that changing the permissions affects the radio state in the
  // open Page Info window
--- a/browser/base/content/test/plugins/browser_pluginCrashCommentAndURL.js
+++ b/browser/base/content/test/plugins/browser_pluginCrashCommentAndURL.js
@ -135,9 +135,7 @@ add_task(async function() {
    let minidumpID = propBag.getPropertyAsAString("pluginDumpID");

    Services.crashmanager.ensureCrashIsPresent(minidumpID).then(() => {
-      let dirSvc = Cc["@mozilla.org/file/directory_service;1"]
-                     .getService(Ci.nsIProperties);
-      let minidumpDir = dirSvc.get("UAppData", Ci.nsIFile);
+      let minidumpDir = Services.dirsvc.get("UAppData", Ci.nsIFile);
      minidumpDir.append("Crash Reports");
      minidumpDir.append("pending");

--- a/browser/base/content/test/plugins/head.js
+++ b/browser/base/content/test/plugins/head.js
@ -16,8 +16,8 @@ XPCOMUtils.defineLazyModuleGetter(this, "PromiseUtils",
 function promiseInitContentBlocklistSvc(aBrowser) {
  return ContentTask.spawn(aBrowser, {}, async function() {
    try {
-      Cc["@mozilla.org/extensions/blocklist;1"]
-        .getService(Ci.nsIBlocklistService);
+      // eslint-disable-next-line no-unused-expressions
+      Services.blocklist;
    } catch (ex) {
      return ex.message;
    }
--- a/browser/base/content/test/urlbar/browser_locationBarCommand.js
+++ b/browser/base/content/test/urlbar/browser_locationBarCommand.js
@ -210,8 +210,6 @@ function promiseCheckChildNoFocusedElement(browser) {
  }

  return ContentTask.spawn(browser, { }, async function() {
-    const fm = Components.classes["@mozilla.org/focus-manager;1"].
-                          getService(Components.interfaces.nsIFocusManager);
-    Assert.equal(fm.focusedElement, null, "There should be no focused element");
+    Assert.equal(Services.focus.focusedElement, null, "There should be no focused element");
  });
 }
--- a/browser/base/content/test/urlbar/browser_locationBarExternalLoad.js
+++ b/browser/base/content/test/urlbar/browser_locationBarExternalLoad.js
@ -51,12 +51,10 @@ async function testURL(url, loadFunc, endFunc) {

  await ContentTask.spawn(browser, { isRemote: gMultiProcessBrowser },
    async function(arg) {
-      const fm = Components.classes["@mozilla.org/focus-manager;1"].
-                            getService(Components.interfaces.nsIFocusManager);
-      Assert.equal(fm.focusedElement, null, "focusedElement not null");
+      Assert.equal(Services.focus.focusedElement, null, "focusedElement not null");

      if (arg.isRemote) {
-        Assert.equal(fm.activeWindow, content, "activeWindow not correct");
+        Assert.equal(Services.focus.activeWindow, content, "activeWindow not correct");
      }
  });

--- a/browser/base/content/utilityOverlay.js
+++ b/browser/base/content/utilityOverlay.js
@ -822,9 +822,7 @@ function openTroubleshootingPage() {
 * Opens the feedback page for this version of the application.
 */
 function openFeedbackPage() {
-  var url = Components.classes["@mozilla.org/toolkit/URLFormatterService;1"]
-                      .getService(Components.interfaces.nsIURLFormatter)
-                      .formatURLPref("app.feedback.baseURL");
+  var url = Services.urlFormatter.formatURLPref("app.feedback.baseURL");
  openUILinkIn(url, "tab");
 }

@ -918,9 +916,7 @@ function openNewWindowWith(aURL, aDocument, aPostData, aAllowThirdPartyFixup,
 }

 function getHelpLinkURL(aHelpTopic) {
-  var url = Components.classes["@mozilla.org/toolkit/URLFormatterService;1"]
-                      .getService(Components.interfaces.nsIURLFormatter)
-                      .formatURLPref("app.support.baseURL");
+  var url = Services.urlFormatter.formatURLPref("app.support.baseURL");
  return url + aHelpTopic;
 }

--- a/browser/experiments/Experiments.jsm
+++ b/browser/experiments/Experiments.jsm
@ -1629,12 +1629,6 @@ Experiments.ExperimentEntry.prototype = {
   *                   a Promise<string> which contains the reason.
   */
  isApplicable() {
-    let versionCmp = Cc["@mozilla.org/xpcom/version-comparator;1"]
-                              .getService(Ci.nsIVersionComparator);
-    let app = Cc["@mozilla.org/xre/app-info;1"].getService(Ci.nsIXULAppInfo);
-    let runtime = Cc["@mozilla.org/xre/app-info;1"]
-                    .getService(Ci.nsIXULRuntime);
-
    let locale = this._policy.locale();
    let channel = this._policy.updatechannel();
    let data = this._manifestData;
@ -1670,15 +1664,15 @@ Experiments.ExperimentEntry.prototype = {
      { name: "maxActiveSeconds",
        condition: () => !this._startDate || now <= (startSec + maxActive) },
      { name: "appName",
-        condition: () => !data.appName || data.appName.indexOf(app.name) != -1 },
+        condition: () => !data.appName || data.appName.indexOf(Services.appinfo.name) != -1 },
      { name: "minBuildID",
-        condition: () => !data.minBuildID || app.platformBuildID >= data.minBuildID },
+        condition: () => !data.minBuildID || Services.appinfo.platformBuildID >= data.minBuildID },
      { name: "maxBuildID",
-        condition: () => !data.maxBuildID || app.platformBuildID <= data.maxBuildID },
+        condition: () => !data.maxBuildID || Services.appinfo.platformBuildID <= data.maxBuildID },
      { name: "buildIDs",
-        condition: () => !data.buildIDs || data.buildIDs.indexOf(app.platformBuildID) != -1 },
+        condition: () => !data.buildIDs || data.buildIDs.indexOf(Services.appinfo.platformBuildID) != -1 },
      { name: "os",
-        condition: () => !data.os || data.os.indexOf(runtime.OS) != -1 },
+        condition: () => !data.os || data.os.indexOf(Services.appinfo.OS) != -1 },
      { name: "channel",
        condition: () => !data.channel || data.channel.indexOf(channel) != -1 },
      { name: "locale",
@ -1686,11 +1680,11 @@ Experiments.ExperimentEntry.prototype = {
      { name: "sample",
        condition: () => data.sample === undefined || this._randomValue <= data.sample },
      { name: "version",
-        condition: () => !data.version || data.version.indexOf(app.version) != -1 },
+        condition: () => !data.version || data.version.indexOf(Services.appinfo.version) != -1 },
      { name: "minVersion",
-        condition: () => !data.minVersion || versionCmp.compare(app.version, data.minVersion) >= 0 },
+        condition: () => !data.minVersion || Services.vc.compare(Services.appinfo.version, data.minVersion) >= 0 },
      { name: "maxVersion",
-        condition: () => !data.maxVersion || versionCmp.compare(app.version, data.maxVersion) <= 0 },
+        condition: () => !data.maxVersion || Services.vc.compare(Services.appinfo.version, data.maxVersion) <= 0 },
    ];

    for (let check of simpleChecks) {
--- a/browser/experiments/test/addons/experiment-racybranch/bootstrap.js
+++ b/browser/experiments/test/addons/experiment-racybranch/bootstrap.js
@ -3,6 +3,7 @@
 var {classes: Cc, interfaces: Ci, utils: Cu} = Components;

 Cu.import("resource:///modules/experiments/Experiments.jsm");
+Cu.import("resource://gre/modules/Services.jsm");

 var gStarted = false;

@ -13,7 +14,7 @@ function startup(data, reasonCode) {
  gStarted = true;

  // delay realstartup to trigger the race condition
-  Cc["@mozilla.org/thread-manager;1"].getService(Ci.nsIThreadManager).dispatchToMainThread(realstartup);
+  Services.tm.dispatchToMainThread(realstartup);
 }

 function realstartup() {
--- a/browser/extensions/formautofill/FormAutofillHeuristics.jsm
+++ b/browser/extensions/formautofill/FormAutofillHeuristics.jsm
@ -983,10 +983,8 @@ this.FormAutofillHeuristics = {

 XPCOMUtils.defineLazyGetter(this.FormAutofillHeuristics, "RULES", () => {
  let sandbox = {};
-  let scriptLoader = Cc["@mozilla.org/moz/jssubscript-loader;1"]
-                       .getService(Ci.mozIJSSubScriptLoader);
  const HEURISTICS_REGEXP = "chrome://formautofill/content/heuristicsRegexp.js";
-  scriptLoader.loadSubScript(HEURISTICS_REGEXP, sandbox, "utf-8");
+  Services.scriptloader.loadSubScript(HEURISTICS_REGEXP, sandbox, "utf-8");
  return sandbox.HeuristicsRegExp.RULES;
 });

@ -1005,4 +1003,3 @@ XPCOMUtils.defineLazyGetter(this.FormAutofillHeuristics, "_sectionEnabled", () =
 Services.prefs.addObserver(PREF_SECTION_ENABLED, () => {
  this.FormAutofillHeuristics._sectionEnabled = Services.prefs.getBoolPref(PREF_SECTION_ENABLED);
 });
-
--- a/browser/extensions/formautofill/FormAutofillUtils.jsm
+++ b/browser/extensions/formautofill/FormAutofillUtils.jsm
@ -283,9 +283,7 @@ this.FormAutofillUtils = {
  },

  loadDataFromScript(url, sandbox = {}) {
-    let scriptLoader = Cc["@mozilla.org/moz/jssubscript-loader;1"]
-                         .getService(Ci.mozIJSSubScriptLoader);
-    scriptLoader.loadSubScript(url, sandbox, "utf-8");
+    Services.scriptloader.loadSubScript(url, sandbox, "utf-8");
    return sandbox;
  },

--- a/browser/extensions/pocket/content/pktApi.jsm
+++ b/browser/extensions/pocket/content/pktApi.jsm
@ -155,9 +155,7 @@ var pktApi = (function() {
     *  The return format: { cookieName:cookieValue, cookieName:cookieValue, ... }
    */
    function getCookiesFromPocket() {
-
-        var cookieManager = Cc["@mozilla.org/cookiemanager;1"].getService(Ci.nsICookieManager);
-        var pocketCookies = cookieManager.getCookiesFromHost(pocketSiteHost, {});
+        var pocketCookies = Services.cookies.getCookiesFromHost(pocketSiteHost, {});
        var cookies = {};
        while (pocketCookies.hasMoreElements()) {
            var cookie = pocketCookies.getNext().QueryInterface(Ci.nsICookie2);
--- a/browser/modules/ContentWebRTC.jsm
+++ b/browser/modules/ContentWebRTC.jsm
@ -290,9 +290,7 @@ function updateIndicators(aSubject, aTopic, aData) {
    showScreenSharingIndicator: ""
  };

-  let cpmm = Cc["@mozilla.org/childprocessmessagemanager;1"]
-               .getService(Ci.nsIMessageSender);
-  cpmm.sendAsyncMessage("webrtc:UpdatingIndicators");
+  Services.cpmm.sendAsyncMessage("webrtc:UpdatingIndicators");

  // If several iframes in the same page use media streams, it's possible to
  // have the same top level window several times. We use a Set to avoid
@ -331,7 +329,7 @@ function updateIndicators(aSubject, aTopic, aData) {
    mm.sendAsyncMessage("webrtc:UpdateBrowserIndicators", tabState);
  }

-  cpmm.sendAsyncMessage("webrtc:UpdateGlobalIndicators", state);
+  Services.cpmm.sendAsyncMessage("webrtc:UpdateGlobalIndicators", state);
 }

 function removeBrowserSpecificIndicator(aSubject, aTopic, aData) {
--- a/browser/modules/ContextMenu.jsm
+++ b/browser/modules/ContextMenu.jsm
@ -235,10 +235,8 @@ class ContextMenu {
    this.global = global;
    this.content = global.content;

-    Cc["@mozilla.org/eventlistenerservice;1"]
-      .getService(Ci.nsIEventListenerService)
-      .addSystemEventListener(global, "contextmenu",
-                              this._handleContentContextMenu.bind(this), false);
+    Services.els.addSystemEventListener(global, "contextmenu",
+                                        this._handleContentContextMenu.bind(this), false);

    Object.keys(messageListeners).forEach(key =>
      global.addMessageListener(key, messageListeners[key].bind(this))
--- a/browser/modules/Sanitizer.jsm
+++ b/browser/modules/Sanitizer.jsm
@ -15,8 +15,9 @@ this.EXPORTED_SYMBOLS = ["Sanitizer"];

 const { classes: Cc, interfaces: Ci, utils: Cu } = Components;

+Cu.import("resource://gre/modules/Services.jsm");
+
 var scope = {};
-Cc["@mozilla.org/moz/jssubscript-loader;1"].getService(Ci.mozIJSSubScriptLoader)
- .loadSubScript("chrome://browser/content/sanitize.js", scope);
+Services.scriptloader.loadSubScript("chrome://browser/content/sanitize.js", scope);

 this.Sanitizer = scope.Sanitizer;
--- a/browser/modules/webrtcUI.jsm
+++ b/browser/modules/webrtcUI.jsm
@ -858,9 +858,7 @@ function getGlobalIndicator() {
    _microphone: null,
    _screen: null,

-    _hiddenDoc: Cc["@mozilla.org/appshell/appShellService;1"]
-                  .getService(Ci.nsIAppShellService)
-                  .hiddenDOMWindow.document,
+    _hiddenDoc: Services.appShell.hiddenDOMWindow.document,
    _statusBar: Cc["@mozilla.org/widget/macsystemstatusbar;1"]
                  .getService(Ci.nsISystemStatusBar),