Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple.

chrome/browser/prefs/pref_service_mock_builder.cc

Index: chrome/browser/prefs/pref_service_mock_builder.cc
diff --git a/chrome/browser/prefs/pref_service_mock_builder.cc b/chrome/browser/prefs/pref_service_mock_builder.cc
index fb8b7218cf823eaa31ebacc40d07f72ef3f23711..7bab6f5fee90217f8f5d75dfed16a63623b4461c 100644
--- a/chrome/browser/prefs/pref_service_mock_builder.cc
+++ b/chrome/browser/prefs/pref_service_mock_builder.cc
@@ -12,8 +12,9 @@ PrefServiceMockBuilder::PrefServiceMockBuilder() {
 
 PrefServiceMockBuilder::~PrefServiceMockBuilder() {}
 
-PrefServiceSimple* PrefServiceMockBuilder::CreateSimple() {
-  PrefServiceSimple* service = PrefServiceBuilder::CreateSimple();
+PrefService* PrefServiceMockBuilder::Create(
+    scoped_ptr<PrefRegistry> pref_registry) {
+  PrefService* service = PrefServiceBuilder::Create(pref_registry.Pass());
   return service;
 }