Backed out changeset 89da43b8e31a (bug 1643651) for node-newtab-unit-tests failures. CLOSED TREE
authorBrindusan Cristian <cbrindusan@mozilla.com>
Mon, 22 Jun 2020 20:37:08 +0300
changeset 536583 9b38f4b9d883b2bc2c4f3d170942546c2d82aacf
parent 536582 897f6873d4c12698dab9b8d7601e167604b2a3cf
child 536584 3242a8dc3936c6e71759a02e4b5fb9285f89a14c
push id37530
push usernbeleuzu@mozilla.com
push dateMon, 22 Jun 2020 21:47:58 +0000
treeherdermozilla-central@9b38f4b9d883 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1643651
milestone79.0a1
backs out89da43b8e31ac044c3adca6b453ff1cfe912ab38
first release with
nightly linux32
9b38f4b9d883 / 79.0a1 / 20200622214758 / files
nightly linux64
9b38f4b9d883 / 79.0a1 / 20200622214758 / files
nightly mac
9b38f4b9d883 / 79.0a1 / 20200622214758 / files
nightly win32
9b38f4b9d883 / 79.0a1 / 20200622214758 / files
nightly win64
9b38f4b9d883 / 79.0a1 / 20200622214758 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 89da43b8e31a (bug 1643651) for node-newtab-unit-tests failures. CLOSED TREE
browser/components/newtab/lib/CFRMessageProvider.jsm
browser/locales/en-US/browser/newtab/asrouter.ftl
toolkit/components/messaging-system/lib/SpecialMessageActions.jsm
toolkit/components/messaging-system/schemas/SpecialMessageActionSchemas/test/browser/browser.ini
toolkit/components/messaging-system/schemas/SpecialMessageActionSchemas/test/browser/browser_sma_accept_doh.js
toolkit/components/messaging-system/schemas/SpecialMessageActionSchemas/test/browser/browser_sma_disable_doh.js
--- a/browser/components/newtab/lib/CFRMessageProvider.jsm
+++ b/browser/components/newtab/lib/CFRMessageProvider.jsm
@@ -538,63 +538,16 @@ const CFR_MESSAGES = [
     },
     targeting: `locale in ${JSON.stringify(
       PINNED_TABS_TARGET_LOCALES
     )} && !hasPinnedTabs && recentVisits[.timestamp > (currentDate|date - 3600 * 1000 * 1)]|length >= 3`,
     frequency: { lifetime: 3 },
     trigger: { id: "frequentVisits", params: PINNED_TABS_TARGET_SITES },
   },
   {
-    id: "DOH_ROLLOUT_CONFIRMATION",
-    targeting: `
-      "doh-rollout.enabled"|preferenceValue &&
-      !"doh-rollout.disable-heuristics"|preferenceValue &&
-      !"doh-rollout.skipHeuristicsCheck"|preferenceValue &&
-      !"doh-rollout.doorhanger-decision"|preferenceValue
-    `,
-    template: "cfr_doorhanger",
-    content: {
-      skip_address_bar_notifier: true,
-      anchor_id: "PanelUI-menu-button",
-      layout: "icon_and_message",
-      text: { string_id: "cfr-doorhanger-doh-body" },
-      icon: "chrome://browser/skin/connection-secure.svg",
-      buttons: {
-        secondary: [
-          {
-            label: { string_id: "cfr-doorhanger-doh-secondary-button" },
-            action: {
-              type: "DISABLE_DOH",
-            },
-          },
-        ],
-        primary: {
-          label: { string_id: "cfr-doorhanger-doh-primary-button" },
-          action: {
-            type: "ACCEPT_DOH",
-          },
-        },
-      },
-      bucket_id: "DOH_ROLLOUT_CONFIRMATION",
-      heading_text: { string_id: "cfr-doorhanger-doh-header" },
-      info_icon: {
-        label: {
-          string_id: "cfr-doorhanger-extension-sumo-link",
-        },
-        sumo_path: "extensionrecommendations",
-      },
-      notification_text: "Message from Firefox",
-      category: "cfrFeatures",
-    },
-    trigger: {
-      id: "openURL",
-      patterns: ["*://*/*"],
-    },
-  },
-  {
     id: "SAVE_LOGIN",
     frequency: {
       lifetime: 3,
     },
     targeting:
       "(!type || type == 'save') && isFxAEnabled == true && usesFirefoxSync == false",
     template: "cfr_doorhanger",
     content: {
--- a/browser/locales/en-US/browser/newtab/asrouter.ftl
+++ b/browser/locales/en-US/browser/newtab/asrouter.ftl
@@ -257,17 +257,8 @@ cfr-whatsnew-protections-header = Protec
 cfr-whatsnew-protections-body = The Protections Dashboard includes summary reports about data breaches and password management. You can now track how many breaches you’ve resolved, and see if any of your saved passwords may have been exposed in a data breach.
 cfr-whatsnew-protections-cta-link = View Protections Dashboard
 cfr-whatsnew-protections-icon-alt = Shield icon
 
 ## Better PDF message
 
 cfr-whatsnew-better-pdf-header = Better PDF experience
 cfr-whatsnew-better-pdf-body = PDF documents now open directly in { -brand-short-name }, keeping your workflow within easy reach.
-
-## DOH Message
-
-cfr-doorhanger-doh-body = Your privacy matters. { -brand-short-name } now securely routes your DNS requests whenever possible to a partner service to protect you while you browse.
-cfr-doorhanger-doh-header = More secure, encrypted DNS lookups
-cfr-doorhanger-doh-primary-button = OK, Got it
-  .accesskey = O
-cfr-doorhanger-doh-secondary-button = Disable
-  .accesskey = D
--- a/toolkit/components/messaging-system/lib/SpecialMessageActions.jsm
+++ b/toolkit/components/messaging-system/lib/SpecialMessageActions.jsm
@@ -4,18 +4,16 @@
 "use strict";
 
 const EXPORTED_SYMBOLS = ["SpecialMessageActions"];
 
 const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
-const DOH_DOORHANGER_DECISION_PREF = "doh-rollout.doorhanger-decision";
-const NETWORK_TRR_MODE_PREF = "network.trr.mode";
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   AddonManager: "resource://gre/modules/AddonManager.jsm",
   UITour: "resource:///modules/UITour.jsm",
   FxAccounts: "resource://gre/modules/FxAccounts.jsm",
   MigrationUtils: "resource:///modules/MigrationUtils.jsm",
 });
 
