Prevent duplicate content script injection defined in manifest.json (reland)

extensions/renderer/programmatic_script_injector.h

Index: extensions/renderer/programmatic_script_injector.h
diff --git a/extensions/renderer/programmatic_script_injector.h b/extensions/renderer/programmatic_script_injector.h
index b408d58a34a1ed5ada9774e8e417facd925c9cd8..f17373a366b858986d00dd20e181cb309452da1b 100644
--- a/extensions/renderer/programmatic_script_injector.h
+++ b/extensions/renderer/programmatic_script_injector.h
@@ -19,6 +19,7 @@ class RenderFrame;
 }
 
 namespace extensions {
+struct ScriptsRunInfo;

[Devlin, 2016/09/08 17:47:31]

nitty nit: no longer needed.

 
 // A ScriptInjector to handle tabs.executeScript().
 class ProgrammaticScriptInjector : public ScriptInjector {
@@ -33,18 +34,24 @@ class ProgrammaticScriptInjector : public ScriptInjector {
   bool ShouldExecuteInMainWorld() const override;
   bool IsUserGesture() const override;
   bool ExpectsResults() const override;
-  bool ShouldInjectJs(UserScript::RunLocation run_location) const override;
-  bool ShouldInjectCss(UserScript::RunLocation run_location) const override;
+  bool ShouldInjectJs(
+      UserScript::RunLocation run_location,
+      const std::set<std::string>& executing_scripts) const override;
+  bool ShouldInjectCss(
+      UserScript::RunLocation run_location,
+      const std::set<std::string>& injected_stylesheets) const override;
   PermissionsData::AccessType CanExecuteOnFrame(
       const InjectionHost* injection_host,
       blink::WebLocalFrame* web_frame,
       int tab_id) const override;
   std::vector<blink::WebScriptSource> GetJsSources(
-      UserScript::RunLocation run_location) const override;
+      UserScript::RunLocation run_location,
+      std::set<std::string>* executing_scripts,
+      size_t* num_injected_js_scripts) const override;
   std::vector<blink::WebString> GetCssSources(
-      UserScript::RunLocation run_location) const override;
-  void GetRunInfo(ScriptsRunInfo* scripts_run_info,
-                  UserScript::RunLocation run_location) const override;
+      UserScript::RunLocation run_location,
+      std::set<std::string>* injected_stylesheets,
+      size_t* num_injected_stylesheets) const override;
   void OnInjectionComplete(std::unique_ptr<base::Value> execution_result,
                            UserScript::RunLocation run_location,
                            content::RenderFrame* render_frame) override;