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 3c3381ec58a1e1046f51e3eac870f97b9a60f587..f5b1d32784c94ba72c5a62d53709ea58ad590e23 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"
@@ -226,14 +225,9 @@
 
 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.
-const char kLegacyProfileResetPromptMemento[] = "profile.reset_prompt_memento";
-#endif
+// Deprecated 11/15.

[Bernhard Bauer, 2015/11/10 16:14:13]

Use the four-digit year.

[gab, 2015/11/10 16:29:03]

Done.

+const char kShownAutoLaunchInfobarDeprecated[] =

[Bernhard Bauer, 2015/11/10 16:14:13]

Can you add a TODO with fixed date / milestone to remove this and a bug number?

[gab, 2015/11/10 16:29:03]

Done, no bug number though, I tend to just make it a rule for myself or anything
I review that touches this file to ask them to cleanup past due removal code at
the same time (like I did for kLegacyProfileResetPromptMemento in this CL).

+    "browser.shown_autolaunch_infobar";
 
 }  // namespace

[Bernhard Bauer, 2015/11/10 16:14:13]

Kinda unrelated, but the anonymous namespace is unnecessary.

[gab, 2015/11/10 16:29:03]

True, but Chromium style tends to put everything that is local in an anonymous
namespace, so I'd prefer to keep it that way.

 
@@ -355,12 +349,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.
@@ -479,7 +467,6 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
   NewTabUI::RegisterProfilePrefs(registry);
   PepperFlashSettingsManager::RegisterProfilePrefs(registry);
   PinnedTabCodec::RegisterProfilePrefs(registry);
-  RegisterAutolaunchUserPrefs(registry);
   signin::RegisterProfilePrefs(registry);
 #endif
 
@@ -519,6 +506,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.
+#if defined(OS_WIN)
+  registry->RegisterIntegerPref(kShownAutoLaunchInfobarDeprecated, 0);
+#endif  // defined(OS_WIN)
 }
 
 void RegisterUserProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
@@ -547,11 +540,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);
-#endif
 }
 
 // This method should be periodically pruned of year+ old migrations.
@@ -566,6 +554,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