Move some deprecated prefs out of chrome/common/pref_names.cc.

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/files/file_util.h"
 #include "base/metrics/histogram_macros.h"
@@ skipping 86 matching lines @@
 #include "components/sync/driver/sync_prefs.h"
 #include "components/syncable_prefs/pref_service_syncable.h"
 #include "components/translate/core/browser/translate_prefs.h"
 #include "components/update_client/update_client.h"
 #include "components/variations/service/variations_service.h"
 #include "components/web_resource/promo_resource_service.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_process_host.h"
 #include "net/http/http_server_properties_manager.h"
 
+#if defined(ENABLE_APP_LIST)
+#include "chrome/browser/apps/drive/drive_app_mapping.h"
+#endif
+
 #if BUILDFLAG(ENABLE_BACKGROUND)
 #include "chrome/browser/background/background_mode_manager.h"
 #endif
 
 #if defined(ENABLE_EXTENSIONS)
 #include "chrome/browser/accessibility/animation_policy_prefs.h"
 #include "chrome/browser/apps/shortcut_manager.h"
 #include "chrome/browser/extensions/activity_log/activity_log.h"
 #include "chrome/browser/extensions/api/commands/command_service.h"
 #include "chrome/browser/extensions/api/tabs/tabs_api.h"
@@ skipping 26 matching lines @@
 #if BUILDFLAG(ANDROID_JAVA_UI)
 #include "chrome/browser/android/bookmarks/partner_bookmarks_shim.h"
 #include "chrome/browser/android/ntp/new_tab_page_prefs.h"
 #include "components/ntp_tiles/most_visited_sites.h"
 #include "components/ntp_tiles/popular_sites.h"
 #else
 #include "chrome/browser/ui/startup/startup_browser_creator.h"
 #include "chrome/browser/upgrade_detector.h"
 #endif
 
-#if !defined(OS_ANDROID)
+#if defined(OS_ANDROID)
+#include "chrome/browser/notifications/notification_platform_bridge_android.h"
+#include "components/ntp_snippets/offline_pages/offline_page_suggestions_provider.h"
+#else
 #include "chrome/browser/services/gcm/gcm_product_util.h"
 #include "chrome/browser/signin/signin_promo.h"
 #include "chrome/browser/ui/webui/foreign_session_handler.h"
 #endif
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"
 #include "chrome/browser/chromeos/arc/arc_auth_service.h"
 #include "chrome/browser/chromeos/customization/customization_document.h"
 #include "chrome/browser/chromeos/display/display_preferences.h"
@@ skipping 34 matching lines @@
 #include "chrome/browser/ui/webui/chromeos/login/reset_screen_handler.h"
 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
 #include "chromeos/audio/audio_devices_pref_handler_impl.h"
 #include "chromeos/timezone/timezone_resolver.h"
 #include "components/invalidation/impl/invalidator_storage.h"
 #include "components/quirks/quirks_manager.h"
 #else
 #include "chrome/browser/extensions/default_apps.h"
 #endif
 
-#if defined(OS_ANDROID)
-#include "chrome/browser/notifications/notification_platform_bridge_android.h"
-#include "components/ntp_snippets/offline_pages/offline_page_suggestions_provider.h"
-#endif
-
 #if defined(OS_CHROMEOS) && defined(ENABLE_APP_LIST)
 #include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h"
 #endif
 
 #if defined(OS_MACOSX)
 #include "chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac.h"
 #include "chrome/browser/ui/cocoa/confirm_quit.h"
 #endif
 
 #if defined(OS_WIN)
 #include "chrome/browser/apps/app_launch_for_metro_restart_win.h"
 #include "chrome/browser/component_updater/sw_reporter_installer_win.h"
 #endif
 
+#if !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
+#include "chrome/browser/ui/startup/default_browser_prompt.h"
+#endif
+
 #if defined(TOOLKIT_VIEWS)
 #include "chrome/browser/ui/browser_view_prefs.h"
 #endif
 
 #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
