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);
 
   // 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);