Backed out changeset 7d0db31be648 (bug 1666676) for bc failure on browser_cleanFlow.js . CLOSED TREE

browser/components/doh/DoHHeuristics.jsm

@@ -49,7 +49,7 @@ ChromeUtils.defineModuleGetter(
   "resource://gre/modules/Preferences.jsm"
 );
 
-const GLOBAL_CANARY = "use-application-dns.net.";
+const GLOBAL_CANARY = "use-application-dns.net";
 
 const NXDOMAIN_ERR = "NS_ERROR_UNKNOWN_HOST";
 
@@ -264,19 +264,19 @@ async function safeSearch() {
   const providerList = [
     {
       name: "google",
-      unfiltered: ["www.google.com.", "google.com."],
-      safeSearch: ["forcesafesearch.google.com."],
+      unfiltered: ["www.google.com", "google.com"],
+      safeSearch: ["forcesafesearch.google.com"],
     },
     {
       name: "youtube",
       unfiltered: [
-        "www.youtube.com.",
-        "m.youtube.com.",
-        "youtubei.googleapis.com.",
-        "youtube.googleapis.com.",
-        "www.youtube-nocookie.com.",
+        "www.youtube.com",
+        "m.youtube.com",
+        "youtubei.googleapis.com",
+        "youtube.googleapis.com",
+        "www.youtube-nocookie.com",
       ],
-      safeSearch: ["restrict.youtube.com.", "restrictmoderate.youtube.com."],
+      safeSearch: ["restrict.youtube.com", "restrictmoderate.youtube.com"],
     },
   ];
 
@@ -303,7 +303,7 @@ async function safeSearch() {
 }
 
 async function zscalerCanary() {
-  const ZSCALER_CANARY = "sitereview.zscaler.com.";
+  const ZSCALER_CANARY = "sitereview.zscaler.com";
 
   let { addresses } = await dnsLookup(ZSCALER_CANARY);
   for (let address of addresses) {
@@ -358,7 +358,7 @@ async function providerSteering() {
   if (!Config.providerSteering.enabled) {
     return null;
   }
-  const TEST_DOMAIN = "doh.test.";
+  const TEST_DOMAIN = "doh.test";
 
   // Array of { name, canonicalName, uri } where name is an identifier for
   // telemetry, canonicalName is the expected CNAME when looking up doh.test,

browser/components/doh/TRRPerformance.jsm

@@ -68,7 +68,7 @@ XPCOMUtils.defineLazyPreferenceGetter(
   this,
   "kCanonicalDomain",
   "doh-rollout.trrRace.canonicalDomain",
-  "firefox-dns-perf-test.net."
+  "firefox-dns-perf-test.net"
 );
 
 // The number of random subdomains to resolve per TRR.
@@ -89,13 +89,7 @@ XPCOMUtils.defineLazyPreferenceGetter(
   val =>
     val
       ? val.split(",").map(t => t.trim())
-      : [
-          "google.com.",
-          "youtube.com.",
-          "amazon.com.",
-          "facebook.com.",
-          "yahoo.com.",
-        ]
+      : ["google.com", "youtube.com", "amazon.com", "facebook.com", "yahoo.com"]
 );
 
 function getRandomSubdomain() {