Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple.

chrome/browser/prefs/chrome_pref_service_factory.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/prefs/chrome_pref_service_factory.h"
 
 #include "base/bind.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/metrics/histogram.h"
@@ skipping 80 matching lines @@
 
 }  // namespace
 
 // TODO(joi): Find a better home for this.
 PrefServiceBase* PrefServiceBase::FromBrowserContext(BrowserContext* context) {
   return static_cast<Profile*>(context)->GetPrefs();
 }
 
 namespace chrome_prefs {
 
-PrefServiceSimple* CreateLocalState(
+PrefService* CreateLocalState(
     const FilePath& pref_filename,
     base::SequencedTaskRunner* pref_io_task_runner,
     policy::PolicyService* policy_service,
     PrefStore* extension_prefs,
     bool async) {
   PrefServiceSyncableBuilder builder;
   PrepareBuilder(&builder,
                  pref_filename,
                  pref_io_task_runner,
                  policy_service,
@@ skipping 12 matching lines @@
   PrepareBuilder(&builder,
                  pref_filename,
                  pref_io_task_runner,
                  policy_service,
                  extension_prefs,
                  async);
   return builder.CreateSyncable();
 }
 
 }  // namespace chrome_prefs