Implement <webview>.addContentScript/removeContentScript API [1]

extensions/renderer/user_script_set.cc

Index: extensions/renderer/user_script_set.cc
diff --git a/extensions/renderer/user_script_set.cc b/extensions/renderer/user_script_set.cc
index 58e9de17cc89bb0fd72d755af79f92e4ff474aba..19bc34a93ef53965d66b567501748893acb0aad8 100644
--- a/extensions/renderer/user_script_set.cc
+++ b/extensions/renderer/user_script_set.cc
@@ -68,7 +68,8 @@ void UserScriptSet::GetInjections(
     ScopedVector<ScriptInjection>* injections,
     blink::WebFrame* web_frame,
     int tab_id,
-    UserScript::RunLocation run_location) {
+    UserScript::RunLocation run_location,
+    bool has_guest_content_script) {
   GURL document_url = GetDocumentUrlForFrame(web_frame);
   for (ScopedVector<UserScript>::const_iterator iter = scripts_.begin();
        iter != scripts_.end();
@@ -79,7 +80,8 @@ void UserScriptSet::GetInjections(
         tab_id,
         run_location,
         document_url,
-        false /* is_declarative */);
+        false /* is_declarative */,
+        has_guest_content_script);
     if (injection.get())
       injections->push_back(injection.release());
   }
@@ -164,7 +166,8 @@ scoped_ptr<ScriptInjection> UserScriptSet::GetDeclarativeScriptInjection(
                                    tab_id,
                                    run_location,
                                    document_url,
-                                   true /* is_declarative */);
+                                   true /* is_declarative */,
+                                   false /*has_guest_content_script */);
     }
   }
   return scoped_ptr<ScriptInjection>();
@@ -178,7 +181,8 @@ scoped_ptr<ScriptInjection> UserScriptSet::GetInjectionForScript(
     int tab_id,
     UserScript::RunLocation run_location,
     const GURL& document_url,
-    bool is_declarative) {
+    bool is_declarative,
+    bool has_guest_content_script) {
   scoped_ptr<ScriptInjection> injection;
   scoped_ptr<const InjectionHost> injection_host;
 
@@ -201,9 +205,11 @@ scoped_ptr<ScriptInjection> UserScriptSet::GetInjectionForScript(
   if (!script->MatchesURL(effective_document_url))
     return injection.Pass();
 
-  scoped_ptr<ScriptInjector> injector(new UserScriptInjector(script,
-                                                             this,
-                                                             is_declarative));
+  scoped_ptr<ScriptInjector> injector(new UserScriptInjector(
+      script,
+      this,
+      is_declarative,
+      has_guest_content_script));
 
   blink::WebFrame* top_frame = web_frame->top();
   // It doesn't make sense to do script injection for remote frames, since they