Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple.

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 "chrome/browser/about_flags.h"
 #include "chrome/browser/accessibility/invert_bubble_prefs.h"
 #include "chrome/browser/autofill/autofill_manager.h"
 #include "chrome/browser/background/background_mode_manager.h"
 #include "chrome/browser/bookmarks/bookmark_prompt_prefs.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
+#include "chrome/browser/browser_process_impl.h"
 #include "chrome/browser/browser_shutdown.h"
 #include "chrome/browser/chrome_content_browser_client.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
 #include "chrome/browser/devtools/devtools_window.h"
 #include "chrome/browser/download/download_prefs.h"
 #include "chrome/browser/extensions/api/commands/command_service.h"
 #include "chrome/browser/extensions/api/tabs/tabs_api.h"
 #include "chrome/browser/extensions/component_loader.h"
 #include "chrome/browser/extensions/extension_prefs.h"
@@ skipping 16 matching lines @@
 #include "chrome/browser/net/net_pref_observer.h"
 #include "chrome/browser/net/predictor.h"
 #include "chrome/browser/net/ssl_config_service_manager.h"
 #include "chrome/browser/notifications/desktop_notification_service.h"
 #include "chrome/browser/notifications/notification_prefs_manager.h"
 #include "chrome/browser/page_info_model.h"
 #include "chrome/browser/password_manager/password_manager.h"
 #include "chrome/browser/pepper_flash_settings_manager.h"
 #include "chrome/browser/plugins/plugin_finder.h"
 #include "chrome/browser/prefs/incognito_mode_prefs.h"
+#include "chrome/browser/prefs/pref_registry_simple.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/session_startup_pref.h"
 #include "chrome/browser/profiles/chrome_version_service.h"
 #include "chrome/browser/profiles/profile_impl.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/renderer_host/web_cache_manager.h"
 #include "chrome/browser/search_engines/template_url_prepopulate_data.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/sync/sync_prefs.h"
