Change some places where we were using javascript: URLs to use

WebFrame::ExecuteJavaScript() instead.

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

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

4 files changed, 11 insertions, 12 deletions

diff --git a/chrome/renderer/debug_message_handler.cc b/chrome/renderer/debug_message_handler.cc
index 7faa430..451a28b 100644
--- a/chrome/renderer/debug_message_handler.cc
+++ b/chrome/renderer/debug_message_handler.cc
@@ -17,12 +17,12 @@ DebugMessageHandler::DebugMessageHandler(RenderView* view) :
 DebugMessageHandler::~DebugMessageHandler() {
 }
 
-void DebugMessageHandler::EvaluateScriptUrl(const std::wstring& url) {
+void DebugMessageHandler::EvaluateScript(const std::wstring& script) {
   DCHECK(MessageLoop::current() == view_loop_);
   // It's possible that this will get cleared out from under us.
   RenderView* view = view_;
   if (view) {
-    view->EvaluateScriptUrl(L"", url);
+    view->EvaluateScript(L"", script);
   }
 }
 
@@ -37,7 +37,7 @@ void DebugMessageHandler::OnBreak(bool force) {
   debugger_->Break(force);
   if (force && view_loop_) {
     view_loop_->PostTask(FROM_HERE, NewRunnableMethod(
-        this, &DebugMessageHandler::EvaluateScriptUrl,
+        this, &DebugMessageHandler::EvaluateScript,
         std::wstring(L"javascript:void(0)")));
   }
 }
diff --git a/chrome/renderer/debug_message_handler.h b/chrome/renderer/debug_message_handler.h
index d7724d0..f02ad88 100644
--- a/chrome/renderer/debug_message_handler.h
+++ b/chrome/renderer/debug_message_handler.h
@@ -22,7 +22,7 @@ class DebugMessageHandler : public IPC::ChannelProxy::MessageFilter,
 
  private:
   // evaluate javascript URL in the renderer
-  void EvaluateScriptUrl(const std::wstring& url);
+  void EvaluateScript(const std::wstring& script);
 
   // Debugger::Delegate callback method to handle debugger output.
   void DebuggerOutput(const std::wstring& out);
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index e283499..5c0ab5a 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -2337,19 +2337,18 @@ WebFrame* RenderView::GetChildFrame(const std::wstring& frame_xpath) const {
   return web_frame;
 }
 
-void RenderView::EvaluateScriptUrl(const std::wstring& frame_xpath,
-                                   const std::wstring& js_url) {
+void RenderView::EvaluateScript(const std::wstring& frame_xpath,
+                                const std::wstring& script) {
   WebFrame* web_frame = GetChildFrame(frame_xpath);
   if (!web_frame)
     return;
 
-  scoped_ptr<WebRequest> request(WebRequest::Create(GURL(js_url)));
-  web_frame->LoadRequest(request.get());
+  web_frame->ExecuteJavaScript(WideToUTF8(script), "");
 }
 
 void RenderView::OnScriptEvalRequest(const std::wstring& frame_xpath,
                                      const std::wstring& jscript) {
-  EvaluateScriptUrl(frame_xpath, jscript);
+  EvaluateScript(frame_xpath, jscript);
 }
 
 void RenderView::OnAddMessageToConsole(const std::wstring& frame_xpath,
diff --git a/chrome/renderer/render_view.h b/chrome/renderer/render_view.h
index e468e98..caed67d 100644
--- a/chrome/renderer/render_view.h
+++ b/chrome/renderer/render_view.h
@@ -289,9 +289,9 @@ class RenderView : public RenderWidget, public WebViewDelegate,
   // periodic timer so we don't send too many messages.
   void SyncNavigationState();
 
-  // Evaluates a javascript: URL
-  void EvaluateScriptUrl(const std::wstring& frame_xpath,
-                         const std::wstring& jscript);
+  // Evaluates a string of JavaScript in a particular frame.
+  void EvaluateScript(const std::wstring& frame_xpath,
+                      const std::wstring& jscript);
 
   // Called when the Javascript debugger is no longer attached.
   // This is called from within the renderer, not via an IPC message.