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

extensions/renderer/script_injection.h

Index: extensions/renderer/script_injection.h
diff --git a/extensions/renderer/script_injection.h b/extensions/renderer/script_injection.h
index e1dc5706515dcf11a0ea5ee5c96559fdb502cf04..f079f23fa97cd410b3437453a43db6ae04e5ea73 100644
--- a/extensions/renderer/script_injection.h
+++ b/extensions/renderer/script_injection.h
@@ -32,7 +32,7 @@ class ScriptInjection {
   ScriptInjection(scoped_ptr<ScriptInjector> injector,
                   blink::WebLocalFrame* web_frame,
                   const HostID& host_id,
-                  int instance_id,
+                  const ConsumerInstanceInfo& consumer_instance_info,
                   UserScript::RunLocation run_location,
                   int tab_id);
   ~ScriptInjection();
@@ -85,10 +85,10 @@ class ScriptInjection {
   // The id of the associated injection_host.
   HostID host_id_;
 
-  // The id of the instance on which the host will inject the script.
+  // The type and id of the instance on which the host will inject the script.
   // If the instance is a regular tab, the |instance_id| is 0; if the instance
   // is a <webview>, the |instance_id| is a unique positive number.
-  int instance_id_;
+  ConsumerInstanceInfo consumer_instance_info_;
 
   // The location in the document load at which we inject the script.
   UserScript::RunLocation run_location_;