Introduce DeclarativeUserScriptManager.

chrome/browser/extensions/extension_system_impl.h

Index: chrome/browser/extensions/extension_system_impl.h
diff --git a/chrome/browser/extensions/extension_system_impl.h b/chrome/browser/extensions/extension_system_impl.h
index bb2a21e5951e4c0c0e5ea1437461eadd922eeb79..c9dd5dbea2215a0581fc4a3033a52e933eeff00a 100644
--- a/chrome/browser/extensions/extension_system_impl.h
+++ b/chrome/browser/extensions/extension_system_impl.h
@@ -14,7 +14,7 @@ class Profile;
 namespace extensions {
 
 class ContentVerifier;
-class DeclarativeUserScriptMaster;
+class DeclarativeUserScriptManager;
 class ExtensionSystemSharedFactory;
 class NavigationObserver;
 class SharedUserScriptMaster;
@@ -40,6 +40,7 @@ class ExtensionSystemImpl : public ExtensionSystem {
   ManagementPolicy* management_policy() override;  // shared
   // shared
   SharedUserScriptMaster* shared_user_script_master() override;
+  DeclarativeUserScriptManager* declarative_user_script_manager() override;

[Devlin, 2014/12/12 18:08:07]

needs the "shared' comment.

[Xi Han, 2014/12/12 19:47:24]

Added.

   StateStore* state_store() override;                              // shared
   StateStore* rules_store() override;                              // shared
   LazyBackgroundTaskQueue* lazy_background_task_queue() override;  // shared
@@ -61,9 +62,6 @@ class ExtensionSystemImpl : public ExtensionSystem {
   scoped_ptr<ExtensionSet> GetDependentExtensions(
       const Extension* extension) override;
 
-  DeclarativeUserScriptMaster* GetDeclarativeUserScriptMasterByExtension(
-      const ExtensionId& extension_id) override;  // shared
-
  private:
   friend class ExtensionSystemSharedFactory;
 
@@ -89,6 +87,7 @@ class ExtensionSystemImpl : public ExtensionSystem {
     RuntimeData* runtime_data();
     ManagementPolicy* management_policy();
     SharedUserScriptMaster* shared_user_script_master();
+    DeclarativeUserScriptManager* declarative_user_script_manager();
     InfoMap* info_map();
     LazyBackgroundTaskQueue* lazy_background_task_queue();
     EventRouter* event_router();
@@ -98,9 +97,6 @@ class ExtensionSystemImpl : public ExtensionSystem {
     const OneShotEvent& ready() const { return ready_; }
     ContentVerifier* content_verifier();
 
-    DeclarativeUserScriptMaster* GetDeclarativeUserScriptMasterByExtension(
-        const ExtensionId& extension_id);
-
    private:
     Profile* profile_;
 
@@ -121,7 +117,7 @@ class ExtensionSystemImpl : public ExtensionSystem {
     // Shared memory region manager for programmatically declared scripts, one

[Devlin, 2014/12/12 18:08:07]

Update this comment.

[Xi Han, 2014/12/12 19:47:24]

Done.

     // per extension. Managers are instantiated the first time the declarative
     // API is used by an extension to request content scripts.
-    ScopedVector<DeclarativeUserScriptMaster> declarative_user_script_masters_;
+    scoped_ptr<DeclarativeUserScriptManager> declarative_user_script_manager_;
     scoped_ptr<RuntimeData> runtime_data_;
     // ExtensionService depends on StateStore, Blacklist and RuntimeData.
     scoped_ptr<ExtensionService> extension_service_;