Remove PrefService parameter from chrome::RegisterPrefs.

TBR=ben@chromium.org
BUG=155525

Review URL: https://codereview.chromium.org/12324009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@183812 0039d316-1c4b-4281-b951-d872f2087c98

13 files changed, 19 insertions, 24 deletions

diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
index ec8b400..7ceb5ca 100644
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -802,6 +802,10 @@ void BrowserProcessImpl::CreateLocalState() {
   base::FilePath local_state_path;
   CHECK(PathService::Get(chrome::FILE_LOCAL_STATE, &local_state_path));
   scoped_refptr<PrefRegistrySimple> pref_registry = new PrefRegistrySimple;
+
+  // Register local state preferences.
+  chrome::RegisterLocalState(pref_registry);
+
   local_state_.reset(
       chrome_prefs::CreateLocalState(local_state_path,
                                      local_state_task_runner_,
@@ -810,13 +814,6 @@ void BrowserProcessImpl::CreateLocalState() {
                                      pref_registry,
                                      false));
 
-  // Initialize the prefs of the local state.
-  //
-  // TODO(joi): Once we clean up so none of the registration methods
-  // need the PrefService pointer, this should happen before the call
-  // to CreateLocalState.
-  chrome::RegisterLocalState(local_state_.get(), pref_registry);
-
   pref_change_registrar_.Init(local_state_.get());
 
   // Initialize the notification for the default browser setting policy.
diff --git a/chrome/browser/metrics/metrics_log_unittest.cc b/chrome/browser/metrics/metrics_log_unittest.cc
index 45b0c1c..fa26522 100644
--- a/chrome/browser/metrics/metrics_log_unittest.cc
+++ b/chrome/browser/metrics/metrics_log_unittest.cc
@@ -54,7 +54,7 @@ class TestMetricsLog : public MetricsLog {
   TestMetricsLog(const std::string& client_id, int session_id)
       : MetricsLog(client_id, session_id),
         brand_for_testing_(kBrandForTesting) {
-    chrome::RegisterLocalState(&prefs_, prefs_.registry());
+    chrome::RegisterLocalState(prefs_.registry());
 
 #if defined(OS_CHROMEOS)
     prefs_.SetInteger(prefs::kStabilityChildProcessCrashCount, 10);
diff --git a/chrome/browser/notifications/desktop_notifications_unittest.cc b/chrome/browser/notifications/desktop_notifications_unittest.cc
index a657cf7..85ce0e23 100644
--- a/chrome/browser/notifications/desktop_notifications_unittest.cc
+++ b/chrome/browser/notifications/desktop_notifications_unittest.cc
@@ -103,7 +103,7 @@ void DesktopNotificationsTest::SetUp() {
   active_desktop_monitor_.reset(new ActiveDesktopMonitor);
 #endif
 
-  chrome::RegisterLocalState(&local_state_, local_state_.registry());
+  chrome::RegisterLocalState(local_state_.registry());
   profile_.reset(new TestingProfile());
   ui_manager_.reset(new BalloonNotificationUIManager(&local_state_));
   balloon_collection_ = new MockBalloonCollection();
diff --git a/chrome/browser/policy/cloud_policy_core_unittest.cc b/chrome/browser/policy/cloud_policy_core_unittest.cc
index 7fd734b..32c42a3 100644
--- a/chrome/browser/policy/cloud_policy_core_unittest.cc
+++ b/chrome/browser/policy/cloud_policy_core_unittest.cc
@@ -23,7 +23,7 @@ class CloudPolicyCoreTest : public testing::Test {
       : core_(PolicyNamespaceKey(dm_protocol::kChromeUserPolicyType,
                                  std::string()),
               &store_) {
-    chrome::RegisterLocalState(&prefs_, prefs_.registry());
+    chrome::RegisterLocalState(prefs_.registry());
   }
 
   MessageLoop loop_;
diff --git a/chrome/browser/policy/device_cloud_policy_manager_chromeos_unittest.cc b/chrome/browser/policy/device_cloud_policy_manager_chromeos_unittest.cc
index 77e53e8..bd909b3 100644
--- a/chrome/browser/policy/device_cloud_policy_manager_chromeos_unittest.cc
+++ b/chrome/browser/policy/device_cloud_policy_manager_chromeos_unittest.cc
@@ -47,7 +47,7 @@ class DeviceCloudPolicyManagerChromeOSTest
 
   virtual void SetUp() OVERRIDE {
     DeviceSettingsTestBase::SetUp();
-    chrome::RegisterLocalState(&local_state_, local_state_.registry());
+    chrome::RegisterLocalState(local_state_.registry());
     manager_.Init();
   }
 
diff --git a/chrome/browser/policy/policy_statistics_collector_unittest.cc b/chrome/browser/policy/policy_statistics_collector_unittest.cc
index c48d2e7..376cb31 100644
--- a/chrome/browser/policy/policy_statistics_collector_unittest.cc
+++ b/chrome/browser/policy/policy_statistics_collector_unittest.cc
@@ -60,7 +60,7 @@ class PolicyStatisticsCollectorTest : public testing::Test {
   }
 
   virtual void SetUp() OVERRIDE {
-    chrome::RegisterLocalState(&prefs_, prefs_.registry());
+    chrome::RegisterLocalState(prefs_.registry());
 
     // Find ids for kTestPolicy1 and kTestPolicy2.
     const policy::PolicyDefinitionList* policy_list =
diff --git a/chrome/browser/policy/user_cloud_policy_manager_chromeos_unittest.cc b/chrome/browser/policy/user_cloud_policy_manager_chromeos_unittest.cc
index 83a1f4e..07b7cd7 100644
--- a/chrome/browser/policy/user_cloud_policy_manager_chromeos_unittest.cc
+++ b/chrome/browser/policy/user_cloud_policy_manager_chromeos_unittest.cc
@@ -35,7 +35,7 @@ class UserCloudPolicyManagerChromeOSTest : public testing::Test {
       : store_(NULL) {}
 
   virtual void SetUp() OVERRIDE {
-    chrome::RegisterLocalState(&prefs_, prefs_.registry());
+    chrome::RegisterLocalState(prefs_.registry());
 
     // Set up a policy map for testing.
     policy_map_.Set("key", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
diff --git a/chrome/browser/policy/user_policy_signin_service_unittest.cc b/chrome/browser/policy/user_policy_signin_service_unittest.cc
index 64460c2..aaa674c 100644
--- a/chrome/browser/policy/user_policy_signin_service_unittest.cc
+++ b/chrome/browser/policy/user_policy_signin_service_unittest.cc
@@ -91,7 +91,7 @@ class UserPolicySigninServiceTest : public testing::Test {
     g_browser_process->browser_policy_connector()->Init();
 
     local_state_.reset(new TestingPrefServiceSimple);
-    chrome::RegisterLocalState(local_state_.get(), local_state_->registry());
+    chrome::RegisterLocalState(local_state_->registry());
     TestingBrowserProcess::GetGlobal()->SetLocalState(
         local_state_.get());
 
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index da61015..4a1cd31 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -159,11 +159,7 @@ enum MigratedPreferences {
 
 namespace chrome {
 
-// TODO(joi): Do the work needed to remove the PrefService parameter,
-// i.e. to do all registration up front before a PrefService is even
-// created.
-void RegisterLocalState(PrefService* local_state,
-                        PrefRegistrySimple* registry) {
+void RegisterLocalState(PrefRegistrySimple* registry) {
   // Prefs in Local State.
   registry->RegisterIntegerPref(prefs::kMultipleProfilePrefMigration, 0);
 
diff --git a/chrome/browser/prefs/browser_prefs.h b/chrome/browser/prefs/browser_prefs.h
index 022f4a6..be8234d 100644
--- a/chrome/browser/prefs/browser_prefs.h
+++ b/chrome/browser/prefs/browser_prefs.h
@@ -12,8 +12,10 @@ class Profile;
 
 namespace chrome {
 
-// Makes the PrefService objects aware of all the prefs.
-void RegisterLocalState(PrefService* local_state, PrefRegistrySimple* registry);
+// Register all prefs that will be used via the local state PrefService.
+void RegisterLocalState(PrefRegistrySimple* registry);
+
+// Register all prefs that will be used via a PrefService attached to a Profile.
 void RegisterUserPrefs(PrefService* user_prefs, PrefRegistrySyncable* registry);
 
 // Migrates prefs from |local_state| to |profile|'s pref store.
diff --git a/chrome/browser/profiles/off_the_record_profile_impl_unittest.cc b/chrome/browser/profiles/off_the_record_profile_impl_unittest.cc
index 94a2fda..fabce70 100644
--- a/chrome/browser/profiles/off_the_record_profile_impl_unittest.cc
+++ b/chrome/browser/profiles/off_the_record_profile_impl_unittest.cc
@@ -84,7 +84,7 @@ class OffTheRecordProfileImplTest : public BrowserWithTestWindowTest {
 
   virtual void SetUp() OVERRIDE {
     prefs_.reset(new TestingPrefServiceSimple);
-    chrome::RegisterLocalState(prefs_.get(), prefs_->registry());
+    chrome::RegisterLocalState(prefs_->registry());
 
     browser_process()->SetLocalState(prefs_.get());
 
diff --git a/chrome/browser/signin/signin_manager_unittest.cc b/chrome/browser/signin/signin_manager_unittest.cc
index a2307ec..d6585f9 100644
--- a/chrome/browser/signin/signin_manager_unittest.cc
+++ b/chrome/browser/signin/signin_manager_unittest.cc
@@ -65,7 +65,7 @@ class SigninManagerTest : public TokenServiceTestHarness {
 
   virtual void SetUp() OVERRIDE {
     prefs_.reset(new TestingPrefServiceSimple);
-    chrome::RegisterLocalState(prefs_.get(), prefs_->registry());
+    chrome::RegisterLocalState(prefs_->registry());
     TestingBrowserProcess::GetGlobal()->SetLocalState(
         prefs_.get());
     TokenServiceTestHarness::SetUp();
diff --git a/chrome/test/base/scoped_testing_local_state.cc b/chrome/test/base/scoped_testing_local_state.cc
index 2e5f904..e2915e5 100644
--- a/chrome/test/base/scoped_testing_local_state.cc
+++ b/chrome/test/base/scoped_testing_local_state.cc
@@ -11,7 +11,7 @@
 ScopedTestingLocalState::ScopedTestingLocalState(
     TestingBrowserProcess* browser_process)
     : browser_process_(browser_process) {
-  chrome::RegisterLocalState(&local_state_, local_state_.registry());
+  chrome::RegisterLocalState(local_state_.registry());
   EXPECT_FALSE(browser_process->local_state());
   browser_process->SetLocalState(&local_state_);
 }