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 d28780f520567de1ed894dfa9e74b01107b9e02a..6c265894e145f3eb1577a3f3d8de0f3b20b3090c 100644
--- a/extensions/renderer/script_injection.h
+++ b/extensions/renderer/script_injection.h
@@ -30,11 +30,13 @@ class ScriptInjection {
   // Remove the isolated world associated with the given injection host.
   static void RemoveIsolatedWorld(const std::string& host_id);
 
-  ScriptInjection(scoped_ptr<ScriptInjector> injector,
-                  blink::WebLocalFrame* web_frame,
-                  const HostID& host_id,
-                  UserScript::RunLocation run_location,
-                  int tab_id);
+  ScriptInjection(
+      scoped_ptr<ScriptInjector> injector,
+      blink::WebLocalFrame* web_frame,
+      const HostID& host_id,
+      const UserScript::ConsumerInstanceType& consumer_instance_type,

[Devlin, 2015/02/23 20:15:00]

nit: a const& enum is kinda silly.

[Xi Han, 2015/02/24 16:19:55]

Done.

+      UserScript::RunLocation run_location,
+      int tab_id);
   ~ScriptInjection();
 
   // Try to inject the script at the |current_location|. This returns true if
@@ -85,6 +87,9 @@ class ScriptInjection {
   // The id of the associated injection_host.
   HostID host_id_;
 
+  // The type of the instance on which the host will inject the script.
+  UserScript::ConsumerInstanceType consumer_instance_type_;
+
   // The location in the document load at which we inject the script.
   UserScript::RunLocation run_location_;