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" |
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
193 false, // window_was_created_with_opener | 193 false, // window_was_created_with_opener |
194 RendererPreferences(), | 194 RendererPreferences(), |
195 WebPreferences(), | 195 WebPreferences(), |
196 kRouteId, | 196 kRouteId, |
197 kMainFrameRouteId, | 197 kMainFrameRouteId, |
198 kSurfaceId, | 198 kSurfaceId, |
199 kInvalidSessionStorageNamespaceId, | 199 kInvalidSessionStorageNamespaceId, |
200 base::string16(), | 200 base::string16(), |
201 false, // is_renderer_created | 201 false, // is_renderer_created |
202 false, // swapped_out | 202 false, // swapped_out |
| 203 FrameReplicationState(), |
203 MSG_ROUTING_NONE, // proxy_routing_id | 204 MSG_ROUTING_NONE, // proxy_routing_id |
204 false, // hidden | 205 false, // hidden |
205 false, // never_visible | 206 false, // never_visible |
206 1, // next_page_id | 207 1, // next_page_id |
207 blink::WebScreenInfo()); | 208 blink::WebScreenInfo()); |
208 view->AddRef(); | 209 view->AddRef(); |
209 view_ = view; | 210 view_ = view; |
210 } | 211 } |
211 | 212 |
212 void RenderViewTest::TearDown() { | 213 void RenderViewTest::TearDown() { |
(...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
428 FrameMsg_Navigate navigate_message(impl->GetMainRenderFrame()->GetRoutingID(), | 429 FrameMsg_Navigate navigate_message(impl->GetMainRenderFrame()->GetRoutingID(), |
429 navigate_params); | 430 navigate_params); |
430 impl->GetMainRenderFrame()->OnMessageReceived(navigate_message); | 431 impl->GetMainRenderFrame()->OnMessageReceived(navigate_message); |
431 | 432 |
432 // The load actually happens asynchronously, so we pump messages to process | 433 // The load actually happens asynchronously, so we pump messages to process |
433 // the pending continuation. | 434 // the pending continuation. |
434 FrameLoadWaiter(view_->GetMainRenderFrame()).Wait(); | 435 FrameLoadWaiter(view_->GetMainRenderFrame()).Wait(); |
435 } | 436 } |
436 | 437 |
437 } // namespace content | 438 } // namespace content |
OLD | NEW |