Introduce DeclarativeUserScriptManager.

extensions/browser/extension_system.h

Index: extensions/browser/extension_system.h
diff --git a/extensions/browser/extension_system.h b/extensions/browser/extension_system.h
index 300e094ef2cb45c57582d76fbafec844fea3b250..869936003495442ebadd3417278e3b779aee5c54 100644
--- a/extensions/browser/extension_system.h
+++ b/extensions/browser/extension_system.h
@@ -15,6 +15,7 @@
 #error "Extensions must be enabled"
 #endif
 
+class DeclarativeUserScriptManager;
 class ExtensionService;
 
 #if defined(OS_CHROMEOS)
@@ -30,7 +31,6 @@ class BrowserContext;
 namespace extensions {
 
 class ContentVerifier;
-class DeclarativeUserScriptMaster;
 class ErrorConsole;
 class EventRouter;
 class Extension;
@@ -77,6 +77,9 @@ class ExtensionSystem : public KeyedService {
   // The SharedUserScriptMaster is created at startup.
   virtual SharedUserScriptMaster* shared_user_script_master() = 0;
 
+  // The DeclarativeUserScriptManager is created at startup.
+  virtual DeclarativeUserScriptManager* declarative_user_script_manager() = 0;
+
   // The StateStore is created at startup.
   virtual StateStore* state_store() = 0;
 
@@ -128,11 +131,6 @@ class ExtensionSystem : public KeyedService {
   // so it can be retrieved from ExtensionSystem directly.
   virtual scoped_ptr<ExtensionSet> GetDependentExtensions(
       const Extension* extension) = 0;
-
-  // Get the user script master for declarative scripts, if any.
-  virtual DeclarativeUserScriptMaster*
-      GetDeclarativeUserScriptMasterByExtension(
-          const ExtensionId& extension_id) = 0;
 };
 
 }  // namespace extensions