Merge mozilla-central to inbound. a=merge CLOSED TREE

mozilla-spidermonkey · Jul 11, 2019 · 6c7b178 · 6c7b178
2 parents 7d58c3d + f24e88b
commit 6c7b178
Show file tree

Hide file tree

Showing 442 changed files with 4,332 additions and 6,248 deletions.
diff --git a/.cron.yml b/.cron.yml
@@ -69,19 +69,22 @@ jobs:
           - mozilla-central
       when: []  # never (hook only)
 
-    - name: nightly-geckoview
+    - name: ship-geckoview
       job:
           type: decision-task
-          treeherder-symbol: Ngv
-          target-tasks-method: nightly_geckoview
+          treeherder-symbol: ship_geckoview
+          target-tasks-method: ship_geckoview
           include-push-tasks: true
       run-on-projects:
           - mozilla-central
+          - mozilla-beta
+          - mozilla-release
       when:
           by-project:
-              # Match buildbot starts for now
               mozilla-central: [{hour: 10, minute: 0}]
-              # No default
+              mozilla-beta:
+                  - {weekday: 'Monday', hour: 10, minute: 0}
+                  - {weekday: 'Thursday', hour: 10, minute: 0}
 
     - name: tp6m-fennec-v64
       job:

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -37,10 +37,6 @@ exclude = [
   "media/mp4parse-rust/mp4parse_capi",
   "media/mp4parse-rust/mp4parse_fallible",
   "xpcom/rust/gkrust_utils",
-
-  # Exclude temporarily till it is developed independently
-  # TODO(nupur): Remove after this is completed
-  "testing/geckodriver/marionette",
 ]
 
 # Explicitly specify what our profiles use.  The opt-level setting here is

