Bug 1900013 - Remove DoH fallback warning prefs from privacy settings UI r=settings-reviewers,mconley

Differential Revision: https://phabricator.services.mozilla.com/D237692

browser/components/preferences/metrics.yaml

@@ -122,30 +122,6 @@ security.doh.settings:
         type: string
     telemetry_mirror: SecurityDohSettings_ProviderChoice_Value
 
-  warn_checkbox_checkbox:
-    type: event
-    description: >
-      User clicked the Warn if a third party actively prevents secure DNS
-      checkbox in about:preferences#privacy. Value is true or false,
-      reflecting if box is checked or unchecked.
-      This event was generated to correspond to the Legacy Telemetry event
-      security.doh.settings.warn_checkbox#checkbox.
-    bugs:
-      - https://bugzil.la/1829905
-    data_reviews:
-      - https://bugzil.la/1829905
-    notification_emails:
-      - vgosu@mozilla.com
-      - necko@mozilla.com
-    expires: never
-    extra_keys:
-      value:
-        description: >
-          The `value` of the event. Mirrors to the Legacy Telemetry
-          event's `value` parameter.
-        type: string
-    telemetry_mirror: SecurityDohSettings_WarnCheckbox_Checkbox
-
 intl.ui.browser_language:
   manage_main:
     type: event

browser/components/preferences/privacy.inc.xhtml

@@ -1261,12 +1261,6 @@
                   />
                 </hbox>
               </vbox>
-              <hbox id="dohWarningBox1" class="extra-information-label" hidden="true">
-                <checkbox id="dohWarnCheckbox1"
-                          flex="1"
-                          data-l10n-id="preferences-doh-checkbox-warn"
-                          preference="network.trr.display_fallback_warning"/>
-              </hbox>
             </vbox>
           </vbox>
         </vbox>
@@ -1293,12 +1287,6 @@
                   <label class="doh-label" data-l10n-id="preferences-doh-enabled-detailed-desc-2"/>
                 </hbox>
               </vbox>
-              <hbox id="dohWarningBox2" class="extra-information-label" hidden="true">
-                <checkbox id="dohWarnCheckbox2"
-                          flex="1"
-                          data-l10n-id="preferences-doh-checkbox-warn"
-                          preference="network.trr.display_fallback_warning"/>
-              </hbox>
               <vbox class="extra-information-label">
                 <label data-l10n-id="preferences-doh-select-resolver"/>
                 <menulist id="dohEnabledResolverChoices"

browser/components/preferences/privacy.js

@@ -268,8 +268,6 @@ Preferences.addAll([
   { id: "network.trr.uri", type: "string" },
   { id: "network.trr.default_provider_uri", type: "string" },
   { id: "network.trr.custom_uri", type: "string" },
-  { id: "network.trr_ui.show_fallback_warning_option", type: "bool" },
-  { id: "network.trr.display_fallback_warning", type: "bool" },
   { id: "doh-rollout.disable-heuristics", type: "bool" },
 ]);
 
@@ -872,15 +870,6 @@ var gPrivacyPane = {
     setEventListener("dohStrictRadio", "command", modeButtonPressed);
     setEventListener("dohOffRadio", "command", modeButtonPressed);
 
-    function warnCheckboxClicked(e) {
-      Glean.securityDohSettings.warnCheckboxCheckbox.record({
-        value: e.target.checked,
-      });
-    }
-
-    setEventListener("dohWarnCheckbox1", "command", warnCheckboxClicked);
-    setEventListener("dohWarnCheckbox2", "command", warnCheckboxClicked);
-
     this.populateDoHResolverList("dohEnabled");
     this.populateDoHResolverList("dohStrict");
 
@@ -907,11 +896,6 @@ var gPrivacyPane = {
     };
     window.addEventListener("unload", unload, { once: true });
 
-    if (Preferences.get("network.trr_ui.show_fallback_warning_option").value) {
-      document.getElementById("dohWarningBox1").hidden = false;
-      document.getElementById("dohWarningBox2").hidden = false;
-    }
-
     let uriPref = Services.prefs.getStringPref("network.trr.uri");
     // If the value isn't one of the providers, we need to update the
     // custom_uri pref to make sure the input box contains the correct URL.

browser/components/preferences/tests/browser_privacy_dnsoverhttps.js

@@ -1062,45 +1062,3 @@ add_task(async function testEnterprisePolicy() {
     }
   );
 });
-
-add_task(async function clickWarnButton() {
-  Services.prefs.setBoolPref(
-    "network.trr_ui.show_fallback_warning_option",
-    true
-  );
-
-  await openPreferencesViaOpenPreferencesAPI("privacy", { leaveOpen: true });
-  let doc = gBrowser.selectedBrowser.contentDocument;
-
-  await clearEvents();
-  let checkbox = doc.getElementById("dohWarnCheckbox1");
-  checkbox.click();
-
-  let event = await getEvent("security.doh.settings", "warn_checkbox");
-  Assert.deepEqual(event, [
-    "security.doh.settings",
-    "warn_checkbox",
-    "checkbox",
-    "true",
-  ]);
-  Assert.equal(
-    Services.prefs.getBoolPref("network.trr.display_fallback_warning"),
-    true,
-    "Clicking the checkbox should change the pref"
-  );
-
-  checkbox.click();
-  event = await getEvent("security.doh.settings", "warn_checkbox");
-  Assert.deepEqual(event, [
-    "security.doh.settings",
-    "warn_checkbox",
-    "checkbox",
-    "false",
-  ]);
-  Assert.equal(
-    Services.prefs.getBoolPref("network.trr.display_fallback_warning"),
-    false,
-    "Clicking the checkbox should change the pref"
-  );
-  gBrowser.removeCurrentTab();
-});

browser/locales/en-US/browser/preferences/preferences.ftl

@@ -1627,10 +1627,6 @@ preferences-doh-setting-off =
   .accesskey = O
 preferences-doh-off-desc = Use your default DNS resolver
 
-preferences-doh-checkbox-warn =
-    .label = Warn if a third party actively prevents secure DNS
-    .accesskey = W
-
 preferences-doh-select-resolver = Choose provider:
 
 preferences-doh-manage-exceptions =

modules/libpref/init/all.js

@@ -3287,8 +3287,6 @@ pref("network.trr.confirmationNS", "example.com");
 // Comma separated list of domains that we should not use TRR for
 pref("network.trr.excluded-domains", "");
 pref("network.trr.builtin-excluded-domains", "localhost,local");
-// Whether the checkbox to display a fallback warning error page is visible in about:preferences#privacy
-pref("network.trr_ui.show_fallback_warning_option", false);
 
 pref("captivedetect.canonicalURL", "http://detectportal.firefox.com/canonical.html");
 pref("captivedetect.canonicalContent", "<meta http-equiv=\"refresh\" content=\"0;url=https://support.mozilla.org/kb/captive-portal\"/>");

toolkit/components/nimbus/FeatureManifest.yaml

@@ -2250,12 +2250,6 @@ dohPrefs:
       setPref:
         branch: default
         pref: "doh-rollout.uri"
-    showFallbackCheckbox:
-      description: Whether the checkbox to enable the fallback warning page is displayed in the settings UI.
-      type: boolean
-      setPref:
-        branch: default
-        pref: "network.trr_ui.show_fallback_warning_option"
     nativeHTTPSRecords:
       description: Whether we can perform native DNS HTTPS lookups
       type: boolean