Split PrefService into PrefService, PrefServiceSimple and PrefServiceSyncable.

chrome/browser/extensions/component_loader.h

Index: chrome/browser/extensions/component_loader.h
diff --git a/chrome/browser/extensions/component_loader.h b/chrome/browser/extensions/component_loader.h
index 02798b31b01616aacd5dc612546214c6831aee61..8c7847a3d65e04b82cdec15d931ec9d8df9180e8 100644
--- a/chrome/browser/extensions/component_loader.h
+++ b/chrome/browser/extensions/component_loader.h
@@ -14,7 +14,8 @@
 #include "base/values.h"
 
 class ExtensionServiceInterface;
-class PrefService;
+class PrefServiceSimple;
+class PrefServiceSyncable;
 
 namespace extensions {
 
@@ -24,8 +25,8 @@ class Extension;
 class ComponentLoader {
  public:
   ComponentLoader(ExtensionServiceInterface* extension_service,
-                  PrefService* prefs,
-                  PrefService* local_state);
+                  PrefServiceSyncable* prefs,
+                  PrefServiceSimple* local_state);

[Mattias Nissler (ping if slow), 2012/12/19 19:50:22]

Can we use PrefServiceBase* for these two?

[Jói, 2012/12/20 16:30:31]

Done.

   virtual ~ComponentLoader();
 
   size_t registered_extensions_count() const {
@@ -79,7 +80,7 @@ class ComponentLoader {
   // platforms this |skip_session_components| is expected to be unset.
   void AddDefaultComponentExtensions(bool skip_session_components);
 
-  static void RegisterUserPrefs(PrefService* prefs);
+  static void RegisterUserPrefs(PrefServiceSyncable* prefs);
 
   // Parse the given JSON manifest. Returns NULL if it cannot be parsed, or if
   // if the result is not a DictionaryValue.
@@ -129,8 +130,8 @@ class ComponentLoader {
   // Unloads |component| from the memory.
   void UnloadComponent(ComponentExtensionInfo* component);
 
-  PrefService* prefs_;
-  PrefService* local_state_;
+  PrefServiceSyncable* prefs_;
+  PrefServiceSimple* local_state_;
 
   ExtensionServiceInterface* extension_service_;