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

extensions/renderer/user_script_set.cc

Index: extensions/renderer/user_script_set.cc
diff --git a/extensions/renderer/user_script_set.cc b/extensions/renderer/user_script_set.cc
index e95843d392880bebd48ce1b26bdfebce5b903951..cd3be22215216afdd612579259c9d05e7cee3334 100644
--- a/extensions/renderer/user_script_set.cc
+++ b/extensions/renderer/user_script_set.cc
@@ -4,11 +4,13 @@
 
 #include "extensions/renderer/user_script_set.h"
 
+#include "base/memory/ref_counted.h"
 #include "content/public/common/url_constants.h"
 #include "content/public/renderer/render_thread.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_set.h"
 #include "extensions/common/permissions/permissions_data.h"
+#include "extensions/renderer/extension_consumer.h"
 #include "extensions/renderer/extensions_renderer_client.h"
 #include "extensions/renderer/script_context.h"
 #include "extensions/renderer/script_injection.h"
@@ -194,8 +196,11 @@ scoped_ptr<ScriptInjection> UserScriptSet::GetInjectionForScript(
   scoped_ptr<ScriptInjector> injector(new UserScriptInjector(script,
                                                              this,
                                                              is_declarative));
+  HostID host_id(HostID::EXTENSIONS, extension->id());
+  ExtensionConsumer extension_consumer(
+      make_scoped_refptr<const Extension>(extension), host_id);
   if (injector->CanExecuteOnFrame(
-          extension,
+          &extension_consumer,
           web_frame,
           -1,  // Content scripts are not tab-specific.
           web_frame->top()->document().url()) ==
@@ -211,7 +216,9 @@ scoped_ptr<ScriptInjection> UserScriptSet::GetInjectionForScript(
     injection.reset(new ScriptInjection(
         injector.Pass(),
         web_frame->toWebLocalFrame(),
-        extension->id(),
+        host_id,
+        // TODO(hanxi): store and obtain the instance id from the UserScript.
+        Host::kDefaultInstanceId,
         run_location,
         tab_id));
   }