-
-#if defined(ENABLE_APP_LIST)
-#include "chrome/browser/apps/drive/drive_app_mapping.h"
-#endif
-
 namespace {
 
 #if defined(OS_WIN)
 // Deprecated 11/2015 (M48). TODO(gab): delete in M52+.
 const char kShownAutoLaunchInfobarDeprecated[] =
     "browser.shown_autolaunch_infobar";
 #endif  // defined(OS_WIN)
 
 // The SessionStartupPref used this pref to store the list of URLs to restore
 // on startup, and then renamed it to "sessions.startup_urls" in M31. Migration
@@ skipping 43 matching lines @@
 const char kCheckDefaultBrowser[] = "browser.check_default_browser";
 
 // Deprecated 5/2016.
 const char kDesktopSearchRedirectionInfobarShownPref[] =
     "desktop_search_redirection_infobar_shown";
 
 // Deprecated 7/2016.
 const char kNetworkPredictionEnabled[] = "dns_prefetching.enabled";
 const char kDisableSpdy[] = "spdy.disabled";
 
-void DeleteWebRTCIdentityStoreDBOnFileThread(base::FilePath profile_path) {
+// Deprecated 8/2016.
+const char kRecentlySelectedEncoding[] = "profile.recently_selected_encodings";
+const char kStaticEncodings[] = "intl.static_encodings";
+
+// Deprecated 9/2016.
+const char kWebKitUsesUniversalDetector[] =
+    "webkit.webprefs.uses_universal_detector";
+
+void DeleteWebRTCIdentityStoreDBOnFileThread(
+    const base::FilePath& profile_path) {
   base::DeleteFile(profile_path.Append(
       FILE_PATH_LITERAL("WebRTCIdentityStore")), false);
   base::DeleteFile(profile_path.Append(
       FILE_PATH_LITERAL("WebRTCIdentityStore-journal")), false);
 }
 
-void DeleteWebRTCIdentityStoreDB(Profile* profile) {
+void DeleteWebRTCIdentityStoreDB(const Profile& profile) {
   content::BrowserThread::PostDelayedTask(
       content::BrowserThread::FILE,
       FROM_HERE,
-      base::Bind(&DeleteWebRTCIdentityStoreDBOnFileThread, profile->GetPath()),
+      base::Bind(&DeleteWebRTCIdentityStoreDBOnFileThread, profile.GetPath()),
       base::TimeDelta::FromSeconds(120));
 }
 
 }  // namespace
 
 namespace chrome {
 
 void RegisterLocalState(PrefRegistrySimple* registry) {
   // Please keep this list alphabetized.
   AppListService::RegisterPrefs(registry);
@@ skipping 307 matching lines @@
   registry->RegisterBooleanPref(kGoogleGeolocationAccessEnabled, false);
 #endif
 
   registry->RegisterBooleanPref(kCheckDefaultBrowser, true);
 
   registry->RegisterBooleanPref(kDesktopSearchRedirectionInfobarShownPref,
                                 false);
 
   registry->RegisterBooleanPref(kNetworkPredictionEnabled, true);
   registry->RegisterBooleanPref(kDisableSpdy, false);
-  registry->RegisterStringPref(prefs::kStaticEncodings, std::string());
-  registry->RegisterStringPref(prefs::kRecentlySelectedEncoding, std::string());
+  registry->RegisterStringPref(kStaticEncodings, std::string());
+  registry->RegisterStringPref(kRecentlySelectedEncoding, std::string());
+  registry->RegisterBooleanPref(kWebKitUsesUniversalDetector, true);
 }
 
 void RegisterUserProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
   RegisterProfilePrefs(registry);
 
 #if defined(OS_CHROMEOS)
   chromeos::PowerPrefs::RegisterUserProfilePrefs(registry);
 #endif
 }
 
@@ skipping 77 matching lines @@
             : base::Time::Now();
     profile_prefs->SetInt64(prefs::kDefaultBrowserLastDeclined,
                             install_time.ToInternalValue());
   }
   profile_prefs->ClearPref(kCheckDefaultBrowser);
 
   // Added 5/2016.
   profile_prefs->ClearPref(kDesktopSearchRedirectionInfobarShownPref);
 
   // Added 7/2016.
-  DeleteWebRTCIdentityStoreDB(profile);
+  DeleteWebRTCIdentityStoreDB(*profile);
   profile_prefs->ClearPref(kNetworkPredictionEnabled);
   profile_prefs->ClearPref(kDisableSpdy);
 
   // Added 8/2016.
-  profile_prefs->ClearPref(prefs::kStaticEncodings);
-  profile_prefs->ClearPref(prefs::kRecentlySelectedEncoding);
+  profile_prefs->ClearPref(kStaticEncodings);
+  profile_prefs->ClearPref(kRecentlySelectedEncoding);
 
   // Added 9/2016.
-  profile_prefs->ClearPref(prefs::kWebKitUsesUniversalDetector);
+  profile_prefs->ClearPref(kWebKitUsesUniversalDetector);
 }
 
 }  // namespace chrome