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

extensions/renderer/script_injector.h

Index: extensions/renderer/script_injector.h
diff --git a/extensions/renderer/script_injector.h b/extensions/renderer/script_injector.h
index 0ed69f73d2a6e12a5cf6200a6d3214936b5c5d65..8085b0b57936c612c9a4e566c2f16a6ae3202e72 100644
--- a/extensions/renderer/script_injector.h
+++ b/extensions/renderer/script_injector.h
@@ -51,10 +51,13 @@ class ScriptInjector {
 
   // Returns true if the script should inject JS source at the given
   // |run_location|.
-  virtual bool ShouldInjectJs(UserScript::RunLocation run_location) const = 0;
+  virtual bool ShouldInjectJs(UserScript::RunLocation run_location,
+                              const std::set<GURL>& injected_scripts) const = 0;
 
   // Returns true if the script should inject CSS at the given |run_location|.
-  virtual bool ShouldInjectCss(UserScript::RunLocation run_location) const = 0;
+  virtual bool ShouldInjectCss(
+      UserScript::RunLocation run_location,
+      const std::set<GURL>& injected_scripts) const = 0;
 
   // Returns true if the script should execute on the given |frame|.
   virtual PermissionsData::AccessType CanExecuteOnFrame(
@@ -65,12 +68,14 @@ class ScriptInjector {
   // Returns the javascript sources to inject at the given |run_location|.
   // Only called if ShouldInjectJs() is true.
   virtual std::vector<blink::WebScriptSource> GetJsSources(
-      UserScript::RunLocation run_location) const = 0;
+      UserScript::RunLocation run_location,
+      ScriptsRunInfo* scripts_run_info) const = 0;

[Devlin, 2016/08/25 16:52:26]

Since we only use the set of injected scripts, let's pass just that in here.

[catmullings, 2016/08/27 00:23:08]

Done.

 
   // Returns the css to inject at the given |run_location|.
   // Only called if ShouldInjectCss() is true.
   virtual std::vector<blink::WebString> GetCssSources(
-      UserScript::RunLocation run_location) const = 0;
+      UserScript::RunLocation run_location,
+      ScriptsRunInfo* scripts_run_info) const = 0;
 
   // Fill scriptrs run info based on information about injection.
   virtual void GetRunInfo(