Commit 40144. I had to move to to a separate CL to use gcl's

"try multiple commits" feature.

Review URL: http://codereview.chromium.org/46062

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11683 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 8 insertions, 7 deletions

diff --git a/chrome/renderer/user_script_slave.cc b/chrome/renderer/user_script_slave.cc
index bc612f0..6362109 100644
--- a/chrome/renderer/user_script_slave.cc
+++ b/chrome/renderer/user_script_slave.cc
@@ -12,6 +12,7 @@
 #include "chrome/common/resource_bundle.h"
 #include "googleurl/src/gurl.h"
 #include "webkit/glue/webframe.h"
+#include "webkit/glue/webscriptsource.h"
 
 #include "grit/renderer_resources.h"
 
@@ -100,13 +101,13 @@ bool UserScriptSlave::InjectScripts(WebFrame* frame,
        script != scripts_.end(); ++script) {
     if ((*script)->MatchesUrl(frame->GetURL()) &&
         (*script)->run_location() == location) {
-      std::string inject(kUserScriptHead);
-      inject.append(api_js_.as_string());
-      inject.append(script_contents_[*script].as_string());
-      inject.append(kUserScriptTail);
-      frame->ExecuteJavaScript(inject,
-                               GURL((*script)->url().spec()),
-                               -user_script_start_line_);
+      webkit_glue::WebScriptSource sources[] = {
+        webkit_glue::WebScriptSource(api_js_.as_string()),
+        webkit_glue::WebScriptSource(
+            script_contents_[*script].as_string(), (*script)->url())
+      };
+
+      frame->ExecuteScriptInNewContext(sources, arraysize(sources));
       ++num_matched;
     }
   }