| 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 167 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 178 // suite implementation than for content_unittests). For browser_tests, this | 178 // suite implementation than for content_unittests). For browser_tests, this |
| 179 // is already initialized. | 179 // is already initialized. |
| 180 if (!ResourceBundle::HasSharedInstance()) | 180 if (!ResourceBundle::HasSharedInstance()) |
| 181 ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL); | 181 ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL); |
| 182 | 182 |
| 183 mock_process_.reset(new MockRenderProcess); | 183 mock_process_.reset(new MockRenderProcess); |
| 184 | 184 |
| 185 // This needs to pass the mock render thread to the view. | 185 // This needs to pass the mock render thread to the view. |
| 186 RenderViewImpl* view = | 186 RenderViewImpl* view = |
| 187 RenderViewImpl::Create(kOpenerId, | 187 RenderViewImpl::Create(kOpenerId, |
| 188 false, // window_was_created_with_opener |
| 188 RendererPreferences(), | 189 RendererPreferences(), |
| 189 WebPreferences(), | 190 WebPreferences(), |
| 190 kRouteId, | 191 kRouteId, |
| 191 kMainFrameRouteId, | 192 kMainFrameRouteId, |
| 192 kSurfaceId, | 193 kSurfaceId, |
| 193 kInvalidSessionStorageNamespaceId, | 194 kInvalidSessionStorageNamespaceId, |
| 194 base::string16(), | 195 base::string16(), |
| 195 false, // is_renderer_created | 196 false, // is_renderer_created |
| 196 false, // swapped_out | 197 false, // swapped_out |
| 197 false, // hidden | 198 false, // hidden |
| (...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 420 FrameMsg_Navigate navigate_message(impl->main_render_frame()->GetRoutingID(), | 421 FrameMsg_Navigate navigate_message(impl->main_render_frame()->GetRoutingID(), |
| 421 navigate_params); | 422 navigate_params); |
| 422 impl->main_render_frame()->OnMessageReceived(navigate_message); | 423 impl->main_render_frame()->OnMessageReceived(navigate_message); |
| 423 | 424 |
| 424 // The load actually happens asynchronously, so we pump messages to process | 425 // The load actually happens asynchronously, so we pump messages to process |
| 425 // the pending continuation. | 426 // the pending continuation. |
| 426 ProcessPendingMessages(); | 427 ProcessPendingMessages(); |
| 427 } | 428 } |
| 428 | 429 |
| 429 } // namespace content | 430 } // namespace content |
| OLD | NEW |