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

chrome/browser/extensions/extension_declarative_user_script_master.cc

-// Copyright 2014 The Chromium Authors. All rights reserved.
+// Copyright 2015 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.
 
-#include "chrome/browser/extensions/declarative_user_script_master.h"
+#include "chrome/browser/extensions/extension_declarative_user_script_master.h"
 
 #include <set>
 
 #include "chrome/browser/profiles/profile.h"
 #include "extensions/browser/extension_registry.h"
 
 namespace extensions {
 
-DeclarativeUserScriptMaster::DeclarativeUserScriptMaster(
+ExtensionDeclarativeUserScriptMaster::ExtensionDeclarativeUserScriptMaster(

[Devlin, 2015/01/14 16:45:08]

Actually, this class makes me sad.  Will the DeclarativeUserScriptManager always
have knowledge of Extensions, as it does now?  If so, could we have it watch
OnExtensionUnloaded and delete the corresponding DeclarativeUserScriptMaster, so
we don't need this subclass?

[Xi Han, 2015/01/14 23:46:03]

This is a great idea!

     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