OLD | NEW |
1 | 1 |
2 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 2 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
3 // Use of this source code is governed by a BSD-style license that can be | 3 // Use of this source code is governed by a BSD-style license that can be |
4 // found in the LICENSE file. | 4 // found in the LICENSE file. |
5 | 5 |
6 #include "content/browser/browser_url_handler.h" | 6 #include "content/browser/browser_url_handler.h" |
7 #include "content/browser/renderer_host/test_backing_store.h" | 7 #include "content/browser/renderer_host/test_backing_store.h" |
8 #include "content/browser/renderer_host/test_render_view_host.h" | 8 #include "content/browser/renderer_host/test_render_view_host.h" |
9 #include "content/browser/site_instance.h" | 9 #include "content/browser/site_instance.h" |
10 #include "content/browser/tab_contents/navigation_controller.h" | 10 #include "content/browser/tab_contents/navigation_controller.h" |
11 #include "content/browser/tab_contents/test_tab_contents.h" | 11 #include "content/browser/tab_contents/test_tab_contents.h" |
12 #include "content/common/dom_storage_common.h" | 12 #include "content/common/dom_storage_common.h" |
13 #include "content/common/view_messages.h" | 13 #include "content/common/view_messages.h" |
14 #include "content/public/common/content_client.h" | 14 #include "content/public/common/content_client.h" |
15 #include "content/test/test_browser_context.h" | 15 #include "content/test/test_browser_context.h" |
16 #include "ui/gfx/rect.h" | 16 #include "ui/gfx/rect.h" |
17 #include "webkit/glue/webkit_glue.h" | 17 #include "webkit/glue/webkit_glue.h" |
18 #include "webkit/glue/webpreferences.h" | 18 #include "webkit/glue/webpreferences.h" |
19 #include "webkit/glue/password_form.h" | 19 #include "webkit/glue/password_form.h" |
20 | 20 |
21 using webkit_glue::PasswordForm; | 21 using webkit_glue::PasswordForm; |
22 | 22 |
23 void InitNavigateParams(ViewHostMsg_FrameNavigate_Params* params, | 23 void InitNavigateParams(ViewHostMsg_FrameNavigate_Params* params, |
24 int page_id, | 24 int page_id, |
25 const GURL& url, | 25 const GURL& url, |
26 content::PageTransition transition) { | 26 content::PageTransition transition) { |
27 params->page_id = page_id; | 27 params->page_id = page_id; |
28 params->url = url; | 28 params->url = url; |
29 params->referrer = GURL(); | 29 params->referrer = content::Referrer(); |
30 params->transition = transition; | 30 params->transition = transition; |
31 params->redirects = std::vector<GURL>(); | 31 params->redirects = std::vector<GURL>(); |
32 params->should_update_history = false; | 32 params->should_update_history = false; |
33 params->searchable_form_url = GURL(); | 33 params->searchable_form_url = GURL(); |
34 params->searchable_form_encoding = std::string(); | 34 params->searchable_form_encoding = std::string(); |
35 params->password_form = PasswordForm(); | 35 params->password_form = PasswordForm(); |
36 params->security_info = std::string(); | 36 params->security_info = std::string(); |
37 params->gesture = NavigationGestureUser; | 37 params->gesture = NavigationGestureUser; |
38 params->was_within_same_page = false; | 38 params->was_within_same_page = false; |
39 params->is_post = false; | 39 params->is_post = false; |
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
80 void TestRenderViewHost::SendNavigate(int page_id, const GURL& url) { | 80 void TestRenderViewHost::SendNavigate(int page_id, const GURL& url) { |
81 SendNavigateWithTransition(page_id, url, content::PAGE_TRANSITION_LINK); | 81 SendNavigateWithTransition(page_id, url, content::PAGE_TRANSITION_LINK); |
82 } | 82 } |
83 | 83 |
84 void TestRenderViewHost::SendNavigateWithTransition( | 84 void TestRenderViewHost::SendNavigateWithTransition( |
85 int page_id, const GURL& url, content::PageTransition transition) { | 85 int page_id, const GURL& url, content::PageTransition transition) { |
86 ViewHostMsg_FrameNavigate_Params params; | 86 ViewHostMsg_FrameNavigate_Params params; |
87 | 87 |
88 params.page_id = page_id; | 88 params.page_id = page_id; |
89 params.url = url; | 89 params.url = url; |
90 params.referrer = GURL(); | 90 params.referrer = content::Referrer(); |
91 params.transition = transition; | 91 params.transition = transition; |
92 params.redirects = std::vector<GURL>(); | 92 params.redirects = std::vector<GURL>(); |
93 params.should_update_history = true; | 93 params.should_update_history = true; |
94 params.searchable_form_url = GURL(); | 94 params.searchable_form_url = GURL(); |
95 params.searchable_form_encoding = std::string(); | 95 params.searchable_form_encoding = std::string(); |
96 params.password_form = PasswordForm(); | 96 params.password_form = PasswordForm(); |
97 params.security_info = std::string(); | 97 params.security_info = std::string(); |
98 params.gesture = NavigationGestureUser; | 98 params.gesture = NavigationGestureUser; |
99 params.contents_mime_type = contents_mime_type_; | 99 params.contents_mime_type = contents_mime_type_; |
100 params.is_post = false; | 100 params.is_post = false; |
(...skipping 262 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
363 SetContents(NULL); | 363 SetContents(NULL); |
364 | 364 |
365 // Make sure that we flush any messages related to TabContents destruction | 365 // Make sure that we flush any messages related to TabContents destruction |
366 // before we destroy the browser context. | 366 // before we destroy the browser context. |
367 MessageLoop::current()->RunAllPending(); | 367 MessageLoop::current()->RunAllPending(); |
368 | 368 |
369 // Release the browser context on the UI thread. | 369 // Release the browser context on the UI thread. |
370 message_loop_.DeleteSoon(FROM_HERE, browser_context_.release()); | 370 message_loop_.DeleteSoon(FROM_HERE, browser_context_.release()); |
371 message_loop_.RunAllPending(); | 371 message_loop_.RunAllPending(); |
372 } | 372 } |
OLD | NEW |