| 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/test/test_render_view_host.h" | 5 #include "content/test/test_render_view_host.h" |
| 6 | 6 |
| 7 #include "base/memory/scoped_ptr.h" | 7 #include "base/memory/scoped_ptr.h" |
| 8 #include "content/browser/dom_storage/dom_storage_context_wrapper.h" | 8 #include "content/browser/dom_storage/dom_storage_context_wrapper.h" |
| 9 #include "content/browser/dom_storage/session_storage_namespace_impl.h" | 9 #include "content/browser/dom_storage/session_storage_namespace_impl.h" |
| 10 #include "content/browser/loader/resource_dispatcher_host_impl.h" | 10 #include "content/browser/loader/resource_dispatcher_host_impl.h" |
| 11 #include "content/browser/site_instance_impl.h" | 11 #include "content/browser/site_instance_impl.h" |
| 12 #include "content/common/dom_storage/dom_storage_types.h" | 12 #include "content/common/dom_storage/dom_storage_types.h" |
| 13 #include "content/common/frame_messages.h" | 13 #include "content/common/frame_messages.h" |
| 14 #include "content/common/view_messages.h" | 14 #include "content/common/view_messages.h" |
| 15 #include "content/public/browser/browser_context.h" | 15 #include "content/public/browser/browser_context.h" |
| 16 #include "content/public/browser/browser_thread.h" | 16 #include "content/public/browser/browser_thread.h" |
| 17 #include "content/public/browser/navigation_controller.h" | 17 #include "content/public/browser/navigation_controller.h" |
| 18 #include "content/public/browser/storage_partition.h" | 18 #include "content/public/browser/storage_partition.h" |
| 19 #include "content/public/common/content_client.h" | 19 #include "content/public/common/content_client.h" |
| 20 #include "content/public/common/page_state.h" | 20 #include "content/public/common/page_state.h" |
| 21 #include "content/public/common/web_preferences.h" | 21 #include "content/public/common/web_preferences.h" |
| 22 #include "content/test/test_render_frame_host.h" | 22 #include "content/test/test_render_frame_host.h" |
| 23 #include "content/test/test_web_contents.h" | 23 #include "content/test/test_web_contents.h" |
| 24 #include "media/base/video_frame.h" | 24 #include "media/base/video_frame.h" |
| 25 #include "ui/gfx/rect.h" | 25 #include "ui/gfx/rect.h" |
| 26 | 26 |
| 27 namespace content { | 27 namespace content { |
| 28 | 28 |
| 29 void InitNavigateParams(FrameHostMsg_DidCommitProvisionalLoad_Params* params, | 29 void InitNavigateParams(FrameHostMsg_DidCommitProvisionalLoad_Params* params, |
| 30 int page_id, | |
| 31 const GURL& url, | 30 const GURL& url, |
| 32 ui::PageTransition transition) { | 31 ui::PageTransition transition) { |
| 33 params->page_id = page_id; | |
| 34 params->url = url; | 32 params->url = url; |
| 35 params->referrer = Referrer(); | 33 params->referrer = Referrer(); |
| 36 params->transition = transition; | 34 params->transition = transition; |
| 37 params->redirects = std::vector<GURL>(); | 35 params->redirects = std::vector<GURL>(); |
| 38 params->should_update_history = false; | 36 params->should_update_history = false; |
| 39 params->searchable_form_url = GURL(); | 37 params->searchable_form_url = GURL(); |
| 40 params->searchable_form_encoding = std::string(); | 38 params->searchable_form_encoding = std::string(); |
| 41 params->security_info = std::string(); | 39 params->security_info = std::string(); |
| 42 params->gesture = NavigationGestureUser; | 40 params->gesture = NavigationGestureUser; |
| 43 params->was_within_same_page = false; | 41 params->was_within_same_page = false; |
| (...skipping 251 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 295 | 293 |
| 296 TestRenderFrameHost* RenderViewHostImplTestHarness::main_test_rfh() { | 294 TestRenderFrameHost* RenderViewHostImplTestHarness::main_test_rfh() { |
| 297 return contents()->GetMainFrame(); | 295 return contents()->GetMainFrame(); |
| 298 } | 296 } |
| 299 | 297 |
| 300 TestWebContents* RenderViewHostImplTestHarness::contents() { | 298 TestWebContents* RenderViewHostImplTestHarness::contents() { |
| 301 return static_cast<TestWebContents*>(web_contents()); | 299 return static_cast<TestWebContents*>(web_contents()); |
| 302 } | 300 } |
| 303 | 301 |
| 304 } // namespace content | 302 } // namespace content |
| OLD | NEW |