Prevent duplicate content script injection defined in manifest.json

extensions/renderer/user_script_injector.cc

Index: extensions/renderer/user_script_injector.cc
diff --git a/extensions/renderer/user_script_injector.cc b/extensions/renderer/user_script_injector.cc
index 1910548ba24b340d720cd7eb4ea16d8af38e6416..8b15ae0e04399320b7745177d63e1712533cce6c 100644
--- a/extensions/renderer/user_script_injector.cc
+++ b/extensions/renderer/user_script_injector.cc
@@ -197,7 +197,8 @@ PermissionsData::AccessType UserScriptInjector::CanExecuteOnFrame(
 }
 
 std::vector<blink::WebScriptSource> UserScriptInjector::GetJsSources(
-    UserScript::RunLocation run_location) const {
+    UserScript::RunLocation run_location,
+    ScriptsRunInfo* scripts_run_info) const {
   std::vector<blink::WebScriptSource> sources;
   if (!script_)
     return sources;
@@ -209,16 +210,23 @@ std::vector<blink::WebScriptSource> UserScriptInjector::GetJsSources(
   for (UserScript::FileList::const_iterator iter = js_scripts.begin();
        iter != js_scripts.end();
        ++iter) {
-    std::string content = iter->GetContent().as_string();
-
-    // We add this dumb function wrapper for user scripts to emulate what
-    // Greasemonkey does.
-    if (script_->emulate_greasemonkey()) {
-      content.insert(0, kUserScriptHead);
-      content += kUserScriptTail;
+    GURL scriptUrl = iter->url();

[Devlin, 2016/07/11 23:45:50]

This creates a copy of GURL - prefer const &.

[Devlin, 2016/07/11 23:45:50]

variable names should_be_underscored

[catmullings, 2016/07/12 22:23:26]

Done.

[catmullings, 2016/07/12 22:23:26]

Done.

+    // Check if the script is already injected
+    if(scripts_run_info->injected_scripts.find(scriptUrl)

[Devlin, 2016/07/11 23:45:50]

space between 'if' and '('.  Also, since injected_scripts is just a std::set, I
think injected_scripts.count(script_url) == 0 is mildly clearer.

It might also be worth inverting the logic in the if and making it
if (...)
  continue;

to avoid the extra indentation of everything else.

[catmullings, 2016/07/12 22:23:26]

Done.

+       == scripts_run_info->injected_scripts.end()) {
+      std::string content = iter->GetContent().as_string();
+
+      // We add this dumb function wrapper for user scripts to emulate what
+      // Greasemonkey does.
+      if (script_->emulate_greasemonkey()) {
+        content.insert(0, kUserScriptHead);
+        content += kUserScriptTail;
+      }
+      sources.push_back(blink::WebScriptSource(
+          blink::WebString::fromUTF8(content), scriptUrl));
+
+      scripts_run_info->injected_scripts.insert(scriptUrl);
     }
-    sources.push_back(blink::WebScriptSource(
-        blink::WebString::fromUTF8(content), iter->url()));
   }
 
   // Emulate Greasemonkey API for scripts that were converted to extension
@@ -230,7 +238,8 @@ std::vector<blink::WebScriptSource> UserScriptInjector::GetJsSources(
 }
 
 std::vector<std::string> UserScriptInjector::GetCssSources(
-    UserScript::RunLocation run_location) const {
+    UserScript::RunLocation run_location,
+    ScriptsRunInfo* scripts_run_info) const {
   DCHECK_EQ(UserScript::DOCUMENT_START, run_location);
 
   std::vector<std::string> sources;
@@ -238,10 +247,19 @@ std::vector<std::string> UserScriptInjector::GetCssSources(
     return sources;
 
   const UserScript::FileList& css_scripts = script_->css_scripts();
+
   for (UserScript::FileList::const_iterator iter = css_scripts.begin();
        iter != css_scripts.end();
        ++iter) {
-    sources.push_back(iter->GetContent().as_string());
+    GURL scriptUrl = iter->url();
+    // Check if the script is already injected
+    if(scripts_run_info->injected_scripts.find(scriptUrl)
+       == scripts_run_info->injected_scripts.end()) {
+      std::string content = iter->GetContent().as_string();
+      sources.push_back(iter->GetContent().as_string());
+
+      scripts_run_info->injected_scripts.insert(scriptUrl);
+    }
   }
   return sources;
 }