Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple.

chrome/browser/chromeos/display/display_preferences.h

Index: chrome/browser/chromeos/display/display_preferences.h
diff --git a/chrome/browser/chromeos/display/display_preferences.h b/chrome/browser/chromeos/display/display_preferences.h
index 615ce570bc1aadc8bd32783e0668820390e807e0..009b269dc6ce2681ee65ce7dbab99b3dd3eef81f 100644
--- a/chrome/browser/chromeos/display/display_preferences.h
+++ b/chrome/browser/chromeos/display/display_preferences.h
@@ -7,7 +7,7 @@
 
 #include "base/basictypes.h"
 
-class PrefServiceSimple;
+class PrefRegistrarSimple;
 
 namespace gfx {
 class Display;
@@ -18,7 +18,7 @@ namespace chromeos {
 
 // Registers the prefs associated with display settings and stored
 // into Local State.
-void RegisterDisplayLocalStatePrefs(PrefServiceSimple* local_state);
+void RegisterDisplayLocalStatePrefs(PrefRegistrarSimple* local_state);
 
 // Sets or updates the display layout data to the specified |display| and
 // |pref_service|.