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

extensions/renderer/script_injection.h

Index: extensions/renderer/script_injection.h
diff --git a/extensions/renderer/script_injection.h b/extensions/renderer/script_injection.h
index 7b501f40e1da0bd0240760647cfd708a6616071c..2a7fd63eb2a688ff92b3a1589e7566a81e6a8a9b 100644
--- a/extensions/renderer/script_injection.h
+++ b/extensions/renderer/script_injection.h
@@ -98,14 +98,14 @@ class ScriptInjection {
   InjectionResult Inject(ScriptsRunInfo* scripts_run_info);
 
   // Inject any JS scripts into the frame for the injection.
-  void InjectJs();
+  void InjectJs(ScriptsRunInfo* scripts_run_info);

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

Here, too, we can just prefer passing the std::set<GURL>*

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

Done.

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

I passed other scripts_run_info data fields, since we're no longer using
std::set<GURL> injected_scripts. Made the same function signature change for
InjectCss() as well.

I'm not sure if it's overkill to do this for Inject() too? If it is preferred,
I'll probably have to crawl up the stack from where Inject() was called and make
the change for its parent functions. 

 
   // Called when JS injection for the given frame has been completed.
   void OnJsInjectionCompleted(
       const blink::WebVector<v8::Local<v8::Value> >& results);
 
   // Inject any CSS source into the frame for the injection.
-  void InjectCss();
+  void InjectCss(ScriptsRunInfo* scripts_run_info);
 
   // Notify that we will not inject, and mark it as acknowledged.
   void NotifyWillNotInject(ScriptInjector::InjectFailureReason reason);