| 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 161 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 172 // suite implementation than for content_unittests). For browser_tests, this | 172 // suite implementation than for content_unittests). For browser_tests, this |
| 173 // is already initialized. | 173 // is already initialized. |
| 174 if (!ResourceBundle::HasSharedInstance()) | 174 if (!ResourceBundle::HasSharedInstance()) |
| 175 ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL); | 175 ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL); |
| 176 | 176 |
| 177 mock_process_.reset(new MockRenderProcess); | 177 mock_process_.reset(new MockRenderProcess); |
| 178 | 178 |
| 179 // This needs to pass the mock render thread to the view. | 179 // This needs to pass the mock render thread to the view. |
| 180 RenderViewImpl* view = | 180 RenderViewImpl* view = |
| 181 RenderViewImpl::Create(kOpenerId, | 181 RenderViewImpl::Create(kOpenerId, |
| 182 false, // window_was_created_with_opener |
| 182 RendererPreferences(), | 183 RendererPreferences(), |
| 183 WebPreferences(), | 184 WebPreferences(), |
| 184 kRouteId, | 185 kRouteId, |
| 185 kMainFrameRouteId, | 186 kMainFrameRouteId, |
| 186 kSurfaceId, | 187 kSurfaceId, |
| 187 kInvalidSessionStorageNamespaceId, | 188 kInvalidSessionStorageNamespaceId, |
| 188 base::string16(), | 189 base::string16(), |
| 189 false, // is_renderer_created | 190 false, // is_renderer_created |
| 190 false, // swapped_out | 191 false, // swapped_out |
| 191 false, // hidden | 192 false, // hidden |
| (...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 407 FrameMsg_Navigate navigate_message(impl->main_render_frame()->GetRoutingID(), | 408 FrameMsg_Navigate navigate_message(impl->main_render_frame()->GetRoutingID(), |
| 408 navigate_params); | 409 navigate_params); |
| 409 impl->main_render_frame()->OnMessageReceived(navigate_message); | 410 impl->main_render_frame()->OnMessageReceived(navigate_message); |
| 410 | 411 |
| 411 // The load actually happens asynchronously, so we pump messages to process | 412 // The load actually happens asynchronously, so we pump messages to process |
| 412 // the pending continuation. | 413 // the pending continuation. |
| 413 ProcessPendingMessages(); | 414 ProcessPendingMessages(); |
| 414 } | 415 } |
| 415 | 416 |
| 416 } // namespace content | 417 } // namespace content |
| OLD | NEW |