Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple.

chrome/browser/prefs/pref_service_builder.h

 // 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.
 
 #ifndef CHROME_BROWSER_PREFS_PREF_SERVICE_BUILDER_H_
 #define CHROME_BROWSER_PREFS_PREF_SERVICE_BUILDER_H_
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "base/prefs/persistent_pref_store.h"
 #include "base/prefs/pref_store.h"
+#include "chrome/browser/prefs/pref_registry.h"
 
-class PrefServiceSimple;
+class PrefService;
 
 namespace base {
 class FilePath;
 class SequencedTaskRunner;
 }
 
 // A class that allows convenient building of PrefService.
 class PrefServiceBuilder {
  public:
   PrefServiceBuilder();
@@ skipping 13 matching lines @@
       const base::Callback<void(PersistentPrefStore::PrefReadError)>&
           read_error_callback);
 
   // Specifies to use an actual file-backed user pref store.
   PrefServiceBuilder& WithUserFilePrefs(
       const base::FilePath& prefs_file,
       base::SequencedTaskRunner* task_runner);
 
   PrefServiceBuilder& WithAsync(bool async);
 
-  // Creates a PrefServiceSimple object initialized with the
-  // parameters from this builder.
-  virtual PrefServiceSimple* CreateSimple();
+  // Creates a PrefService object initialized with the parameters from
+  // this builder.
+  virtual PrefService* Create(PrefRegistry* registry);
 
  protected:
   virtual void ResetDefaultState();
 
   scoped_refptr<PrefStore> managed_prefs_;
   scoped_refptr<PrefStore> extension_prefs_;
   scoped_refptr<PrefStore> command_line_prefs_;
   scoped_refptr<PersistentPrefStore> user_prefs_;
   scoped_refptr<PrefStore> recommended_prefs_;
 
   base::Callback<void(PersistentPrefStore::PrefReadError)> read_error_callback_;
 
   // Defaults to false.
   bool async_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(PrefServiceBuilder);
 };
 
 #endif  // CHROME_BROWSER_PREFS_PREF_SERVICE_BUILDER_H_