Bug 1274633 - remove windows 10 welcome page, r=MattN

MozReview-Commit-ID: HI8mqzRmV45

--HG--
extra : rebase_source : 56b6c7f96185327776e988dc9f04928e2820a2b4

browser/app/profile/firefox.js

@@ -379,9 +379,6 @@ pref("browser.search.hiddenOneOffs", "");
 
 pref("browser.search.reset.enabled", true);
 
-pref("browser.usedOnWindows10", false);
-pref("browser.usedOnWindows10.introURL", "https://www.mozilla.org/%LOCALE%/firefox/windows-10/welcome/?utm_source=firefox-browser&utm_medium=firefox-browser");
-
 pref("browser.sessionhistory.max_entries", 50);
 
 // Built-in default permissions.

browser/components/migration/FirefoxProfileMigrator.js

@@ -157,11 +157,6 @@ FirefoxProfileMigrator.prototype._getResourcesInternal = function(sourceProfileD
           // session with the "what's new" page:
           Services.prefs.setCharPref("browser.startup.homepage_override.mstone", mstone);
           Services.prefs.setCharPref("browser.startup.homepage_override.buildID", buildID);
-          // Also set the Windows 10 pref to avoid the win10 intro page to show up
-          // on startup.
-          if (AppConstants.isPlatformAndVersionAtLeast("win", "10")) {
-            Services.prefs.setBoolPref("browser.usedOnWindows10", true);
-          }
           // It's too early in startup for the pref service to have a profile directory,
           // so we have to manually tell it where to save the prefs file.
           let newPrefsFile = currentProfileDir.clone();

browser/components/nsBrowserContentHandler.js

@@ -525,22 +525,6 @@ nsBrowserContentHandler.prototype = {
     if (overridePage == "about:blank")
       overridePage = "";
 
-    // Temporary override page for users who are running Firefox on Windows 10 for their first time.
-    let platformVersion = Services.sysinfo.getProperty("version");
-    if (AppConstants.platform == "win" &&
-        Services.vc.compare(platformVersion, "10") == 0 &&
-        !Services.prefs.getBoolPref("browser.usedOnWindows10")) {
-      Services.prefs.setBoolPref("browser.usedOnWindows10", true);
-      let firstUseOnWindows10URL = Services.urlFormatter.formatURLPref("browser.usedOnWindows10.introURL");
-
-      if (firstUseOnWindows10URL && firstUseOnWindows10URL.length) {
-        additionalPage = firstUseOnWindows10URL;
-        if (override == OVERRIDE_NEW_PROFILE) {
-          additionalPage += "&utm_content=firstrun";
-        }
-      }
-    }
-
     if (!additionalPage) {
       additionalPage = LaterRun.getURL() || "";
     }

layout/tools/reftest/reftest-preferences.js

@@ -107,7 +107,6 @@ user_pref("browser.tabs.remote.autostart.2", false);
 user_pref("startup.homepage_welcome_url", "");
 user_pref("startup.homepage_welcome_url.additional", "");
 user_pref("startup.homepage_override_url", "");
-user_pref("browser.usedOnWindows10.introURL", "");
 
 user_pref("media.gmp-manager.url.override", "http://localhost/dummy-gmp-manager.xml");
 user_pref("media.gmp-manager.updateEnabled", false);

testing/marionette/client/marionette_driver/geckoinstance.py

@@ -314,7 +314,6 @@ class DesktopInstance(GeckoInstance):
         'browser.tabs.warnOnClose': False,
         'browser.tabs.warnOnOpen': False,
         'browser.uitour.enabled': False,
-        'browser.usedOnWindows10.introURL': '',
         'extensions.getAddons.cache.enabled': False,
         'extensions.installDistroAddons': False,
         'extensions.showMismatchUI': False,

testing/profiles/prefs_general.js

@@ -355,7 +355,6 @@ user_pref("dom.audiochannel.mutedByDefault", false);
 user_pref("webextensions.tests", true);
 user_pref("startup.homepage_welcome_url", "about:blank");
 user_pref("startup.homepage_welcome_url.additional", "");
-user_pref("browser.usedOnWindows10.introURL", "");
 
 // For Firefox 52 only, ESR will support non-Flash plugins while release will
 // not, so we keep testing the non-Flash pathways