Refactoring: de-couple Extensions from "script injection System" [render side]:4

extensions/renderer/user_script_injector.cc

 // Copyright 2014 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 "extensions/renderer/user_script_injector.h"
 
 #include <vector>
 
 #include "base/lazy_instance.h"
 #include "content/public/common/url_constants.h"
@@ skipping 38 matching lines @@
 
 blink::WebScriptSource GreasemonkeyApiJsString::GetSource() const {
   return blink::WebScriptSource(blink::WebString::fromUTF8(source_));
 }
 
 base::LazyInstance<GreasemonkeyApiJsString> g_greasemonkey_api =
     LAZY_INSTANCE_INITIALIZER;
 
 }  // namespace
 
-UserScriptInjector::UserScriptInjector(
-    const UserScript* script,
-    UserScriptSet* script_list,
-    bool is_declarative)
+UserScriptInjector::UserScriptInjector(const UserScript* script,
+                                       UserScriptSet* script_list,
+                                       bool is_declarative)
     : script_(script),
       script_id_(script_->id()),
-      extension_id_(script_->extension_id()),
+      host_id_(script_->host_id()),
       is_declarative_(is_declarative),
       user_script_set_observer_(this) {
   user_script_set_observer_.Add(script_list);
 }
 
 UserScriptInjector::~UserScriptInjector() {
 }
 
 void UserScriptInjector::OnUserScriptsUpdated(
-    const std::set<std::string>& changed_extensions,
+    const std::set<HostID>& changed_hosts,
     const std::vector<UserScript*>& scripts) {
-  // If the extension causing this injection changed, then this injection
+  // If the host causing this injection changed, then this injection
   // will be removed, and there's no guarantee the backing script still exists.
-  if (changed_extensions.count(extension_id_) > 0)
+  if (changed_hosts.count(host_id_) > 0)
     return;
 
   for (std::vector<UserScript*>::const_iterator iter = scripts.begin();
        iter != scripts.end();
        ++iter) {
     // We need to compare to |script_id_| (and not to script_->id()) because the
     // old |script_| may be deleted by now.
     if ((*iter)->id() == script_id_) {
       script_ = *iter;
       break;
@@ skipping 105 matching lines @@
 
 void UserScriptInjector::GetRunInfo(
     ScriptsRunInfo* scripts_run_info,
     UserScript::RunLocation run_location) const {
   if (ShouldInjectJs(run_location)) {
     const UserScript::FileList& js_scripts = script_->js_scripts();
     scripts_run_info->num_js += js_scripts.size();
     for (UserScript::FileList::const_iterator iter = js_scripts.begin();
          iter != js_scripts.end();
          ++iter) {
-      scripts_run_info->executing_scripts[extension_id_].insert(
+      scripts_run_info->executing_scripts[host_id_.id()].insert(
           iter->url().path());
     }
   }
 
   if (ShouldInjectCss(run_location))
     scripts_run_info->num_css += script_->css_scripts().size();
 }
 
 void UserScriptInjector::OnInjectionComplete(
     scoped_ptr<base::ListValue> execution_results,
     UserScript::RunLocation run_location) {
 }
 
 void UserScriptInjector::OnWillNotInject(InjectFailureReason reason) {
 }
 
 }  // namespace extensions