@@ -180,27 +178,16 @@ const SpecialMessageActions = {
         break;
       case "DISABLE_STP_DOORHANGERS":
         await this.blockMessageById([
           "SOCIAL_TRACKING_PROTECTION",
           "FINGERPRINTERS_PROTECTION",
           "CRYPTOMINERS_PROTECTION",
         ]);
         break;
-      case "DISABLE_DOH":
-        Services.prefs.setStringPref(
-          DOH_DOORHANGER_DECISION_PREF,
-          "UIDisabled"
-        );
-        Services.prefs.setIntPref(NETWORK_TRR_MODE_PREF, 5);
-        await this.blockMessageById("DOH_ROLLOUT_CONFIRMATION");
-        break;
-      case "ACCEPT_DOH":
-        Services.prefs.setStringPref(DOH_DOORHANGER_DECISION_PREF, "UIOk");
-        break;
       case "CANCEL":
         // A no-op used by CFRs that minimizes the notification but does not
         // trigger a dismiss or block (it keeps the notification around)
         break;
       default:
         throw new Error(
           `Special message action with type ${action.type} is unsupported.`
         );
--- a/toolkit/components/messaging-system/schemas/SpecialMessageActionSchemas/test/browser/browser.ini
+++ b/toolkit/components/messaging-system/schemas/SpecialMessageActionSchemas/test/browser/browser.ini
@@ -11,10 +11,8 @@ support-files =
 [browser_sma_open_protection_panel.js]
 [browser_sma_open_protection_report.js]
 [browser_sma_open_url.js]
 [browser_sma_pin_current_tab.js]
 [browser_sma_show_firefox_accounts.js]
 [browser_sma_show_migration_wizard.js]
 [browser_sma.js]
 [browser_sma_docs.js]
-[browser_sma_accept_doh.js]
-[browser_sma_disable_doh.js]
deleted file mode 100644
--- a/toolkit/components/messaging-system/schemas/SpecialMessageActionSchemas/test/browser/browser_sma_accept_doh.js
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-"use strict";
-const DOH_DOORHANGER_DECISION_PREF = "doh-rollout.doorhanger-decision";
-
-add_task(async function test_disable_doh() {
-  await SpecialPowers.pushPrefEnv({
-    set: [[DOH_DOORHANGER_DECISION_PREF, ""]],
-  });
-  await SpecialMessageActions.handleAction({ type: "ACCEPT_DOH" }, gBrowser);
-  Assert.equal(
-    Services.prefs.getStringPref(DOH_DOORHANGER_DECISION_PREF, ""),
-    "UIOk",
-    "Pref should be set on accept"
-  );
-});
deleted file mode 100644
--- a/toolkit/components/messaging-system/schemas/SpecialMessageActionSchemas/test/browser/browser_sma_disable_doh.js
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-"use strict";
-const DOH_DOORHANGER_DECISION_PREF = "doh-rollout.doorhanger-decision";
-const NETWORK_TRR_MODE_PREF = "network.trr.mode";
-
-add_task(async function test_disable_doh() {
-  await SpecialPowers.pushPrefEnv({
-    set: [
-      [DOH_DOORHANGER_DECISION_PREF, "mochitest"],
-      [NETWORK_TRR_MODE_PREF, 0],
-    ],
-  });
-
-  SpecialMessageActions.blockMessageById = messageId =>
-    Assert.equal(
-      messageId,
-      "DOH_ROLLOUT_CONFIRMATION",
-      "Block the correct message"
-    );
-
-  await SpecialMessageActions.handleAction({ type: "DISABLE_DOH" }, gBrowser);
-
-  Assert.equal(
-    Services.prefs.getStringPref(DOH_DOORHANGER_DECISION_PREF, ""),
-    "UIDisabled",
-    "Pref should be set on disabled"
-  );
-  Assert.equal(
-    Services.prefs.getIntPref(NETWORK_TRR_MODE_PREF, 0),
-    5,
-    "Pref should be set on disabled"
-  );
-});