Switch to WebFrame from the WebKit API....

chrome/test/render_view_test.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/test/render_view_test.h"
 
 #include "chrome/browser/extensions/extension_function_dispatcher.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/native_web_keyboard_event.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/renderer_preferences.h"
 #include "chrome/renderer/extensions/event_bindings.h"
 #include "chrome/renderer/extensions/extension_process_bindings.h"
 #include "chrome/renderer/extensions/renderer_extension_bindings.h"
 #include "chrome/renderer/js_only_v8_extensions.h"
 #include "chrome/renderer/renderer_main_platform_delegate.h"
+#include "webkit/api/public/WebFrame.h"
 #include "webkit/api/public/WebInputEvent.h"
 #include "webkit/api/public/WebKit.h"
 #include "webkit/api/public/WebScriptSource.h"
 #include "webkit/api/public/WebURLRequest.h"
 #include "webkit/glue/webview.h"
 
+using WebKit::WebFrame;
 using WebKit::WebScriptSource;
 using WebKit::WebString;
 using WebKit::WebURLRequest;
 
 namespace {
-
 const int32 kRouteId = 5;
 const int32 kOpenerId = 7;
-
-};
+}
 
 void RenderViewTest::ProcessPendingMessages() {
   msg_loop_.PostTask(FROM_HERE, new MessageLoop::QuitTask());
   msg_loop_.Run();
 }
 
 WebFrame* RenderViewTest::GetMainFrame() {
   return view_->webview()->GetMainFrame();
 }
 
 void RenderViewTest::ExecuteJavaScript(const char* js) {
-  GetMainFrame()->ExecuteScript(WebScriptSource(WebString::fromUTF8(js)));
+  GetMainFrame()->executeScript(WebScriptSource(WebString::fromUTF8(js)));
 }
 
 void RenderViewTest::LoadHTML(const char* html) {
   std::string url_str = "data:text/html;charset=utf-8,";
   url_str.append(html);
   GURL url(url_str);
 
-  GetMainFrame()->LoadRequest(WebURLRequest(url));
+  GetMainFrame()->loadRequest(WebURLRequest(url));
 
   // The load actually happens asynchronously, so we pump messages to process
   // the pending continuation.
   ProcessPendingMessages();
 }
 
 void RenderViewTest::SetUp() {
   sandbox_init_wrapper_.reset(new SandboxInitWrapper());
 #if defined(OS_WIN)
   command_line_.reset(new CommandLine(std::wstring()));
@@ skipping 98 matching lines @@
   keyup_message->WriteData(reinterpret_cast<const char*>(&keyup_event),
                            sizeof(WebKit::WebKeyboardEvent));
   view_->OnHandleInputEvent(*keyup_message);
 
   return length;
 #else
   NOTIMPLEMENTED();
   return L'\0';
 #endif
 }