Delete the auto-launch trial.

chrome/browser/prefs/browser_prefs.cc

Index: chrome/browser/prefs/browser_prefs.cc
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 7e0866942f45979c80d3b387082165ce230c0061..686776708f2f552174f1d44e54e41ca2ed34a25f 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -60,7 +60,6 @@
 #include "chrome/browser/ui/network_profile_bubble.h"
 #include "chrome/browser/ui/prefs/prefs_tab_helper.h"
 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h"
-#include "chrome/browser/ui/startup/autolaunch_prompt.h"
 #include "chrome/browser/ui/tabs/pinned_tab_codec.h"
 #include "chrome/browser/ui/webui/flags_ui.h"
 #include "chrome/browser/ui/webui/instant_ui.h"
@@ -227,14 +226,11 @@
 
 namespace {
 
-#if !defined(OS_ANDROID)
-// The AutomaticProfileResetter service used this preference to save that the
-// profile reset prompt had already been shown, however, the preference has been
-// renamed in Local State. We keep the name here for now so that we can clear
-// out legacy values.
-// TODO(engedy): Remove this and usages in M42 or later. See crbug.com/398813.

[Finnur, 2015/11/11 09:55:53]

You should add BUG=398813 to this CL's description (and close the bug
afterwards, I presume).

[gab, 2015/11/11 21:30:02]

Done.

-const char kLegacyProfileResetPromptMemento[] = "profile.reset_prompt_memento";
-#endif
+#if defined(OS_WIN)
+// Deprecated 11/2015 (M48). TODO(gab): delete in M52+.
+const char kShownAutoLaunchInfobarDeprecated[] =
+    "browser.shown_autolaunch_infobar";
+#endif  // defined(OS_WIN)
 
 }  // namespace
 
@@ -357,12 +353,6 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
 #if defined(TOOLKIT_VIEWS)
   RegisterBrowserViewLocalPrefs(registry);
 #endif
-
-  // Preferences registered only for migration (clearing or moving to a new key)
-  // go here.
-#if !defined(OS_ANDROID)
-  registry->RegisterDictionaryPref(kLegacyProfileResetPromptMemento);
-#endif  // !defined(OS_ANDROID)
 }
 
 // Register prefs applicable to all profiles.
@@ -481,7 +471,6 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
   NewTabUI::RegisterProfilePrefs(registry);
   PepperFlashSettingsManager::RegisterProfilePrefs(registry);
   PinnedTabCodec::RegisterProfilePrefs(registry);
-  RegisterAutolaunchUserPrefs(registry);
   signin::RegisterProfilePrefs(registry);
 #endif
 
@@ -521,6 +510,12 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
 #if !defined(OS_ANDROID) && !defined(OS_IOS)
   browser_sync::ForeignSessionHandler::RegisterProfilePrefs(registry);
 #endif
+
+  // Preferences registered only for migration (clearing or moving to a new key)
+  // go here.

[Finnur, 2015/11/11 09:55:53]

This looks a bit weird, depending on what you are aiming for, either:

1) Add a linebreak between 515 and 516,
2) Remove the indentation of lines 514 and 515
OR
3) Move the comment inside the #if

[gab, 2015/11/11 21:30:03]

This follows the same format as the code removed on line 361, but agree that (1)
will make it cleaner, done.

+#if defined(OS_WIN)
+  registry->RegisterIntegerPref(kShownAutoLaunchInfobarDeprecated, 0);
+#endif  // defined(OS_WIN)
 }
 
 void RegisterUserProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
@@ -549,11 +544,6 @@ void MigrateObsoleteBrowserPrefs(Profile* profile, PrefService* local_state) {
   // Added 05/2014.
   MigrateBrowserTabStripPrefs(local_state);
 #endif
-
-#if !defined(OS_ANDROID)
-  // Added 08/2014.
-  local_state->ClearPref(kLegacyProfileResetPromptMemento);

[Finnur, 2015/11/11 09:55:53]

It is hard for me to know if these (and some of the ones above) can be
removed...

[gab, 2015/11/11 21:30:02]

Based on comment on line 546: anything a year+ old should be removed.

The other ones are more than just this file so I didn't touch them in this CL,
but kLegacyProfileResetPromptMemento was well-timed as it highlighted why it's
done the same way for the newly deprecated pref.

-#endif
 }
 
 // This method should be periodically pruned of year+ old migrations.
@@ -568,6 +558,11 @@ void MigrateObsoleteProfilePrefs(Profile* profile) {
   // Added 02/2015.
   MigrateGoogleNowPrefs(profile);
 #endif
+
+#if defined(OS_WIN)
+  // Added 11/2015.
+  profile_prefs->ClearPref(kShownAutoLaunchInfobarDeprecated);
+#endif
 }
 
 }  // namespace chrome