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 180 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
191 view_params.opener_route_id = kOpenerId; | 191 view_params.opener_route_id = kOpenerId; |
192 view_params.window_was_created_with_opener = false; | 192 view_params.window_was_created_with_opener = false; |
193 view_params.renderer_preferences = RendererPreferences(); | 193 view_params.renderer_preferences = RendererPreferences(); |
194 view_params.web_preferences = WebPreferences(); | 194 view_params.web_preferences = WebPreferences(); |
195 view_params.view_id = kRouteId; | 195 view_params.view_id = kRouteId; |
196 view_params.main_frame_routing_id = kMainFrameRouteId; | 196 view_params.main_frame_routing_id = kMainFrameRouteId; |
197 view_params.surface_id = kSurfaceId; | 197 view_params.surface_id = kSurfaceId; |
198 view_params.session_storage_namespace_id = kInvalidSessionStorageNamespaceId; | 198 view_params.session_storage_namespace_id = kInvalidSessionStorageNamespaceId; |
199 view_params.frame_name = base::string16(); | 199 view_params.frame_name = base::string16(); |
200 view_params.swapped_out = false; | 200 view_params.swapped_out = false; |
| 201 view_params.replicated_frame_state = FrameReplicationState(); |
201 view_params.proxy_routing_id = MSG_ROUTING_NONE; | 202 view_params.proxy_routing_id = MSG_ROUTING_NONE; |
202 view_params.hidden = false; | 203 view_params.hidden = false; |
203 view_params.never_visible = false; | 204 view_params.never_visible = false; |
204 view_params.next_page_id = 1; | 205 view_params.next_page_id = 1; |
205 view_params.initial_size = *InitialSizeParams(); | 206 view_params.initial_size = *InitialSizeParams(); |
206 view_params.enable_auto_resize = false; | 207 view_params.enable_auto_resize = false; |
207 view_params.min_size = gfx::Size(); | 208 view_params.min_size = gfx::Size(); |
208 view_params.max_size = gfx::Size(); | 209 view_params.max_size = gfx::Size(); |
209 | 210 |
210 // This needs to pass the mock render thread to the view. | 211 // This needs to pass the mock render thread to the view. |
(...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
436 FrameMsg_Navigate navigate_message(impl->GetMainRenderFrame()->GetRoutingID(), | 437 FrameMsg_Navigate navigate_message(impl->GetMainRenderFrame()->GetRoutingID(), |
437 navigate_params); | 438 navigate_params); |
438 impl->GetMainRenderFrame()->OnMessageReceived(navigate_message); | 439 impl->GetMainRenderFrame()->OnMessageReceived(navigate_message); |
439 | 440 |
440 // The load actually happens asynchronously, so we pump messages to process | 441 // The load actually happens asynchronously, so we pump messages to process |
441 // the pending continuation. | 442 // the pending continuation. |
442 FrameLoadWaiter(view_->GetMainRenderFrame()).Wait(); | 443 FrameLoadWaiter(view_->GetMainRenderFrame()).Wait(); |
443 } | 444 } |
444 | 445 |
445 } // namespace content | 446 } // namespace content |
OLD | NEW |