| 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 "content/common/view_messages.h" | 7 #include "content/common/view_messages.h" |
| 8 #include "content/public/browser/native_web_keyboard_event.h" | 8 #include "content/public/browser/native_web_keyboard_event.h" |
| 9 #include "content/public/common/accessibility_mode.h" |
| 9 #include "content/public/common/renderer_preferences.h" | 10 #include "content/public/common/renderer_preferences.h" |
| 10 #include "content/renderer/render_thread_impl.h" | 11 #include "content/renderer/render_thread_impl.h" |
| 11 #include "content/renderer/render_view_impl.h" | 12 #include "content/renderer/render_view_impl.h" |
| 12 #include "content/renderer/renderer_main_platform_delegate.h" | 13 #include "content/renderer/renderer_main_platform_delegate.h" |
| 13 #include "content/renderer/renderer_webkitplatformsupport_impl.h" | 14 #include "content/renderer/renderer_webkitplatformsupport_impl.h" |
| 14 #include "content/test/mock_render_process.h" | 15 #include "content/test/mock_render_process.h" |
| 15 #include "third_party/WebKit/Source/Platform/chromium/public/WebURLRequest.h" | 16 #include "third_party/WebKit/Source/Platform/chromium/public/WebURLRequest.h" |
| 16 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" | 17 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" |
| 17 #include "third_party/WebKit/Source/WebKit/chromium/public/WebHistoryItem.h" | 18 #include "third_party/WebKit/Source/WebKit/chromium/public/WebHistoryItem.h" |
| 18 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" | 19 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" |
| (...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 166 webkit_glue::WebPreferences(), | 167 webkit_glue::WebPreferences(), |
| 167 new SharedRenderViewCounter(0), | 168 new SharedRenderViewCounter(0), |
| 168 kRouteId, | 169 kRouteId, |
| 169 kSurfaceId, | 170 kSurfaceId, |
| 170 dom_storage::kInvalidSessionStorageNamespaceId, | 171 dom_storage::kInvalidSessionStorageNamespaceId, |
| 171 string16(), | 172 string16(), |
| 172 false, | 173 false, |
| 173 false, | 174 false, |
| 174 1, | 175 1, |
| 175 WebKit::WebScreenInfo(), | 176 WebKit::WebScreenInfo(), |
| 176 AccessibilityModeOff); | 177 ACCESSIBILITY_MODE_OFF); |
| 177 view->AddRef(); | 178 view->AddRef(); |
| 178 view_ = view; | 179 view_ = view; |
| 179 } | 180 } |
| 180 | 181 |
| 181 void RenderViewTest::TearDown() { | 182 void RenderViewTest::TearDown() { |
| 182 // Try very hard to collect garbage before shutting down. | 183 // Try very hard to collect garbage before shutting down. |
| 183 GetMainFrame()->collectGarbage(); | 184 GetMainFrame()->collectGarbage(); |
| 184 GetMainFrame()->collectGarbage(); | 185 GetMainFrame()->collectGarbage(); |
| 185 | 186 |
| 186 // Run the loop so the release task from the renderwidget executes. | 187 // Run the loop so the release task from the renderwidget executes. |
| (...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 356 | 357 |
| 357 ViewMsg_Navigate navigate_message(impl->GetRoutingID(), navigate_params); | 358 ViewMsg_Navigate navigate_message(impl->GetRoutingID(), navigate_params); |
| 358 OnMessageReceived(navigate_message); | 359 OnMessageReceived(navigate_message); |
| 359 | 360 |
| 360 // The load actually happens asynchronously, so we pump messages to process | 361 // The load actually happens asynchronously, so we pump messages to process |
| 361 // the pending continuation. | 362 // the pending continuation. |
| 362 ProcessPendingMessages(); | 363 ProcessPendingMessages(); |
| 363 } | 364 } |
| 364 | 365 |
| 365 } // namespace content | 366 } // namespace content |
| OLD | NEW |