Navi: Deprecate kHasSeenWin10PromoPage pref.

Bug: 956680
Change-Id: I447ded8b21d6ab151d01ffe5435471d78e7fbb01
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1661190
Commit-Queue: Hector Carmona <hcarmona@chromium.org>
Reviewed-by: Maksim Ivanov <emaxx@chromium.org>
Reviewed-by: Gabriel Charette <gab@chromium.org>
Reviewed-by: Tommy Martino <tmartino@chromium.org>
Cr-Commit-Position: refs/heads/master@{#672572}

chrome/browser/policy/policy_browsertest.cc

@@ -4250,12 +4250,6 @@ IN_PROC_BROWSER_TEST_P(RestoreOnStartupPolicyTest, PRE_RunTest) {
   browser()->profile()->GetPrefs()->SetBoolean(prefs::kHasSeenWelcomePage,
                                                true);
 
-#if defined(OS_WIN)
-  // Do not show the Windows 10 promo page.
-  g_browser_process->local_state()->SetBoolean(prefs::kHasSeenWin10PromoPage,
-                                               true);
-#endif
-
   // Open some tabs to verify if they are restored after the browser restarts.
   // Most policy settings override this, except kPrefValueLast which enforces
   // a restore.

chrome/browser/prefs/browser_prefs.cc

@@ -460,6 +460,11 @@ const char kBookmarkAppCreationLaunchType[] =
 // Deprecated 6/2019
 const char kMediaCacheSize[] = "browser.media_cache_size";
 
+#if defined(OS_WIN)
+// Deprecated 6/2019
+const char kHasSeenWin10PromoPage[] = "browser.has_seen_win10_promo_page";
+#endif  // defined(OS_WIN)
+
 // Register prefs used only for migration (clearing or moving to a new key).
 void RegisterProfilePrefsForMigration(
     user_prefs::PrefRegistrySyncable* registry) {
@@ -669,9 +674,10 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
   ThirdPartyConflictsManager::RegisterLocalStatePrefs(registry);
 #endif  // defined(GOOGLE_CHROME_BUILD)
 
+  registry->RegisterBooleanPref(kHasSeenWin10PromoPage, false);  // DEPRECATED
   registry->RegisterBooleanPref(kResetHasSeenWin10PromoPage, false);
   registry->RegisterStringPref(kLastWelcomedOSVersion, std::string());
-#endif
+#endif  // defined(OS_WIN)
 
   // Obsolete. See MigrateObsoleteBrowserPrefs().
   registry->RegisterIntegerPref(metrics::prefs::kStabilityExecutionPhase, 0);
@@ -1005,6 +1011,11 @@ void MigrateObsoleteBrowserPrefs(Profile* profile, PrefService* local_state) {
   // Added 12/2018
   local_state->ClearPref(prefs::kCarrierDealPromoShown);
 #endif
+
+#if defined(OS_WIN)
+  // Added 6/2019.
+  local_state->ClearPref(kHasSeenWin10PromoPage);
+#endif  // defined(OS_WIN)
 }
 
 // This method should be periodically pruned of year+ old migrations.

chrome/browser/ui/startup/startup_browser_creator.cc

@@ -481,7 +481,6 @@ void StartupBrowserCreator::RegisterLocalStatePrefs(
     PrefRegistrySimple* registry) {
 #if defined(OS_WIN)
   registry->RegisterBooleanPref(prefs::kWelcomePageOnOSUpgradeEnabled, true);
-  registry->RegisterBooleanPref(prefs::kHasSeenWin10PromoPage, false);
 #endif
 #if !defined(OS_CHROMEOS)
   registry->RegisterBooleanPref(prefs::kPromotionalTabsEnabled, true);

chrome/browser/ui/startup/startup_browser_creator_browsertest.cc

@@ -130,12 +130,6 @@ bool IsWindows10OrNewer() {
 void DisableWelcomePages(const std::vector<Profile*>& profiles) {
   for (Profile* profile : profiles)
     profile->GetPrefs()->SetBoolean(prefs::kHasSeenWelcomePage, true);
-
-#if defined(OS_WIN)
-  // TODO(hcarmona): deprecate this pref.
-  g_browser_process->local_state()->SetBoolean(prefs::kHasSeenWin10PromoPage,
-                                               true);
-#endif
 }
 
 Browser* OpenNewBrowser(Profile* profile) {

chrome/browser/ui/startup/startup_browser_creator_triggered_reset_browsertest_win.cc

@@ -122,12 +122,6 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTriggeredResetTest,
   // Avoid showing the Welcome page.
   profile->GetPrefs()->SetBoolean(prefs::kHasSeenWelcomePage, true);
 
-#if defined(OS_WIN)
-  // Do not show the Windows 10 promo page.
-  g_browser_process->local_state()->SetBoolean(prefs::kHasSeenWin10PromoPage,
-                                               true);
-#endif
-
   // Set the startup preference to open these URLs.
   SessionStartupPref pref(SessionStartupPref::URLS);
   pref.urls = urls;

chrome/browser/ui/webui/welcome/welcome_win10_ui.cc

@@ -71,10 +71,6 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source,
 
 WelcomeWin10UI::WelcomeWin10UI(content::WebUI* web_ui, const GURL& url)
     : content::WebUIController(web_ui) {
-  // Remember that the Win10 promo page has been shown.
-  g_browser_process->local_state()->SetBoolean(prefs::kHasSeenWin10PromoPage,
-                                               true);
-
   // Determine which variation to show.
   bool is_first_run = !UrlContainsKeyValueInQuery(url, "text", "faster");
 

chrome/common/pref_names.cc

@@ -1408,17 +1408,12 @@ const char kWebRtcEventLogCollectionAllowed[] = "webrtc.event_logs_collection";
 const char kHasSeenWelcomePage[] = "browser.has_seen_welcome_page";
 #endif
 
-#if defined(OS_WIN)
-// Whether or not this profile has been shown the Win10 promo page.
-const char kHasSeenWin10PromoPage[] = "browser.has_seen_win10_promo_page";
-
-#if defined(GOOGLE_CHROME_BUILD)
+#if defined(OS_WIN) && defined(GOOGLE_CHROME_BUILD)
 // Put the user into an onboarding group that's decided when they go through
 // the first run onboarding experience. Only users in a group will have their
 // finch group pinged to keep track of them for the experiment.
 const char kNaviOnboardGroup[] = "browser.navi_onboard_group";
-#endif  // defined(GOOGLE_CHROME_BUILD)
-#endif  // defined(OS_WIN)
+#endif  // defined(OS_WIN) && defined(GOOGLE_CHROME_BUILD)
 
 // *************** LOCAL STATE ***************
 // These are attached to the machine/installation

chrome/common/pref_names.h

@@ -463,12 +463,9 @@ extern const char kWebRtcEventLogCollectionAllowed[];
 extern const char kHasSeenWelcomePage[];
 #endif
 
-#if defined(OS_WIN)
-extern const char kHasSeenWin10PromoPage[];
-#if defined(GOOGLE_CHROME_BUILD)
+#if defined(OS_WIN) && defined(GOOGLE_CHROME_BUILD)
 extern const char kNaviOnboardGroup[];
-#endif  // defined(GOOGLE_CHROME_BUILD)
-#endif  // defined(OS_WIN)
+#endif  // defined(OS_WIN) && defined(GOOGLE_CHROME_BUILD)
 
 // Deprecated preference for metric / crash reporting on Android. Use
 // kMetricsReportingEnabled instead.