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 kMainFrameRouteId, | 191 kMainFrameRouteId, |
192 kSurfaceId, | 192 kSurfaceId, |
193 kInvalidSessionStorageNamespaceId, | 193 kInvalidSessionStorageNamespaceId, |
194 base::string16(), | 194 base::string16(), |
195 false, // is_renderer_created | 195 false, // is_renderer_created |
196 false, // swapped_out | 196 false, // swapped_out |
197 MSG_ROUTING_NONE, // proxy_routing_id | 197 MSG_ROUTING_NONE, // proxy_routing_id |
198 false, // hidden | 198 false, // hidden |
199 false, // never_visible | 199 false, // never_visible |
200 1, // next_page_id | 200 1, // next_page_id |
201 blink::WebScreenInfo()); | 201 blink::WebScreenInfo(), |
| 202 gfx::Size()); |
202 view->AddRef(); | 203 view->AddRef(); |
203 view_ = view; | 204 view_ = view; |
204 } | 205 } |
205 | 206 |
206 void RenderViewTest::TearDown() { | 207 void RenderViewTest::TearDown() { |
207 // Try very hard to collect garbage before shutting down. | 208 // Try very hard to collect garbage before shutting down. |
208 // "5" was chosen following http://crbug.com/46571#c9 | 209 // "5" was chosen following http://crbug.com/46571#c9 |
209 const int kGCIterations = 5; | 210 const int kGCIterations = 5; |
210 for (int i = 0; i < kGCIterations; i++) | 211 for (int i = 0; i < kGCIterations; i++) |
211 GetMainFrame()->collectGarbage(); | 212 GetMainFrame()->collectGarbage(); |
(...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after 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 |