| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/public/test/render_view_test.h" | 5 #include "content/public/test/render_view_test.h" |
| 6 | 6 |
| 7 #include "base/run_loop.h" | 7 #include "base/run_loop.h" |
| 8 #include "content/common/dom_storage/dom_storage_types.h" | 8 #include "content/common/dom_storage/dom_storage_types.h" |
| 9 #include "content/common/frame_messages.h" | 9 #include "content/common/frame_messages.h" |
| 10 #include "content/common/input_messages.h" | 10 #include "content/common/input_messages.h" |
| 11 #include "content/common/view_messages.h" | 11 #include "content/common/view_messages.h" |
| 12 #include "content/public/browser/content_browser_client.h" | 12 #include "content/public/browser/content_browser_client.h" |
| 13 #include "content/public/browser/native_web_keyboard_event.h" | 13 #include "content/public/browser/native_web_keyboard_event.h" |
| 14 #include "content/public/common/content_client.h" | 14 #include "content/public/common/content_client.h" |
| 15 #include "content/public/common/renderer_preferences.h" | 15 #include "content/public/common/renderer_preferences.h" |
| 16 #include "content/public/renderer/content_renderer_client.h" | 16 #include "content/public/renderer/content_renderer_client.h" |
| 17 #include "content/public/test/frame_load_waiter.h" | 17 #include "content/public/test/frame_load_waiter.h" |
| 18 #include "content/renderer/history_controller.h" | 18 #include "content/renderer/history_controller.h" |
| 19 #include "content/renderer/history_serialization.h" | 19 #include "content/renderer/history_serialization.h" |
| 20 #include "content/renderer/render_thread_impl.h" | 20 #include "content/renderer/render_thread_impl.h" |
| 21 #include "content/renderer/render_view_impl.h" | 21 #include "content/renderer/render_view_impl.h" |
| 22 #include "content/renderer/renderer_main_platform_delegate.h" | 22 #include "content/renderer/renderer_main_platform_delegate.h" |
| 23 #include "content/renderer/renderer_webkitplatformsupport_impl.h" | 23 #include "content/renderer/renderer_webkitplatformsupport_impl.h" |
| 24 #include "content/test/mock_render_process.h" | 24 #include "content/test/mock_render_process.h" |
| 25 #include "content/test/test_content_client.h" |
| 25 #include "third_party/WebKit/public/platform/WebScreenInfo.h" | 26 #include "third_party/WebKit/public/platform/WebScreenInfo.h" |
| 26 #include "third_party/WebKit/public/platform/WebURLRequest.h" | 27 #include "third_party/WebKit/public/platform/WebURLRequest.h" |
| 27 #include "third_party/WebKit/public/web/WebHistoryItem.h" | 28 #include "third_party/WebKit/public/web/WebHistoryItem.h" |
| 28 #include "third_party/WebKit/public/web/WebInputEvent.h" | 29 #include "third_party/WebKit/public/web/WebInputEvent.h" |
| 29 #include "third_party/WebKit/public/web/WebKit.h" | 30 #include "third_party/WebKit/public/web/WebKit.h" |
| 30 #include "third_party/WebKit/public/web/WebLocalFrame.h" | 31 #include "third_party/WebKit/public/web/WebLocalFrame.h" |
| 31 #include "third_party/WebKit/public/web/WebScriptSource.h" | 32 #include "third_party/WebKit/public/web/WebScriptSource.h" |
| 32 #include "third_party/WebKit/public/web/WebView.h" | 33 #include "third_party/WebKit/public/web/WebView.h" |
| 33 #include "ui/base/resource/resource_bundle.h" | 34 #include "ui/base/resource/resource_bundle.h" |
| 34 #include "v8/include/v8.h" | 35 #include "v8/include/v8.h" |
| (...skipping 349 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 384 impl->set_send_content_state_immediately(true); | 385 impl->set_send_content_state_immediately(true); |
| 385 } | 386 } |
| 386 | 387 |
| 387 blink::WebWidget* RenderViewTest::GetWebWidget() { | 388 blink::WebWidget* RenderViewTest::GetWebWidget() { |
| 388 RenderViewImpl* impl = static_cast<RenderViewImpl*>(view_); | 389 RenderViewImpl* impl = static_cast<RenderViewImpl*>(view_); |
| 389 return impl->webwidget(); | 390 return impl->webwidget(); |
| 390 } | 391 } |
| 391 | 392 |
| 392 | 393 |
| 393 ContentClient* RenderViewTest::CreateContentClient() { | 394 ContentClient* RenderViewTest::CreateContentClient() { |
| 394 return new ContentClient; | 395 return new TestContentClient; |
| 395 } | 396 } |
| 396 | 397 |
| 397 ContentBrowserClient* RenderViewTest::CreateContentBrowserClient() { | 398 ContentBrowserClient* RenderViewTest::CreateContentBrowserClient() { |
| 398 return new ContentBrowserClient; | 399 return new ContentBrowserClient; |
| 399 } | 400 } |
| 400 | 401 |
| 401 ContentRendererClient* RenderViewTest::CreateContentRendererClient() { | 402 ContentRendererClient* RenderViewTest::CreateContentRendererClient() { |
| 402 return new ContentRendererClient; | 403 return new ContentRendererClient; |
| 403 } | 404 } |
| 404 | 405 |
| (...skipping 17 matching lines...) Expand all Loading... |
| 422 FrameMsg_Navigate navigate_message(impl->GetMainRenderFrame()->GetRoutingID(), | 423 FrameMsg_Navigate navigate_message(impl->GetMainRenderFrame()->GetRoutingID(), |
| 423 navigate_params); | 424 navigate_params); |
| 424 impl->GetMainRenderFrame()->OnMessageReceived(navigate_message); | 425 impl->GetMainRenderFrame()->OnMessageReceived(navigate_message); |
| 425 | 426 |
| 426 // The load actually happens asynchronously, so we pump messages to process | 427 // The load actually happens asynchronously, so we pump messages to process |
| 427 // the pending continuation. | 428 // the pending continuation. |
| 428 FrameLoadWaiter(view_->GetMainRenderFrame()).Wait(); | 429 FrameLoadWaiter(view_->GetMainRenderFrame()).Wait(); |
| 429 } | 430 } |
| 430 | 431 |
| 431 } // namespace content | 432 } // namespace content |
| OLD | NEW |