| 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 <stddef.h> | 7 #include <stddef.h> | 
| 8 | 8 | 
| 9 #include <cctype> | 9 #include <cctype> | 
| 10 | 10 | 
| (...skipping 269 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 280   // ResourceBundle isn't initialized (since we have to use a diferent test | 280   // ResourceBundle isn't initialized (since we have to use a diferent test | 
| 281   // suite implementation than for content_unittests). For browser_tests, this | 281   // suite implementation than for content_unittests). For browser_tests, this | 
| 282   // is already initialized. | 282   // is already initialized. | 
| 283   if (!ui::ResourceBundle::HasSharedInstance()) | 283   if (!ui::ResourceBundle::HasSharedInstance()) | 
| 284     ui::ResourceBundle::InitSharedInstanceWithLocale( | 284     ui::ResourceBundle::InitSharedInstanceWithLocale( | 
| 285         "en-US", NULL, ui::ResourceBundle::DO_NOT_LOAD_COMMON_RESOURCES); | 285         "en-US", NULL, ui::ResourceBundle::DO_NOT_LOAD_COMMON_RESOURCES); | 
| 286 | 286 | 
| 287   compositor_deps_.reset(new FakeCompositorDependencies); | 287   compositor_deps_.reset(new FakeCompositorDependencies); | 
| 288   mock_process_.reset(new MockRenderProcess); | 288   mock_process_.reset(new MockRenderProcess); | 
| 289 | 289 | 
| 290   ViewMsg_New_Params view_params; | 290   mojom::CreateViewParams view_params; | 
| 291   view_params.opener_frame_route_id = MSG_ROUTING_NONE; | 291   view_params.opener_frame_route_id = MSG_ROUTING_NONE; | 
| 292   view_params.window_was_created_with_opener = false; | 292   view_params.window_was_created_with_opener = false; | 
| 293   view_params.renderer_preferences = RendererPreferences(); | 293   view_params.renderer_preferences = RendererPreferences(); | 
| 294   view_params.web_preferences = WebPreferences(); | 294   view_params.web_preferences = WebPreferences(); | 
| 295   view_params.view_id = kRouteId; | 295   view_params.view_id = kRouteId; | 
| 296   view_params.main_frame_routing_id = kMainFrameRouteId; | 296   view_params.main_frame_routing_id = kMainFrameRouteId; | 
| 297   view_params.main_frame_widget_routing_id = kMainFrameWidgetRouteId; | 297   view_params.main_frame_widget_routing_id = kMainFrameWidgetRouteId; | 
| 298   view_params.session_storage_namespace_id = kInvalidSessionStorageNamespaceId; | 298   view_params.session_storage_namespace_id = kInvalidSessionStorageNamespaceId; | 
| 299   view_params.swapped_out = false; | 299   view_params.swapped_out = false; | 
| 300   view_params.replicated_frame_state = FrameReplicationState(); | 300   view_params.replicated_frame_state = FrameReplicationState(); | 
| (...skipping 360 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 661       static_cast<TestRenderFrame*>(impl->GetMainRenderFrame()); | 661       static_cast<TestRenderFrame*>(impl->GetMainRenderFrame()); | 
| 662   frame->Navigate(common_params, StartNavigationParams(), request_params); | 662   frame->Navigate(common_params, StartNavigationParams(), request_params); | 
| 663 | 663 | 
| 664   // The load actually happens asynchronously, so we pump messages to process | 664   // The load actually happens asynchronously, so we pump messages to process | 
| 665   // the pending continuation. | 665   // the pending continuation. | 
| 666   FrameLoadWaiter(frame).Wait(); | 666   FrameLoadWaiter(frame).Wait(); | 
| 667   view_->GetWebView()->updateAllLifecyclePhases(); | 667   view_->GetWebView()->updateAllLifecyclePhases(); | 
| 668 } | 668 } | 
| 669 | 669 | 
| 670 }  // namespace content | 670 }  // namespace content | 
| OLD | NEW | 
|---|