diff --git a/accessible/tests/browser/general/browser_test_urlbar.js b/accessible/tests/browser/general/browser_test_urlbar.js
@@ -14,9 +14,7 @@ add_task(async function testAutocompleteRichResult() {
   let tab = await openNewTab("data:text/html;charset=utf-8,");
   let accService = await initAccessibilityService();
 
-  info(
-    "Opening the URL bar and entering a key to show the PopupAutoCompleteRichResult panel"
-  );
+  info("Opening the URL bar and entering a key to show the urlbar panel");
   await UrlbarTestUtils.promiseAutocompleteResultPopup({
     window,
     waitForFocus,

diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
@@ -1041,7 +1041,7 @@ pref("dom.ipc.plugins.sandbox-level.flash", 0);
 // On windows these levels are:
 // See - security/sandbox/win/src/sandboxbroker/sandboxBroker.cpp
 // SetSecurityLevelForContentProcess() for what the different settings mean.
-pref("security.sandbox.content.level", 5);
+pref("security.sandbox.content.level", 6);
 
 // This controls the depth of stack trace that is logged when Windows sandbox
 // logging is turned on.  This is only currently available for the content
@@ -1186,7 +1186,6 @@ pref("services.sync.prefs.sync.app.shield.optoutstudies.enabled", true);
 // uncompromised Sync-connected devices.
 pref("services.sync.prefs.sync.browser.contentblocking.category", true);
 pref("services.sync.prefs.sync.browser.contentblocking.features.strict", true);
-pref("services.sync.prefs.sync.browser.contentblocking.introCount", true);
 pref("services.sync.prefs.sync.browser.crashReports.unsubmittedCheck.autoSubmit2", true);
 pref("services.sync.prefs.sync.browser.ctrlTab.recentlyUsedOrder", true);
 pref("services.sync.prefs.sync.browser.discovery.enabled", true);
@@ -1614,19 +1613,11 @@ pref("browser.contentblocking.rejecttrackers.reportBreakage.enabled", true);
 
 pref("browser.contentblocking.reportBreakage.url", "https://tracking-protection-issues.herokuapp.com/new");
 
-pref("browser.contentblocking.introCount", 0);
-
-pref("browser.contentblocking.maxIntroCount", 5);
-// 1800 = 30 min in seconds
-pref("browser.contentblocking.introDelaySeconds", 1800);
-
 // Enables the new Protections Panel.
 #ifdef NIGHTLY_BUILD
 pref("browser.protections_panel.enabled", true);
 #endif
 
-pref("privacy.trackingprotection.introURL", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/content-blocking/start/");
-
 // Always enable newtab segregation using containers
 pref("privacy.usercontext.about_newtab_segregation.enabled", true);
 // Enable Contextual Identity Containers

diff --git a/browser/base/content/browser-contentblocking.js b/browser/base/content/browser-contentblocking.js
@@ -907,25 +907,16 @@ var ThirdPartyCookies = {
 };
 
 var ContentBlocking = {
-  // If the user ignores the doorhanger, we stop showing it after some time.
-  MAX_INTROS: Services.prefs.getIntPref(
-    "browser.contentblocking.maxIntroCount"
-  ),
   PREF_ANIMATIONS_ENABLED: "toolkit.cosmeticAnimations.enabled",
   PREF_REPORT_BREAKAGE_ENABLED:
     "browser.contentblocking.reportBreakage.enabled",
   PREF_REPORT_BREAKAGE_URL: "browser.contentblocking.reportBreakage.url",
-  PREF_INTRO_COUNT_CB: "browser.contentblocking.introCount",
   PREF_CB_CATEGORY: "browser.contentblocking.category",
   PREF_SHOW_ALLOWED_LABELS:
     "browser.contentblocking.control-center.ui.showAllowedLabels",
   PREF_SHOW_BLOCKED_LABELS:
     "browser.contentblocking.control-center.ui.showBlockedLabels",
 
-  get prefIntroCount() {
-    return this.PREF_INTRO_COUNT_CB;
-  },
-
   get content() {
     delete this.content;
     return (this.content = document.getElementById(
@@ -1425,30 +1416,6 @@ var ContentBlocking = {
       // of the shield based on this onSecurityChange be determined afterwards).
     } else if (anyBlocking && !this.iconBox.hasAttribute("active")) {
       this.iconBox.setAttribute("animate", "true");
-
-      let isBrowserPrivate = PrivateBrowsingUtils.isBrowserPrivate(
-        gBrowser.selectedBrowser
-      );
-      if (!isBrowserPrivate) {
-        let introCount = Services.prefs.getIntPref(this.prefIntroCount);
-        let installStamp = Services.prefs.getIntPref(
-          "browser.laterrun.bookkeeping.profileCreationTime",
-          Date.now() / 1000
-        );
-        let delayLength = Services.prefs.getIntPref(
-          "browser.contentblocking.introDelaySeconds"
-        );
-        let delayFulfilled = delayLength < Date.now() / 1000 - installStamp;
-        if (
-          introCount < this.MAX_INTROS &&
-          !this.anyOtherWindowHasTour() &&
-          delayFulfilled
-        ) {
-          Services.prefs.setIntPref(this.prefIntroCount, ++introCount);
-          Services.prefs.savePrefFile(null);
-          this.showIntroPanel();
-        }
-      }
     }
 
     // We consider the shield state "active" when some kind of blocking activity
@@ -1509,16 +1476,6 @@ var ContentBlocking = {
     }
   },
 
-  // Check if any existing window has a UItour initiated, both showing and hidden.
-  anyOtherWindowHasTour() {
-    for (let win of BrowserWindowTracker.orderedWindows) {
-      if (win != window && UITour.tourBrowsersByWindow.has(win)) {
-        return true;
-      }
-    }
-    return false;
-  },
-
   disableForCurrentPage() {
     ContentBlockingAllowList.add(gBrowser.selectedBrowser);
 
@@ -1530,83 +1487,4 @@ var ContentBlocking = {
 
     this.hideIdentityPopupAndReload();
   },
-
-  dontShowIntroPanelAgain() {
-    if (!PrivateBrowsingUtils.isBrowserPrivate(gBrowser.selectedBrowser)) {
-      Services.prefs.setIntPref(this.prefIntroCount, this.MAX_INTROS);
-      Services.prefs.savePrefFile(null);
-    }
-  },
-
-  async showIntroPanel() {
-    let brandBundle = document.getElementById("bundle_brand");
-    let brandShortName = brandBundle.getString("brandShortName");
-
-    let introTitle = gNavigatorBundle.getFormattedString(
-      "contentBlocking.intro.title",
-      [brandShortName]
-    );
-    let introDescription;
-    // This will be sent to the onboarding website to let them know which
-    // UI variation we're showing.
-    let variation;
-    // We show a different UI tour variation for users that already have TP
-    // enabled globally.
-    if (TrackingProtection.enabledGlobally) {
-      introDescription = gNavigatorBundle.getString(
-        "contentBlocking.intro.v2.description"
-      );
-      variation = 2;
-    } else {
-      introDescription = gNavigatorBundle.getFormattedString(
-        "contentBlocking.intro.v1.description",
-        [brandShortName]
-      );
-      variation = 1;
-    }
-
-    let openStep2 = () => {
-      // When the user proceeds in the tour, adjust the counter to indicate that
-      // the user doesn't need to see the intro anymore.
-      this.dontShowIntroPanelAgain();
-
-      let nextURL =
-        Services.urlFormatter.formatURLPref(
-          "privacy.trackingprotection.introURL"
-        ) + `?step=2&newtab=true&variation=${variation}`;
-      switchToTabHavingURI(nextURL, true, {
-        // Ignore the fragment in case the intro is shown on the tour page
-        // (e.g. if the user manually visited the tour or clicked the link from
-        // about:privatebrowsing) so we can avoid a reload.
-        ignoreFragment: "whenComparingAndReplace",
-        triggeringPrincipal: Services.scriptSecurityManager.getSystemPrincipal(),
-      });
-    };
-
-    let buttons = [
-      {
-        label: gNavigatorBundle.getString("trackingProtection.intro.step1of3"),
-        style: "text",
-      },
-      {
-        callback: openStep2,
-        label: gNavigatorBundle.getString(
-          "trackingProtection.intro.nextButton.label"
-        ),
-        style: "primary",
-      },
-    ];
-
-    let panelTarget = await UITour.getTarget(window, "trackingProtection");
-    UITour.initForBrowser(gBrowser.selectedBrowser, window);
-    UITour.showInfo(
-      window,
-      panelTarget,
-      introTitle,
-      introDescription,
-      undefined,
-      buttons,
-      { closeButtonCallback: () => this.dontShowIntroPanelAgain() }
-    );
-  },
 };