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 94 matching lines @@
   // 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;
 
+  virtual bool AllowPrefRegistrarSimple() const OVERRIDE;
+
   // Invoked internally when the IsSyncing() state changes.
   void OnIsSyncingChanged();
 
   // Registers a preference at |path| with |default_value|. If the
   // preference is syncable per |sync_status|, also registers it with
   // PrefModelAssociator.
   void RegisterSyncablePreference(const char* path,
                                   Value* default_value,
                                   PrefSyncStatus sync_status);
 
   // Whether CreateIncognitoPrefService() has been called to create a
   // "forked" PrefService.
   bool pref_service_forked_;
 
   PrefModelAssociator pref_sync_associator_;
 
   ObserverList<PrefServiceObserver> observer_list_;
 
   DISALLOW_COPY_AND_ASSIGN(PrefServiceSyncable);
 };
 
 #endif  // CHROME_BROWSER_PREFS_PREF_SERVICE_SYNCABLE_H_