Backed out 9 changesets (bug 1596845) for causing mochitest failures in browser/base/content/test/about/browser_aboutCertError_telemetry.js

Backed out changeset eb1e34c3041f (bug 1596845)
Backed out changeset af6d41439c60 (bug 1596845)
Backed out changeset f1447dd8df04 (bug 1596845)
Backed out changeset a383f2bbcaae (bug 1596845)
Backed out changeset 950c66dd6133 (bug 1596845)
Backed out changeset ab300239fd69 (bug 1596845)
Backed out changeset 8e1fe024b680 (bug 1596845)
Backed out changeset 80e5048d1f35 (bug 1596845)
Backed out changeset b14a4910d73b (bug 1596845)

Author: Sandor Molnar

browser/base/content/browser.js

@@ -285,6 +285,7 @@ XPCOMUtils.defineLazyServiceGetters(this, {
     "nsIURIClassifier",
   ],
   Favicons: ["@mozilla.org/browser/favicon-service;1", "nsIFaviconService"],
+  gDNSService: ["@mozilla.org/network/dns-service;1", "nsIDNSService"],
   WindowsUIUtils: ["@mozilla.org/windows-ui-utils;1", "nsIWindowsUIUtils"],
   BrowserHandler: ["@mozilla.org/browser/clh;1", "nsIBrowserHandler"],
 });

browser/components/doh/DoHController.jsm

@@ -79,6 +79,13 @@ XPCOMUtils.defineLazyServiceGetter(
   "nsICaptivePortalService"
 );
 
+XPCOMUtils.defineLazyServiceGetter(
+  lazy,
+  "gDNSService",
+  "@mozilla.org/network/dns-service;1",
+  "nsIDNSService"
+);
+
 XPCOMUtils.defineLazyServiceGetter(
   lazy,
   "gNetworkLinkService",
@@ -362,7 +369,7 @@ const DoHController = {
     };
 
     if (results.steeredProvider) {
-      Services.dns.setDetectedTrrURI(results.steeredProvider.uri);
+      lazy.gDNSService.setDetectedTrrURI(results.steeredProvider.uri);
       resultsForTelemetry.steeredProvider = results.steeredProvider.id;
     }