Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple.

chrome/browser/chromeos/display/display_preferences.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/display/display_manager.h"
 #include "ash/shell.h"
 #include "base/string16.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
+#include "chrome/browser/prefs/pref_registry_simple.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/common/pref_names.h"
 #include "googleurl/src/url_canon.h"
 #include "googleurl/src/url_util.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/insets.h"
 
 namespace chromeos {
 namespace {
@@ skipping 99 matching lines @@
       LOG(WARNING) << "Can't convert the data into insets for " << *it;
       continue;
     }
 
     display_controller->SetOverscanInsets(display_id, insets);
   }
 }
 
 }  // namespace
 
-void RegisterDisplayLocalStatePrefs(PrefServiceSimple* local_state) {
+void RegisterDisplayLocalStatePrefs(PrefRegistrySimple* registry) {
   // The default secondary display layout.
-  local_state->RegisterIntegerPref(prefs::kSecondaryDisplayLayout,
-                                   static_cast<int>(ash::DisplayLayout::RIGHT));
+  registry->RegisterIntegerPref(prefs::kSecondaryDisplayLayout,
+                                static_cast<int>(ash::DisplayLayout::RIGHT));
   // The default offset of the secondary display position from the primary
   // display.
-  local_state->RegisterIntegerPref(prefs::kSecondaryDisplayOffset, 0);
+  registry->RegisterIntegerPref(prefs::kSecondaryDisplayOffset, 0);
   // Per-display preference.
-  local_state->RegisterDictionaryPref(prefs::kSecondaryDisplays);
+  registry->RegisterDictionaryPref(prefs::kSecondaryDisplays);
 
   // Primary output name.
-  local_state->RegisterInt64Pref(prefs::kPrimaryDisplayID,
-                                 gfx::Display::kInvalidDisplayID);
+  registry->RegisterInt64Pref(prefs::kPrimaryDisplayID,
+                              gfx::Display::kInvalidDisplayID);
 
   // Display overscan preference.
-  local_state->RegisterDictionaryPref(prefs::kDisplayOverscans);
+  registry->RegisterDictionaryPref(prefs::kDisplayOverscans);
 }
 
 void SetDisplayLayoutPref(const gfx::Display& display,
                           int layout,
                           int offset) {
   ash::DisplayLayout display_layout(
       static_cast<ash::DisplayLayout::Position>(layout), offset);
   if (IsValidUser()) {
     PrefService* local_state = g_browser_process->local_state();
     DictionaryPrefUpdate update(local_state, prefs::kSecondaryDisplays);
@@ skipping 55 matching lines @@
 
 void NotifyDisplayLocalStatePrefChanged() {
   PrefService* local_state = g_browser_process->local_state();
   ash::Shell::GetInstance()->display_controller()->SetPrimaryDisplayId(
       local_state->GetInt64(prefs::kPrimaryDisplayID));
   NotifyDisplayLayoutChanged();
   NotifyDisplayOverscans();
 }
 
 }  // namespace chromeos