Introduce HostID and de-couple Extensions from "script injection System" [browser side]

chrome/browser/extensions/extension_declarative_user_script_master.cc

Index: chrome/browser/extensions/extension_declarative_user_script_master.cc
diff --git a/chrome/browser/extensions/declarative_user_script_master.cc b/chrome/browser/extensions/extension_declarative_user_script_master.cc
similarity index 41%
copy from chrome/browser/extensions/declarative_user_script_master.cc
copy to chrome/browser/extensions/extension_declarative_user_script_master.cc
index fccd01150491ef3d4b31d2305112e28652aa7c52..c96f28d523a17b095af572a2f050aa764bf592f0 100644
--- a/chrome/browser/extensions/declarative_user_script_master.cc
+++ b/chrome/browser/extensions/extension_declarative_user_script_master.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/extensions/declarative_user_script_master.h"
+#include "chrome/browser/extensions/extension_declarative_user_script_master.h"
 
 #include <set>
 
@@ -11,42 +11,23 @@
 
 namespace extensions {
 
-DeclarativeUserScriptMaster::DeclarativeUserScriptMaster(
+ExtensionDeclarativeUserScriptMaster::ExtensionDeclarativeUserScriptMaster(
     Profile* profile,
-    const ExtensionId& extension_id)
-    : extension_id_(extension_id),
-      loader_(profile,
-              extension_id,
-              false /* listen_for_extension_system_loaded */),
+    const ConsumerID& consumer_id)
+    : DeclarativeUserScriptMaster(profile, consumer_id),
       extension_registry_observer_(this) {
   extension_registry_observer_.Add(ExtensionRegistry::Get(profile));
 }
 
-DeclarativeUserScriptMaster::~DeclarativeUserScriptMaster() {
+ExtensionDeclarativeUserScriptMaster::~ExtensionDeclarativeUserScriptMaster() {
 }
 
-void DeclarativeUserScriptMaster::OnExtensionUnloaded(
+void ExtensionDeclarativeUserScriptMaster::OnExtensionUnloaded(
     content::BrowserContext* browser_context,
     const Extension* extension,
     UnloadedExtensionInfo::Reason reason) {
-  if (extension_id_ == extension->id())
+  if (consumer_id().host_id == extension->id())
     ClearScripts();
 }
 
-void DeclarativeUserScriptMaster::AddScript(const UserScript& script) {
-  std::set<UserScript> set;
-  set.insert(script);
-  loader_.AddScripts(set);
-}
-
-void DeclarativeUserScriptMaster::RemoveScript(const UserScript& script) {
-  std::set<UserScript> set;
-  set.insert(script);
-  loader_.RemoveScripts(set);
-}
-
-void DeclarativeUserScriptMaster::ClearScripts() {
-  loader_.ClearScripts();
-}
-
 }  // namespace extensions