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 885c3b12151cc2fc9b4d5ecf686b0e40ddc198cb..2cdd3802c217a738986fd14cba10701ac8ed147f 100644
--- a/extensions/renderer/programmatic_script_injector.h
+++ b/extensions/renderer/programmatic_script_injector.h
@@ -33,16 +33,20 @@ 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,
+                      std::set<GURL> injected_scripts) const override;

[Devlin, 2016/08/22 22:46:52]

we shold avoid copying the set of GURLs if we can.

[catmullings, 2016/08/24 01:13:19]

Done.

+  bool ShouldInjectCss(UserScript::RunLocation run_location,
+                       std::set<GURL> injected_scripts) 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,
+      ScriptsRunInfo* scripts_run_info) const override;
   std::vector<std::string> GetCssSources(
-      UserScript::RunLocation run_location) const override;
+      UserScript::RunLocation run_location,
+      ScriptsRunInfo* scripts_run_info) const override;
   void GetRunInfo(ScriptsRunInfo* scripts_run_info,
                   UserScript::RunLocation run_location) const override;
   void OnInjectionComplete(std::unique_ptr<base::Value> execution_result,