Delete the auto-launch trial.

chrome/browser/prefs/browser_prefs.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/prefs/browser_prefs.h"
 
 #include <string>
 
 #include "base/metrics/histogram_macros.h"
 #include "base/prefs/pref_registry_simple.h"
@@ skipping 42 matching lines @@
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/task_manager/task_manager.h"
 #include "chrome/browser/tracing/chrome_tracing_delegate.h"
 #include "chrome/browser/ui/app_list/app_list_prefs.h"
 #include "chrome/browser/ui/app_list/app_list_service.h"
 #include "chrome/browser/ui/browser_ui_prefs.h"
 #include "chrome/browser/ui/navigation_correction_tab_observer.h"
 #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"
 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h"
 #include "chrome/browser/ui/webui/plugins_ui.h"
 #include "chrome/browser/ui/webui/print_preview/sticky_settings.h"
 #include "chrome/common/pref_names.h"
 #include "components/autofill/core/browser/autofill_manager.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "components/dom_distiller/core/distilled_page_prefs.h"
@@ skipping 146 matching lines @@
 #if defined(USE_ASH)
 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h"
 #endif
 
 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
 #include "chrome/browser/ui/startup/default_browser_prompt.h"
 #endif
 
 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
 
 namespace chrome {
 
 void RegisterLocalState(PrefRegistrySimple* registry) {
   // Please keep this list alphabetized.
   AppListService::RegisterPrefs(registry);
   browser_shutdown::RegisterPrefs(registry);
   BrowserProcessImpl::RegisterPrefs(registry);
@@ skipping 102 matching lines @@
 
 #if defined(OS_WIN)
   app_metro_launch::RegisterPrefs(registry);
   component_updater::RegisterPrefsForSwReporter(registry);
   password_manager::PasswordManager::RegisterLocalPrefs(registry);
 #endif
 
 #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.
 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
   TRACE_EVENT0("browser", "chrome::RegisterProfilePrefs");
   SCOPED_UMA_HISTOGRAM_TIMER("Settings.RegisterProfilePrefsTime");
   // User prefs. Please keep this list alphabetized.
   autofill::AutofillManager::RegisterProfilePrefs(registry);
   sync_driver::SyncPrefs::RegisterProfilePrefs(registry);
   ChromeContentBrowserClient::RegisterProfilePrefs(registry);
@@ skipping 98 matching lines @@
   DevToolsWindow::RegisterProfilePrefs(registry);
   DriveAppMapping::RegisterProfilePrefs(registry);
   extensions::CommandService::RegisterProfilePrefs(registry);
   extensions::ExtensionSettingsHandler::RegisterProfilePrefs(registry);
   extensions::TabsCaptureVisibleTabFunction::RegisterProfilePrefs(registry);
   first_run::RegisterProfilePrefs(registry);
   gcm::GCMChannelStatusSyncer::RegisterProfilePrefs(registry);
   NewTabUI::RegisterProfilePrefs(registry);
   PepperFlashSettingsManager::RegisterProfilePrefs(registry);
   PinnedTabCodec::RegisterProfilePrefs(registry);
-  RegisterAutolaunchUserPrefs(registry);
   signin::RegisterProfilePrefs(registry);
 #endif
 
 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
   default_apps::RegisterProfilePrefs(registry);
 #endif
 
 #if defined(OS_CHROMEOS)
   chromeos::first_run::RegisterProfilePrefs(registry);
   chromeos::file_system_provider::RegisterProfilePrefs(registry);
@@ skipping 19 matching lines @@
   RegisterInvertBubbleUserPrefs(registry);
 #endif
 
 #if defined(USE_ASH)
   ash::RegisterChromeLauncherUserPrefs(registry);
 #endif
 
 #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) {
   RegisterProfilePrefs(registry);
 
 #if defined(OS_CHROMEOS)
   chromeos::PowerPrefs::RegisterUserProfilePrefs(registry);
 #endif
 }
 
 void RegisterScreenshotPrefs(PrefRegistrySimple* registry) {
   registry->RegisterBooleanPref(prefs::kDisableScreenshots, false);
 }
 
 #if defined(OS_CHROMEOS)
 void RegisterLoginProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
   RegisterProfilePrefs(registry);
 
   chromeos::PowerPrefs::RegisterLoginProfilePrefs(registry);
 }
 #endif
 
 // This method should be periodically pruned of year+ old migrations.
 void MigrateObsoleteBrowserPrefs(Profile* profile, PrefService* local_state) {
 #if defined(TOOLKIT_VIEWS)
   // 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.
 void MigrateObsoleteProfilePrefs(Profile* profile) {
   PrefService* profile_prefs = profile->GetPrefs();
 
   // Added 07/2014.
   translate::TranslatePrefs::MigrateUserPrefs(profile_prefs,
                                               prefs::kAcceptLanguages);
 
 #if defined(OS_CHROMEOS) && defined(ENABLE_APP_LIST)
   // Added 02/2015.
   MigrateGoogleNowPrefs(profile);
 #endif
+
+#if defined(OS_WIN)
+  // Added 11/2015.
+  profile_prefs->ClearPref(kShownAutoLaunchInfobarDeprecated);
+#endif
 }
 
 }  // namespace chrome