Index: content/public/test/render_view_test.cc |
diff --git a/content/public/test/render_view_test.cc b/content/public/test/render_view_test.cc |
index a32cc89413c11d4ed3094f0ed50aa37324b1d611..a900c41789a9d1f971397853f266dd5994f37c79 100644 |
--- a/content/public/test/render_view_test.cc |
+++ b/content/public/test/render_view_test.cc |
@@ -28,13 +28,13 @@ |
#include "ui/base/resource/resource_bundle.h" |
#include "webkit/glue/webkit_glue.h" |
-using WebKit::WebFrame; |
-using WebKit::WebInputEvent; |
-using WebKit::WebMouseEvent; |
-using WebKit::WebScriptController; |
-using WebKit::WebScriptSource; |
-using WebKit::WebString; |
-using WebKit::WebURLRequest; |
+using blink::WebFrame; |
+using blink::WebInputEvent; |
+using blink::WebMouseEvent; |
+using blink::WebScriptController; |
+using blink::WebScriptSource; |
+using blink::WebString; |
+using blink::WebURLRequest; |
namespace { |
const int32 kOpenerId = -2; |
@@ -50,7 +50,7 @@ namespace content { |
class RendererWebKitPlatformSupportImplNoSandboxImpl |
: public RendererWebKitPlatformSupportImpl { |
public: |
- virtual WebKit::WebSandboxSupport* sandboxSupport() { |
+ virtual blink::WebSandboxSupport* sandboxSupport() { |
return NULL; |
} |
}; |
@@ -65,7 +65,7 @@ RenderViewTest::RendererWebKitPlatformSupportImplNoSandbox:: |
~RendererWebKitPlatformSupportImplNoSandbox() { |
} |
-WebKit::Platform* |
+blink::Platform* |
RenderViewTest::RendererWebKitPlatformSupportImplNoSandbox::Get() { |
return webkit_platform_support_.get(); |
} |
@@ -117,11 +117,11 @@ void RenderViewTest::LoadHTML(const char* html) { |
ProcessPendingMessages(); |
} |
-void RenderViewTest::GoBack(const WebKit::WebHistoryItem& item) { |
+void RenderViewTest::GoBack(const blink::WebHistoryItem& item) { |
GoToOffset(-1, item); |
} |
-void RenderViewTest::GoForward(const WebKit::WebHistoryItem& item) { |
+void RenderViewTest::GoForward(const blink::WebHistoryItem& item) { |
GoToOffset(1, item); |
} |
@@ -149,7 +149,7 @@ void RenderViewTest::SetUp() { |
// Setting flags and really doing anything with WebKit is fairly fragile and |
// hacky, but this is the world we live in... |
webkit_glue::SetJavaScriptFlags(" --expose-gc"); |
- WebKit::initialize(webkit_platform_support_.Get()); |
+ blink::initialize(webkit_platform_support_.Get()); |
// Ensure that we register any necessary schemes when initializing WebKit, |
// since we are using a MockRenderThread. |
@@ -178,7 +178,7 @@ void RenderViewTest::SetUp() { |
false, // swapped_out |
false, // hidden |
1, // next_page_id |
- WebKit::WebScreenInfo(), |
+ blink::WebScreenInfo(), |
AccessibilityModeOff, |
true); |
view->AddRef(); |
@@ -207,7 +207,7 @@ void RenderViewTest::TearDown() { |
// (http://crbug.com/21508). |
base::RunLoop().RunUntilIdle(); |
- WebKit::shutdown(); |
+ blink::shutdown(); |
platform_->PlatformUninitialize(); |
platform_.reset(); |
@@ -221,14 +221,14 @@ void RenderViewTest::SendNativeKeyEvent( |
} |
void RenderViewTest::SendWebKeyboardEvent( |
- const WebKit::WebKeyboardEvent& key_event) { |
+ const blink::WebKeyboardEvent& key_event) { |
RenderViewImpl* impl = static_cast<RenderViewImpl*>(view_); |
impl->OnMessageReceived( |
InputMsg_HandleInputEvent(0, &key_event, ui::LatencyInfo(), false)); |
} |
void RenderViewTest::SendWebMouseEvent( |
- const WebKit::WebMouseEvent& mouse_event) { |
+ const blink::WebMouseEvent& mouse_event) { |
RenderViewImpl* impl = static_cast<RenderViewImpl*>(view_); |
impl->OnMessageReceived( |
InputMsg_HandleInputEvent(0, &mouse_event, ui::LatencyInfo(), false)); |
@@ -296,7 +296,7 @@ bool RenderViewTest::SimulateElementClick(const std::string& element_id) { |
return true; |
} |
-void RenderViewTest::SetFocused(const WebKit::WebNode& node) { |
+void RenderViewTest::SetFocused(const blink::WebNode& node) { |
RenderViewImpl* impl = static_cast<RenderViewImpl*>(view_); |
impl->focusedNodeChanged(node); |
} |
@@ -325,7 +325,7 @@ void RenderViewTest::Resize(gfx::Size new_size, |
gfx::Rect resizer_rect, |
bool is_fullscreen) { |
ViewMsg_Resize_Params params; |
- params.screen_info = WebKit::WebScreenInfo(); |
+ params.screen_info = blink::WebScreenInfo(); |
params.new_size = new_size; |
params.physical_backing_size = new_size; |
params.overdraw_bottom_height = 0.f; |
@@ -340,7 +340,7 @@ bool RenderViewTest::OnMessageReceived(const IPC::Message& msg) { |
return impl->OnMessageReceived(msg); |
} |
-void RenderViewTest::DidNavigateWithinPage(WebKit::WebFrame* frame, |
+void RenderViewTest::DidNavigateWithinPage(blink::WebFrame* frame, |
bool is_new_navigation) { |
RenderViewImpl* impl = static_cast<RenderViewImpl*>(view_); |
impl->didNavigateWithinPage(frame, is_new_navigation); |
@@ -351,13 +351,13 @@ void RenderViewTest::SendContentStateImmediately() { |
impl->set_send_content_state_immediately(true); |
} |
-WebKit::WebWidget* RenderViewTest::GetWebWidget() { |
+blink::WebWidget* RenderViewTest::GetWebWidget() { |
RenderViewImpl* impl = static_cast<RenderViewImpl*>(view_); |
return impl->webwidget(); |
} |
void RenderViewTest::GoToOffset(int offset, |
- const WebKit::WebHistoryItem& history_item) { |
+ const blink::WebHistoryItem& history_item) { |
RenderViewImpl* impl = static_cast<RenderViewImpl*>(view_); |
int history_list_length = impl->historyBackListCount() + |