Introduce DeclarativeUserScriptManager.

chrome/browser/extensions/test_extension_system.h

Index: chrome/browser/extensions/test_extension_system.h
diff --git a/chrome/browser/extensions/test_extension_system.h b/chrome/browser/extensions/test_extension_system.h
index f8e0b43cfa15f07c409c55af9074a7d0f9912625..7376915a27af7503215e3eb8026ed4b3fa4e0b76 100644
--- a/chrome/browser/extensions/test_extension_system.h
+++ b/chrome/browser/extensions/test_extension_system.h
@@ -9,6 +9,7 @@
 #include "extensions/browser/extension_system.h"
 #include "extensions/common/one_shot_event.h"
 
+class DeclarativeUserScriptManager;
 class Profile;
 class TestingValueStore;
 
@@ -23,7 +24,6 @@ class BrowserContext;
 }
 
 namespace extensions {
-class DeclarativeUserScriptMaster;
 class ExtensionPrefs;
 class RuntimeData;
 class SharedUserScriptMaster;
@@ -59,6 +59,7 @@ class TestExtensionSystem : public ExtensionSystem {
   RuntimeData* runtime_data() override;
   ManagementPolicy* management_policy() override;
   SharedUserScriptMaster* shared_user_script_master() override;
+  DeclarativeUserScriptManager* declarative_user_script_manager() override;
   StateStore* state_store() override;
   StateStore* rules_store() override;
   TestingValueStore* value_store() { return value_store_; }
@@ -73,8 +74,6 @@ class TestExtensionSystem : public ExtensionSystem {
   ContentVerifier* content_verifier() override;
   scoped_ptr<ExtensionSet> GetDependentExtensions(
       const Extension* extension) override;
-  DeclarativeUserScriptMaster* GetDeclarativeUserScriptMasterByExtension(
-      const ExtensionId& extension_id) override;
 
   // Note that you probably want to use base::RunLoop().RunUntilIdle() right
   // after this to run all the accumulated tasks.
@@ -90,7 +89,7 @@ class TestExtensionSystem : public ExtensionSystem {
   scoped_ptr<StateStore> state_store_;
   // A pointer to the TestingValueStore owned by |state_store_|.
   TestingValueStore* value_store_;
-  ScopedVector<DeclarativeUserScriptMaster> declarative_user_script_masters_;
+  scoped_ptr<DeclarativeUserScriptManager> declarative_user_script_manager_;
   scoped_ptr<ManagementPolicy> management_policy_;
   scoped_ptr<RuntimeData> runtime_data_;
   scoped_ptr<ExtensionService> extension_service_;