Clean up pref change notification handling.

chrome/browser/extensions/extension_pref_store.h

Index: chrome/browser/extensions/extension_pref_store.h
diff --git a/chrome/browser/extensions/extension_pref_store.h b/chrome/browser/extensions/extension_pref_store.h
index f1767589a9aee4a67b2dec4814c4e19716e3803f..953db90b039d27e1b45648adb9ca389a8aed433f 100644
--- a/chrome/browser/extensions/extension_pref_store.h
+++ b/chrome/browser/extensions/extension_pref_store.h
@@ -15,10 +15,9 @@
 #include "base/basictypes.h"
 #include "base/scoped_ptr.h"
 #include "base/stl_util-inl.h"
-#include "chrome/browser/prefs/pref_notifier.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
-#include "chrome/common/pref_store.h"
+#include "chrome/common/pref_store_base.h"
 
 class DictionaryValue;
 class Extension;
@@ -30,7 +29,7 @@ class Value;
 // proxy settings. A stack of relevant extensions is stored in order of
 // their addition to this PrefStore. For each preference, the last-added
 // enabled extension that tries to set it overrules any others.
-class ExtensionPrefStore : public PrefStore,
+class ExtensionPrefStore : public PrefStoreBase,
                            public NotificationObserver {
  public:
   // Maps preference paths to their values.
@@ -43,7 +42,7 @@ class ExtensionPrefStore : public PrefStore,
   typedef std::pair<const Extension*, std::pair<const char*, Value*> >
       ExtensionPrefDetails;
 
-  ExtensionPrefStore(Profile* profile, PrefNotifier::PrefStoreType type);
+  explicit ExtensionPrefStore(Profile* profile);
   virtual ~ExtensionPrefStore();
 
   // Begins tracking the preference and value an extension wishes to set. This
@@ -67,11 +66,6 @@ class ExtensionPrefStore : public PrefStore,
   // This should only be accessed by subclasses for unit-testing.
   void GetExtensionIDs(std::vector<std::string>* result);
 
-  // Returns the applicable pref service from the profile (if we have one) or
-  // the browser's local state. This should only be accessed or overridden by
-  // subclasses for unit-testing.
-  virtual PrefService* GetPrefService();
-
  private:
   // Associates an extension with the prefs it sets. Owns the pref values.
   struct ExtensionPrefs {
@@ -115,9 +109,6 @@ class ExtensionPrefStore : public PrefStore,
   // extensions.
   Profile* profile_;
 
-  // My PrefStore type, assigned by the PrefValueStore.
-  PrefNotifier::PrefStoreType type_;
-
   DISALLOW_COPY_AND_ASSIGN(ExtensionPrefStore);
 };