Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple.

chrome/test/base/testing_browser_process.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/test/base/testing_browser_process.h"
 
 #include "base/string_util.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/prefs/pref_service.h"
@@ skipping 70 matching lines @@
   return profile_manager_.get();
 #endif
 }
 
 void TestingBrowserProcess::SetProfileManager(ProfileManager* profile_manager) {
 #if !defined(OS_IOS)
   profile_manager_.reset(profile_manager);
 #endif
 }
 
-PrefServiceSimple* TestingBrowserProcess::local_state() {
+PrefService* TestingBrowserProcess::local_state() {
   return local_state_;
 }
 
 chrome_variations::VariationsService*
     TestingBrowserProcess::variations_service() {
   return NULL;
 }
 
 policy::BrowserPolicyConnector*
     TestingBrowserProcess::browser_policy_connector() {
@@ skipping 215 matching lines @@
 #if !defined(OS_IOS)
   bookmark_prompt_controller_.reset(controller);
 #endif
 }
 
 void TestingBrowserProcess::SetSystemRequestContext(
     net::URLRequestContextGetter* context_getter) {
   system_request_context_ = context_getter;
 }
 
-void TestingBrowserProcess::SetLocalState(PrefServiceSimple* local_state) {
+void TestingBrowserProcess::SetLocalState(PrefService* local_state) {
   if (!local_state) {
     // The local_state_ PrefService is owned outside of TestingBrowserProcess,
     // but some of the members of TestingBrowserProcess hold references to it
     // (for example, via PrefNotifier members). But given our test
     // infrastructure which tears down individual tests before freeing the
     // TestingBrowserProcess, there's not a good way to make local_state outlive
     // these dependencies. As a workaround, whenever local_state_ is cleared
     // (assumedly as part of exiting the test and freeing TestingBrowserProcess)
     // any components owned by TestingBrowserProcess that depend on local_state
     // are also freed.
@@ skipping 22 matching lines @@
 #endif
 }
 
 void TestingBrowserProcess::SetSafeBrowsingService(
     SafeBrowsingService* sb_service) {
 #if !defined(OS_IOS)
   NOTIMPLEMENTED();
   sb_service_ = sb_service;
 #endif
 }