@@ skipping 79 matching lines @@
   NO_PREFS = 0,
   DNS_PREFS = 1 << 0,
   WINDOWS_PREFS = 1 << 1,
   GOOGLE_URL_TRACKER_PREFS = 1 << 2,
 };
 
 }  // namespace
 
 namespace chrome {
 
-void RegisterLocalState(PrefServiceSimple* local_state) {
+void RegisterLocalState(PrefRegistrySimple* registry,
+                        PrefService* local_state) {
   // Prefs in Local State.
-  local_state->RegisterIntegerPref(prefs::kMultipleProfilePrefMigration, 0);
+  registry->RegisterIntegerPref(prefs::kMultipleProfilePrefMigration, 0);
 
   // Please keep this list alphabetized.
-  browser_shutdown::RegisterPrefs(local_state);
-  chrome::RegisterScreenshotPrefs(local_state);
-  ExternalProtocolHandler::RegisterPrefs(local_state);
-  FlagsUI::RegisterPrefs(local_state);
-  geolocation::RegisterPrefs(local_state);
-  IntranetRedirectDetector::RegisterPrefs(local_state);
-  KeywordEditorController::RegisterPrefs(local_state);
-  MetricsLog::RegisterPrefs(local_state);
-  MetricsService::RegisterPrefs(local_state);
-  PrefProxyConfigTrackerImpl::RegisterPrefs(local_state);
-  ProfileInfoCache::RegisterPrefs(local_state);
-  ProfileManager::RegisterPrefs(local_state);
-  PromoResourceService::RegisterPrefs(local_state);
-  SigninManagerFactory::RegisterPrefs(local_state);
-  SSLConfigServiceManager::RegisterPrefs(local_state);
-  UpgradeDetector::RegisterPrefs(local_state);
-  WebCacheManager::RegisterPrefs(local_state);
+  browser_shutdown::RegisterPrefs(registry);
+  chrome::RegisterScreenshotPrefs(registry);
+  ExternalProtocolHandler::RegisterPrefs(registry);
+  FlagsUI::RegisterPrefs(registry);
+  geolocation::RegisterPrefs(registry);
+  IntranetRedirectDetector::RegisterPrefs(registry);
+  KeywordEditorController::RegisterPrefs(registry);
+  MetricsLog::RegisterPrefs(registry);
+  MetricsService::RegisterPrefs(registry);
+  PrefProxyConfigTrackerImpl::RegisterPrefs(registry);
+  ProfileInfoCache::RegisterPrefs(registry);
+  ProfileManager::RegisterPrefs(registry);
+  PromoResourceService::RegisterPrefs(registry);
+  SigninManagerFactory::RegisterPrefs(registry);
+  SSLConfigServiceManager::RegisterPrefs(registry);
+  UpgradeDetector::RegisterPrefs(registry);
+  WebCacheManager::RegisterPrefs(registry);
 
 #if defined(ENABLE_PLUGINS)
-  PluginFinder::RegisterPrefs(local_state);
+  PluginFinder::RegisterPrefs(registry);
 #endif
 
 #if defined(ENABLE_PLUGIN_INSTALLATION)
-  PluginsResourceService::RegisterPrefs(local_state);
+  PluginsResourceService::RegisterPrefs(registry);
 #endif
 
 #if defined(ENABLE_CONFIGURATION_POLICY)
-  policy::CloudPolicySubsystem::RegisterPrefs(local_state);
-  policy::PolicyStatisticsCollector::RegisterPrefs(local_state);
+  policy::CloudPolicySubsystem::RegisterPrefs(registry);
+  policy::PolicyStatisticsCollector::RegisterPrefs(registry);
 #endif
 
 #if defined(ENABLE_NOTIFICATIONS)
-  NotificationPrefsManager::RegisterPrefs(local_state);
+  NotificationPrefsManager::RegisterPrefs(local_state, registry);

[Mattias Nissler (ping if slow), 2013/01/25 14:57:11]

Ah, this is the reason. That set-to-default piece of code in the function looks
weird and shouldn't be needed. Can you ask the author why this is there?

[Jói, 2013/01/29 16:10:02]

Mind if we take care of this in a follow-up?

 #endif
 
 #if defined(ENABLE_TASK_MANAGER)
-  TaskManager::RegisterPrefs(local_state);
+  TaskManager::RegisterPrefs(registry);
 #endif  // defined(ENABLE_TASK_MANAGER)
 
 #if defined(TOOLKIT_VIEWS)
-  RegisterBrowserViewPrefs(local_state);
-  RegisterTabStripLayoutTypePrefs(local_state);
+  RegisterBrowserViewPrefs(registry);
+  RegisterTabStripLayoutTypePrefs(registry);
 #endif
 
 #if !defined(OS_ANDROID)
-  BackgroundModeManager::RegisterPrefs(local_state);
-  chrome_variations::VariationsService::RegisterPrefs(local_state);
-  RegisterBrowserPrefs(local_state);
-  ManagedMode::RegisterPrefs(local_state);
+  BackgroundModeManager::RegisterPrefs(registry);
+  chrome_variations::VariationsService::RegisterPrefs(registry);
+  RegisterBrowserPrefs(registry);
+  ManagedMode::RegisterPrefs(registry);
 #endif
 
 #if defined(OS_CHROMEOS)
-  chromeos::AudioHandler::RegisterPrefs(local_state);
-  chromeos::DataPromoNotification::RegisterPrefs(local_state);
-  chromeos::device_settings_cache::RegisterPrefs(local_state);
-  chromeos::language_prefs::RegisterPrefs(local_state);
-  chromeos::ProxyConfigServiceImpl::RegisterPrefs(local_state);
-  chromeos::RegisterDisplayLocalStatePrefs(local_state);
-  chromeos::ServicesCustomizationDocument::RegisterPrefs(local_state);
-  chromeos::UserImageManager::RegisterPrefs(local_state);
-  chromeos::UserManager::RegisterPrefs(local_state);
-  chromeos::WallpaperManager::RegisterPrefs(local_state);
-  chromeos::WizardController::RegisterPrefs(local_state);
-  policy::AutoEnrollmentClient::RegisterPrefs(local_state);
-  policy::DeviceStatusCollector::RegisterPrefs(local_state);
+  chromeos::AudioHandler::RegisterPrefs(registry);
+  chromeos::DataPromoNotification::RegisterPrefs(registry);
+  chromeos::device_settings_cache::RegisterPrefs(registry);
+  chromeos::language_prefs::RegisterPrefs(registry);
+  chromeos::ProxyConfigServiceImpl::RegisterPrefs(registry);
+  chromeos::RegisterDisplayLocalStatePrefs(registry);
+  chromeos::ServicesCustomizationDocument::RegisterPrefs(registry);
+  chromeos::UserImageManager::RegisterPrefs(registry);
+  chromeos::UserManager::RegisterPrefs(registry);
+  chromeos::WallpaperManager::RegisterPrefs(registry);
+  chromeos::WizardController::RegisterPrefs(registry);
+  policy::AutoEnrollmentClient::RegisterPrefs(registry);
+  policy::DeviceStatusCollector::RegisterPrefs(registry);
 #endif
 
 #if defined(OS_MACOSX)
-  confirm_quit::RegisterLocalState(local_state);
+  confirm_quit::RegisterLocalState(registry);
 #endif
 }
 
 void RegisterUserPrefs(PrefServiceSyncable* user_prefs) {
   // User prefs. Please keep this list alphabetized.
   AlternateErrorPageTabObserver::RegisterUserPrefs(user_prefs);
   AutofillManager::RegisterUserPrefs(user_prefs);
   BookmarkPromptPrefs::RegisterUserPrefs(user_prefs);
   bookmark_utils::RegisterUserPrefs(user_prefs);
   BrowserInstantController::RegisterUserPrefs(user_prefs);
@@ skipping 83 matching lines @@
 void MigrateUserPrefs(Profile* profile) {
   // Cleanup old prefs.
   static const char kBackupPref[] = "backup";
   PrefServiceSyncable* prefs = profile->GetPrefs();
   prefs->RegisterDictionaryPref(kBackupPref, new DictionaryValue(),
                                 PrefServiceSyncable::UNSYNCABLE_PREF);
   prefs->ClearPref(kBackupPref);
   prefs->UnregisterPreference(kBackupPref);
 }
 
-void MigrateBrowserPrefs(Profile* profile, PrefServiceSimple* local_state) {
+void MigrateBrowserPrefs(Profile* profile, PrefService* local_state) {
   // Copy pref values which have been migrated to user_prefs from local_state,
   // or remove them from local_state outright, if copying is not required.
   int current_version =
       local_state->GetInteger(prefs::kMultipleProfilePrefMigration);
+  PrefRegistrySimple* registry = static_cast<PrefRegistrySimple*>(
+      local_state->DeprecatedGetPrefRegistry());
 
   if (!(current_version & DNS_PREFS)) {
-    local_state->RegisterListPref(prefs::kDnsStartupPrefetchList);
+    registry->RegisterListPref(prefs::kDnsStartupPrefetchList);

[Mattias Nissler (ping if slow), 2013/01/25 14:57:11]

It seems like we could register these prefs through the regular paths just as
well instead of doing it conditionally here.

[Jói, 2013/01/29 16:10:02]

Mind if we take care of this in a follow-up?

     local_state->ClearPref(prefs::kDnsStartupPrefetchList);
 
-    local_state->RegisterListPref(prefs::kDnsHostReferralList);
+    registry->RegisterListPref(prefs::kDnsHostReferralList);
     local_state->ClearPref(prefs::kDnsHostReferralList);
 
     current_version |= DNS_PREFS;
     local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
                             current_version);
   }
 
   PrefServiceSyncable* user_prefs = profile->GetPrefs();
   if (!(current_version & WINDOWS_PREFS)) {
-    local_state->RegisterIntegerPref(prefs::kDevToolsHSplitLocation, -1);
+    registry->RegisterIntegerPref(prefs::kDevToolsHSplitLocation, -1);
     if (local_state->HasPrefPath(prefs::kDevToolsHSplitLocation)) {
       user_prefs->SetInteger(
           prefs::kDevToolsHSplitLocation,
           local_state->GetInteger(prefs::kDevToolsHSplitLocation));
     }
     local_state->ClearPref(prefs::kDevToolsHSplitLocation);
 
-    local_state->RegisterDictionaryPref(prefs::kBrowserWindowPlacement);
+    registry->RegisterDictionaryPref(prefs::kBrowserWindowPlacement);
     if (local_state->HasPrefPath(prefs::kBrowserWindowPlacement)) {
       const PrefService::Preference* pref =
           local_state->FindPreference(prefs::kBrowserWindowPlacement);
       DCHECK(pref);
       user_prefs->Set(prefs::kBrowserWindowPlacement,
                       *(pref->GetValue()));
     }
     local_state->ClearPref(prefs::kBrowserWindowPlacement);
 
     current_version |= WINDOWS_PREFS;
     local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
                             current_version);
   }
 
   if (!(current_version & GOOGLE_URL_TRACKER_PREFS)) {
     GoogleURLTrackerFactory::GetInstance()->RegisterUserPrefsOnProfile(profile);
-    local_state->RegisterStringPref(prefs::kLastKnownGoogleURL,
-                                    GoogleURLTracker::kDefaultGoogleHomepage);
+    registry->RegisterStringPref(prefs::kLastKnownGoogleURL,
+                                GoogleURLTracker::kDefaultGoogleHomepage);
     if (local_state->HasPrefPath(prefs::kLastKnownGoogleURL)) {
       user_prefs->SetString(prefs::kLastKnownGoogleURL,
                             local_state->GetString(prefs::kLastKnownGoogleURL));
     }
     local_state->ClearPref(prefs::kLastKnownGoogleURL);
 
-    local_state->RegisterStringPref(prefs::kLastPromptedGoogleURL,
-                                    std::string());
+    registry->RegisterStringPref(prefs::kLastPromptedGoogleURL,
+                                std::string());
     if (local_state->HasPrefPath(prefs::kLastPromptedGoogleURL)) {
       user_prefs->SetString(
           prefs::kLastPromptedGoogleURL,
           local_state->GetString(prefs::kLastPromptedGoogleURL));
     }
     local_state->ClearPref(prefs::kLastPromptedGoogleURL);
 
     current_version |= GOOGLE_URL_TRACKER_PREFS;
     local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
                             current_version);
   }
 }
 
 }  // namespace chrome