Remove //chrome dependency from ExtensionPrefs

extensions/browser/extension_prefs.h

 // Copyright 2014 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 EXTENSIONS_BROWSER_EXTENSION_PREFS_H_
 #define EXTENSIONS_BROWSER_EXTENSION_PREFS_H_
 
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 20 matching lines @@
 class BrowserContext;
 }
 
 namespace user_prefs {
 class PrefRegistrySyncable;
 }
 
 namespace extensions {
 
 class AppSorting;
-class ContentSettingsStore;
 class ExtensionPrefsUninstallExtension;
 class URLPatternSet;
 
 // Class for managing global and per-extension preferences.
 //
 // This class distinguishes the following kinds of preferences:
 // - global preferences:
 //       internal state for the extension system in general, not associated
 //       with an individual extension, such as lastUpdateTime.
 // - per-extension preferences:
@@ skipping 69 matching lines @@
   typedef ScopedUpdate<base::DictionaryValue, base::Value::TYPE_DICTIONARY>
       ScopedDictionaryUpdate;
   typedef ScopedUpdate<base::ListValue, base::Value::TYPE_LIST>
       ScopedListUpdate;
 
   class Observer {
    public:
     // Called when the reasons for an extension being disabled have changed.
     virtual void OnExtensionDisableReasonsChanged(
         const std::string& extension_id,
-        int disabled_reasons) = 0;
+        int disabled_reasons) {}
+
+    // Called when an extension is registered with ExtensionPrefs.
+    virtual void OnExtensionRegistered(const std::string& extension_id,
+                                       const base::Time& install_time,
+                                       bool is_enabled) {}
+
+    // Called when an extension's prefs have been loaded.
+    virtual void OnExtensionPrefsLoaded(const std::string& extension_id) {}
+
+    // Called when an extension's prefs are deleted.
+    virtual void OnExtensionPrefsDeleted(const std::string& extension_id) {}
+
+    // Called when an extension's enabled state pref is changed.
+    virtual void OnExtensionStateChanged(const std::string& extension_id,
+                                         bool state) {}
   };
 
-  // Creates and initializes an ExtensionPrefs object.
-  // Does not take ownership of |prefs| and |extension_pref_value_map|.
+  // Creates an ExtensionPrefs object.
+  // Does not take ownership of |prefs| or |extension_pref_value_map|.
   // If |extensions_disabled| is true, extension controlled preferences and
   // content settings do not become effective.
+  // The Initialize method be called before an ExtensionPrefs is ready for
+  // general use. This is to allow observers to be registered between

[James Cook, 2014/04/01 18:45:03]

Could you instead call
ExtensionsBrowserClient::Get()->AddExtensionPrefObservers() from inside the
Initialize() method and avoid this complication?  Or make it
GetExtensionPrefObserver() and call it inside the constructor?  (I'm a little
nervous about calling an AddExtensionPrefObservers(this) on a partially
constructed this.)

[Ken Rockot(use gerrit already), 2014/04/01 21:34:59]

I was going to do that, but it looked like someone went to great lengths
(probably for testing :|) to be able to construct an ExtensionPrefs over a bunch
of concrete dependencies rather than allowing it to ever be aware of a
BrowserContext or related objects.

I'll revisit this and see what I can do.

+  // construction and initialization.
   static ExtensionPrefs* Create(
       PrefService* prefs,
       const base::FilePath& root_dir,
       ExtensionPrefValueMap* extension_pref_value_map,
       scoped_ptr<AppSorting> app_sorting,
       bool extensions_disabled);
 
   // A version of Create which allows injection of a custom base::Time provider.
   // Use this as needed for testing.
   static ExtensionPrefs* Create(
@@ skipping 11 matching lines @@
 
   // Returns all installed extensions from extension preferences provided by
   // |pref_service|. This is exposed for ProtectedPrefsWatcher because it needs
   // access to the extension ID list before the ExtensionService is initialized.
   static ExtensionIdList GetExtensionsFrom(const PrefService* pref_service);
 
   // Add or remove an observer from the ExtensionPrefs.
   void AddObserver(Observer* observer);
   void RemoveObserver(Observer* observer);
 
+  // Initializes the prefs. Only AddObserver or RemoveObserver should be called
+  // on an instance of ExtensionPrefs before its Initialize method has been
+  // callbed.

[James Cook, 2014/04/01 18:45:03]

callbed -> called

[Ken Rockot(use gerrit already), 2014/04/01 21:34:59]

Done.

+  void Initialize();
+
   // Returns true if the specified external extension was uninstalled by the
   // user.
   bool IsExternalExtensionUninstalled(const std::string& id) const;
 
   // Checks whether |extension_id| is disabled. If there's no state pref for
   // the extension, this will return false. Generally you should use
   // ExtensionService::IsExtensionEnabled instead.
   bool IsExtensionDisabled(const std::string& id) const;
 
   // Get/Set the order that the browser actions appear in the toolbar.
@@ skipping 329 matching lines @@
 
   // Gets/sets the last launch time of an extension.
   base::Time GetLastLaunchTime(const std::string& extension_id) const;
   void SetLastLaunchTime(const std::string& extension_id,
                          const base::Time& time);
 
   static void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry);
 
   bool extensions_disabled() const { return extensions_disabled_; }
 
-  ContentSettingsStore* content_settings_store() {
-    return content_settings_store_.get();
-  }
-
   // The underlying PrefService.
   PrefService* pref_service() const { return prefs_; }
 
   // The underlying AppSorting.
   AppSorting* app_sorting() const { return app_sorting_.get(); }
 
   // Describes the URLs that are able to install extensions. See
   // pref_names::kAllowedInstallSites for more information.
   URLPatternSet GetAllowedInstallSites();
 
@@ skipping 130 matching lines @@
   // by a newly installed extension. Work is broken up between this
   // function and FinishExtensionInfoPrefs() to accomodate delayed
   // installations.
   void PopulateExtensionInfoPrefs(const Extension* extension,
                                   const base::Time install_time,
                                   Extension::State initial_state,
                                   bool blacklisted_for_malware,
                                   const std::string& install_parameter,
                                   base::DictionaryValue* extension_dict);
 
+  void InitExtensionControlledPrefs(ExtensionPrefValueMap* value_map);
+
   // Helper function to complete initialization of the values in
   // |extension_dict| for an extension install. Also see
   // PopulateExtensionInfoPrefs().
   void FinishExtensionInfoPrefs(
       const std::string& extension_id,
       const base::Time install_time,
       bool needs_sort_ordinal,
       const syncer::StringOrdinal& suggested_page_ordinal,
       base::DictionaryValue* extension_dict);
 
   // The pref service specific to this set of extension prefs. Owned by the
   // BrowserContext.
   PrefService* prefs_;
 
   // Base extensions install directory.
   base::FilePath install_directory_;
 
   // Weak pointer, owned by BrowserContext.
   ExtensionPrefValueMap* extension_pref_value_map_;
 
   // Contains all the logic for handling the order for various extension
   // properties.
   scoped_ptr<AppSorting> app_sorting_;
 
-  scoped_refptr<ContentSettingsStore> content_settings_store_;
-
   scoped_ptr<TimeProvider> time_provider_;
 
   bool extensions_disabled_;
 
   ObserverList<Observer> observer_list_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionPrefs);
 };
 
 }  // namespace extensions
 
 #endif  // EXTENSIONS_BROWSER_EXTENSION_PREFS_H_