Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple.

chrome/browser/chromeos/display/display_preferences_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 "chrome/browser/chromeos/display/display_preferences.h"
 
 #include "ash/display/display_controller.h"
 #include "ash/screen_ash.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "base/string_number_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/login/mock_user_manager.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_pref_service.h"
 
 namespace chromeos {
 namespace {
 
 class DisplayPreferencesTest : public ash::test::AshTestBase {
  protected:
   DisplayPreferencesTest() : ash::test::AshTestBase() {}
   virtual ~DisplayPreferencesTest() {}
 
   virtual void SetUp() OVERRIDE {
     ash::test::AshTestBase::SetUp();
-    RegisterDisplayLocalStatePrefs(&local_state_);
+    RegisterDisplayLocalStatePrefs(local_state_.registry());
     TestingBrowserProcess::GetGlobal()->SetLocalState(&local_state_);
   }
 
   virtual void TearDown() OVERRIDE {
     TestingBrowserProcess::GetGlobal()->SetLocalState(NULL);
     ash::test::AshTestBase::TearDown();
   }
 
   void LoggedInAsUser() {
     EXPECT_CALL(*mock_user_manager_.user_manager(), IsUserLoggedIn())
@@ skipping 181 matching lines @@
   gfx::Screen* screen = gfx::Screen::GetNativeScreen();
   EXPECT_EQ(id2, screen->GetPrimaryDisplay().id());
   EXPECT_EQ(ash::DisplayLayout::BOTTOM,
             display_controller->GetCurrentDisplayLayout().position);
   EXPECT_EQ(-10, display_controller->GetCurrentDisplayLayout().offset);
   EXPECT_EQ("176x178", screen->GetPrimaryDisplay().bounds().size().ToString());
 }
 
 }  // namespace
 }  // namespace chromeos