Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple.

chrome/browser/policy/user_policy_signin_service_unittest.cc

 // Copyright (c) 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 "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/run_loop.h"
 #include "chrome/browser/policy/browser_policy_connector.h"
 #include "chrome/browser/policy/cloud_policy_constants.h"
 #include "chrome/browser/policy/mock_device_management_service.h"
@@ skipping 59 matching lines @@
 
   virtual void SetUp() OVERRIDE {
     device_management_service_ = new MockDeviceManagementService();
     g_browser_process->browser_policy_connector()->
         SetDeviceManagementServiceForTesting(
             scoped_ptr<DeviceManagementService>(device_management_service_));
 
     g_browser_process->browser_policy_connector()->Init();
 
     local_state_.reset(new TestingPrefServiceSimple);
-    chrome::RegisterLocalState(local_state_.get());
+    chrome::RegisterLocalState(local_state_->registry(), local_state_.get());
     TestingBrowserProcess::GetGlobal()->SetLocalState(
         local_state_.get());
 
     // Create a testing profile with cloud-policy-on-signin enabled, and bring
     // up a UserCloudPolicyManager with a MockUserCloudPolicyStore.
     scoped_ptr<TestingPrefServiceSyncable> prefs(
         new TestingPrefServiceSyncable());
     Profile::RegisterUserPrefs(prefs.get());
     chrome::RegisterUserPrefs(prefs.get());
     TestingProfile::Builder builder;
@@ skipping 519 matching lines @@
   SigninManagerFactory::GetForProfile(profile_.get())->SignOut();
   ASSERT_FALSE(manager_->core()->service());
 
   // Now sign in again.
   TestSuccessfulSignin();
 }
 
 }  // namespace
 
 }  // namespace policy