Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple.

chrome/browser/chromeos/login/user_manager_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 <cstdlib>
 #include <cstring>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/values.h"
@@ skipping 42 matching lines @@
         cros_settings_->RemoveSettingsProvider(device_settings_provider_));
     cros_settings_->AddSettingsProvider(&stub_settings_provider_);
 
     // Populate the stub DeviceSettingsProvider with valid values.
     SetDeviceSettings(false, "");
 
     // Register an in-memory local settings instance.
     local_state_.reset(new TestingPrefServiceSimple);
     reinterpret_cast<TestingBrowserProcess*>(g_browser_process)
         ->SetLocalState(local_state_.get());
-    UserManager::RegisterPrefs(local_state_.get());
+    UserManager::RegisterPrefs(local_state_->registry());
     // Wallpaper manager and user image managers prefs will be accessed by the
     // unit-test as well.
-    UserImageManager::RegisterPrefs(local_state_.get());
-    WallpaperManager::RegisterPrefs(local_state_.get());
+    UserImageManager::RegisterPrefs(local_state_->registry());
+    WallpaperManager::RegisterPrefs(local_state_->registry());
 
     old_user_manager_ = UserManager::Get();
     ResetUserManager();
   }
 
   virtual void TearDown() {
     // Unregister the in-memory local settings instance.
     reinterpret_cast<TestingBrowserProcess*>(g_browser_process)
         ->SetLocalState(0);
 
@@ skipping 113 matching lines @@
   ResetUserManager();
   UserManager::Get()->UserLoggedIn("user0@invalid.domain", false);
   ResetUserManager();
 
   const UserList* users = &UserManager::Get()->GetUsers();
   EXPECT_EQ(1U, users->size());
   EXPECT_EQ((*users)[0]->email(), "owner@invalid.domain");
 }
 
 }  // namespace chromeos