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

extensions/renderer/programmatic_script_injector.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_PROGRAMMATIC_SCRIPT_INJECTOR_H_
 #define EXTENSIONS_RENDERER_PROGRAMMATIC_SCRIPT_INJECTOR_H_
 
 #include <memory>
 
 #include "base/macros.h"
@@ skipping 15 matching lines @@
   ProgrammaticScriptInjector(const ExtensionMsg_ExecuteCode_Params& params,
                              content::RenderFrame* render_frame);
   ~ProgrammaticScriptInjector() override;
 
  private:
   // ScriptInjector implementation.
   UserScript::InjectionType script_type() const override;
   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<GURL>& injected_scripts) const override;
+  bool ShouldInjectCss(UserScript::RunLocation run_location,
+                       const 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,
+      std::set<GURL>& injected_scripts) const override;

[Devlin, 2016/08/29 20:48:14]

nit: chromium style (mostly) forbids non-const &s.  Prefer a std::set<GURL>*.

[catmullings, 2016/09/01 17:43:51]

Done.

   std::vector<blink::WebString> GetCssSources(
-      UserScript::RunLocation run_location) const override;
+      UserScript::RunLocation run_location,
+      std::set<GURL>& injected_scripts) const override;
   void GetRunInfo(ScriptsRunInfo* scripts_run_info,
-                  UserScript::RunLocation run_location) const override;
+                  UserScript::RunLocation run_location,
+                  bool js_injection_completed,
+                  bool should_inject_css) const override;
   void OnInjectionComplete(std::unique_ptr<base::Value> execution_result,
                            UserScript::RunLocation run_location,
                            content::RenderFrame* render_frame) override;
   void OnWillNotInject(InjectFailureReason reason,
                        content::RenderFrame* render_frame) override;
 
   // Whether it is safe to include information about the URL in error messages.
   bool CanShowUrlInError() const;
 
   // Return the run location for this injector.
@@ skipping 18 matching lines @@
 
   // Whether or not this script injection has finished.
   bool finished_;
 
   DISALLOW_COPY_AND_ASSIGN(ProgrammaticScriptInjector);
 };
 
 }  // namespace extensions
 
 #endif  // EXTENSIONS_RENDERER_PROGRAMMATIC_SCRIPT_INJECTOR_H_