Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple.

chrome/browser/prefs/pref_service_syncable.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_SYNCABLE_H_
 #define CHROME_BROWSER_PREFS_PREF_SERVICE_SYNCABLE_H_
 
 #include "chrome/browser/prefs/pref_model_associator.h"
 #include "chrome/browser/prefs/pref_service.h"
 
@@ skipping 15 matching lines @@
     UNSYNCABLE_PREF,
     SYNCABLE_PREF
   };
 
   // You may wish to use PrefServiceBuilder or one of its subclasses
   // for simplified construction.
   PrefServiceSyncable(
       PrefNotifierImpl* pref_notifier,
       PrefValueStore* pref_value_store,
       PersistentPrefStore* user_prefs,
-      DefaultPrefStore* default_store,
+      PrefRegistry* pref_registry,
       base::Callback<void(PersistentPrefStore::PrefReadError)>
           read_error_callback,
       bool async);
   virtual ~PrefServiceSyncable();
 
   // Creates an incognito copy of the pref service that shares most pref stores
   // but uses a fresh non-persistent overlay for the user pref store and an
   // individual extension pref store (to cache the effective extension prefs for
   // incognito windows).
   PrefServiceSyncable* CreateIncognitoPrefService(
       PrefStore* incognito_extension_prefs);
 
   // Returns true if preferences state has synchronized with the remote
   // preferences. If true is returned it can be assumed the local preferences
   // has applied changes from the remote preferences. The two may not be
   // identical if a change is in flight (from either side).
   bool IsSyncing();
 
   void AddObserver(PrefServiceSyncableObserver* observer);
   void RemoveObserver(PrefServiceSyncableObserver* observer);
 
-  virtual void UnregisterPreference(const char* path) OVERRIDE;
-
   void RegisterBooleanPref(const char* path,
                            bool default_value,
                            PrefSyncStatus sync_status);
   void RegisterIntegerPref(const char* path,
                            int default_value,
                            PrefSyncStatus sync_status);
   void RegisterDoublePref(const char* path,
                           double default_value,
                           PrefSyncStatus sync_status);
   void RegisterStringPref(const char* path,
@@ skipping 24 matching lines @@
   void RegisterLocalizedStringPref(const char* path,
                                    int locale_default_message_id,
                                    PrefSyncStatus sync_status);
   void RegisterInt64Pref(const char* path,
                          int64 default_value,
                          PrefSyncStatus sync_status);
   void RegisterUint64Pref(const char* path,
                           uint64 default_value,
                           PrefSyncStatus sync_status);
 
+  void UnregisterPreference(const char* path);
+
   // TODO(zea): Have PrefServiceSyncable implement
   // syncer::SyncableService directly.
   syncer::SyncableService* GetSyncableService();
 
   // Do not call this after having derived an incognito or per tab pref service.
   virtual void UpdateCommandLinePrefStore(PrefStore* cmd_line_store) OVERRIDE;
 
  private:
   friend class PrefModelAssociator;
 
@@ skipping 12 matching lines @@
   bool pref_service_forked_;
 
   PrefModelAssociator pref_sync_associator_;
 
   ObserverList<PrefServiceSyncableObserver> observer_list_;
 
   DISALLOW_COPY_AND_ASSIGN(PrefServiceSyncable);
 };
 
 #endif  // CHROME_BROWSER_PREFS_PREF_SERVICE_SYNCABLE_H_