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 a8835457d95312b220ded68cba089261eb05e745..53d612337b19b8c426267ab9dfffa3f901beb294 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,
+      UserScript::ConsumerInstanceType consumer_instance_type,
+      UserScript::RunLocation run_location,
+      int tab_id);
   ~ScriptInjection();
 
   // Try to inject the script at the |current_location|. This returns true if
@@ -86,6 +88,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_;
+

[Devlin, 2015/02/25 17:14:38]

When is this used?

[Xi Han, 2015/02/27 19:36:19]

The get function consumer_instance_type() is used in
UserScriptInjector::CanExecuteOnFame() to check the instance type. If it is
WEBVIEW, then we will handled differently.

[Devlin, 2015/02/27 21:52:42]

Doesn't that check UserScript::consumer_instance_type()?  Why does
ScriptInjection need it?

[Xi Han, 2015/02/27 22:10:02]

Oh, you are absolutely right. I took it as the one in UserScript. Removed.

   // The location in the document load at which we inject the script.
   UserScript::RunLocation run_location_;