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

extensions/renderer/user_script_injector.h

Index: extensions/renderer/user_script_injector.h
diff --git a/extensions/renderer/user_script_injector.h b/extensions/renderer/user_script_injector.h
index cb89271d91fa5b06e81588b9b9907551bb1461d6..2a62a67dc97570a07d23d9a4fc56b6b292e1a082 100644
--- a/extensions/renderer/user_script_injector.h
+++ b/extensions/renderer/user_script_injector.h
@@ -21,6 +21,7 @@ class WebLocalFrame;
 }
 
 namespace extensions {
+struct ScriptsRunInfo;

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

not needed

 
 // A ScriptInjector for UserScripts.
 class UserScriptInjector : public ScriptInjector,
@@ -41,18 +42,24 @@ class UserScriptInjector : 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;