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

extensions/renderer/script_injection.h

 // 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.
 
 #ifndef EXTENSIONS_RENDERER_SCRIPT_INJECTION_H_
 #define EXTENSIONS_RENDERER_SCRIPT_INJECTION_H_
 
 #include "base/basictypes.h"
 #include "base/macros.h"
 #include "extensions/common/user_script.h"
@@ skipping 12 matching lines @@
 // A script wrapper which is aware of whether or not it is allowed to execute,
 // and contains the implementation to do so.
 class ScriptInjection {
  public:
   // Return the id of the injection host associated with the given world.
   static std::string GetHostIdForIsolatedWorld(int world_id);
 
   // 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
   // the script has either injected or will never inject (i.e., if the object
   // is done), and false if injection is delayed (either for permission purposes
   // or because |current_location| is not the designated |run_location_|).
   // NOTE: |injection_host| may be NULL, if the injection_host is removed!
   bool TryToInject(UserScript::RunLocation current_location,
                    const InjectionHost* injection_host,
                    ScriptsRunInfo* scripts_run_info);
@@ skipping 30 matching lines @@
 
   // The injector for this injection.
   scoped_ptr<ScriptInjector> injector_;
 
   // The (main) WebFrame into which this should inject the script.
   blink::WebLocalFrame* web_frame_;
 
   // 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_;
 
   // The tab id associated with the frame.
   int tab_id_;
 
   // This injection's request id. This will be -1 unless the injection is
   // currently waiting on permission.
   int64 request_id_;
 
   // Whether or not the injection is complete, either via injecting the script
   // or because it will never complete.
   bool complete_;
 
   DISALLOW_COPY_AND_ASSIGN(ScriptInjection);
 };
 
 }  // namespace extensions
 
 #endif  // EXTENSIONS_RENDERER_SCRIPT_INJECTION_H_