Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(68)

Side by Side Diff: content/test/test_render_frame_host.cc

Issue 562603002: Move PageTransition from //content/public/common to //ui/base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « content/test/test_render_frame_host.h ('k') | content/test/test_render_view_host.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_frame_host.h" 5 #include "content/test/test_render_frame_host.h"
6 6
7 #include "content/browser/frame_host/frame_tree.h" 7 #include "content/browser/frame_host/frame_tree.h"
8 #include "content/browser/frame_host/render_frame_host_delegate.h" 8 #include "content/browser/frame_host/render_frame_host_delegate.h"
9 #include "content/common/frame_messages.h" 9 #include "content/common/frame_messages.h"
10 #include "content/public/common/page_transition_types.h"
11 #include "content/test/test_render_view_host.h" 10 #include "content/test/test_render_view_host.h"
12 #include "net/base/load_flags.h" 11 #include "net/base/load_flags.h"
13 #include "third_party/WebKit/public/web/WebPageVisibilityState.h" 12 #include "third_party/WebKit/public/web/WebPageVisibilityState.h"
13 #include "ui/base/page_transition_types.h"
14 14
15 namespace content { 15 namespace content {
16 16
17 TestRenderFrameHostCreationObserver::TestRenderFrameHostCreationObserver( 17 TestRenderFrameHostCreationObserver::TestRenderFrameHostCreationObserver(
18 WebContents* web_contents) 18 WebContents* web_contents)
19 : WebContentsObserver(web_contents), last_created_frame_(NULL) { 19 : WebContentsObserver(web_contents), last_created_frame_(NULL) {
20 } 20 }
21 21
22 TestRenderFrameHostCreationObserver::~TestRenderFrameHostCreationObserver() { 22 TestRenderFrameHostCreationObserver::~TestRenderFrameHostCreationObserver() {
23 } 23 }
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 TestRenderFrameHost* TestRenderFrameHost::AppendChild( 59 TestRenderFrameHost* TestRenderFrameHost::AppendChild(
60 const std::string& frame_name) { 60 const std::string& frame_name) {
61 OnCreateChildFrame(GetProcess()->GetNextRoutingID(), frame_name); 61 OnCreateChildFrame(GetProcess()->GetNextRoutingID(), frame_name);
62 return static_cast<TestRenderFrameHost*>( 62 return static_cast<TestRenderFrameHost*>(
63 child_creation_observer_.last_created_frame()); 63 child_creation_observer_.last_created_frame());
64 } 64 }
65 65
66 void TestRenderFrameHost::SendNavigateWithTransition( 66 void TestRenderFrameHost::SendNavigateWithTransition(
67 int page_id, 67 int page_id,
68 const GURL& url, 68 const GURL& url,
69 PageTransition transition) { 69 ui::PageTransition transition) {
70 SendNavigateWithTransitionAndResponseCode(page_id, url, transition, 200); 70 SendNavigateWithTransitionAndResponseCode(page_id, url, transition, 200);
71 } 71 }
72 72
73 void TestRenderFrameHost::SendNavigate(int page_id, const GURL& url) { 73 void TestRenderFrameHost::SendNavigate(int page_id, const GURL& url) {
74 SendNavigateWithTransition(page_id, url, PAGE_TRANSITION_LINK); 74 SendNavigateWithTransition(page_id, url, ui::PAGE_TRANSITION_LINK);
75 } 75 }
76 76
77 void TestRenderFrameHost::SendFailedNavigate(int page_id, const GURL& url) { 77 void TestRenderFrameHost::SendFailedNavigate(int page_id, const GURL& url) {
78 SendNavigateWithTransitionAndResponseCode( 78 SendNavigateWithTransitionAndResponseCode(
79 page_id, url, PAGE_TRANSITION_RELOAD, 500); 79 page_id, url, ui::PAGE_TRANSITION_RELOAD, 500);
80 } 80 }
81 81
82 void TestRenderFrameHost::SendNavigateWithTransitionAndResponseCode( 82 void TestRenderFrameHost::SendNavigateWithTransitionAndResponseCode(
83 int page_id, 83 int page_id,
84 const GURL& url, PageTransition transition, 84 const GURL& url, ui::PageTransition transition,
85 int response_code) { 85 int response_code) {
86 // DidStartProvisionalLoad may delete the pending entry that holds |url|, 86 // DidStartProvisionalLoad may delete the pending entry that holds |url|,
87 // so we keep a copy of it to use in SendNavigateWithParameters. 87 // so we keep a copy of it to use in SendNavigateWithParameters.
88 GURL url_copy(url); 88 GURL url_copy(url);
89 OnDidStartProvisionalLoadForFrame(url_copy, false); 89 OnDidStartProvisionalLoadForFrame(url_copy, false);
90 SendNavigateWithParameters(page_id, url_copy, transition, url_copy, 90 SendNavigateWithParameters(page_id, url_copy, transition, url_copy,
91 response_code, 0, std::vector<GURL>()); 91 response_code, 0, std::vector<GURL>());
92 } 92 }
93 93
94 void TestRenderFrameHost::SendNavigateWithOriginalRequestURL( 94 void TestRenderFrameHost::SendNavigateWithOriginalRequestURL(
95 int page_id, 95 int page_id,
96 const GURL& url, 96 const GURL& url,
97 const GURL& original_request_url) { 97 const GURL& original_request_url) {
98 OnDidStartProvisionalLoadForFrame(url, false); 98 OnDidStartProvisionalLoadForFrame(url, false);
99 SendNavigateWithParameters(page_id, url, PAGE_TRANSITION_LINK, 99 SendNavigateWithParameters(page_id, url, ui::PAGE_TRANSITION_LINK,
100 original_request_url, 200, 0, std::vector<GURL>()); 100 original_request_url, 200, 0, std::vector<GURL>());
101 } 101 }
102 102
103 void TestRenderFrameHost::SendNavigateWithFile( 103 void TestRenderFrameHost::SendNavigateWithFile(
104 int page_id, 104 int page_id,
105 const GURL& url, 105 const GURL& url,
106 const base::FilePath& file_path) { 106 const base::FilePath& file_path) {
107 SendNavigateWithParameters(page_id, url, PAGE_TRANSITION_LINK, url, 200, 107 SendNavigateWithParameters(page_id, url, ui::PAGE_TRANSITION_LINK, url, 200,
108 &file_path, std::vector<GURL>()); 108 &file_path, std::vector<GURL>());
109 } 109 }
110 110
111 void TestRenderFrameHost::SendNavigateWithParams( 111 void TestRenderFrameHost::SendNavigateWithParams(
112 FrameHostMsg_DidCommitProvisionalLoad_Params* params) { 112 FrameHostMsg_DidCommitProvisionalLoad_Params* params) {
113 FrameHostMsg_DidCommitProvisionalLoad msg(GetRoutingID(), *params); 113 FrameHostMsg_DidCommitProvisionalLoad msg(GetRoutingID(), *params);
114 OnDidCommitProvisionalLoad(msg); 114 OnDidCommitProvisionalLoad(msg);
115 } 115 }
116 116
117 void TestRenderFrameHost::SendNavigateWithRedirects( 117 void TestRenderFrameHost::SendNavigateWithRedirects(
118 int page_id, 118 int page_id,
119 const GURL& url, 119 const GURL& url,
120 const std::vector<GURL>& redirects) { 120 const std::vector<GURL>& redirects) {
121 SendNavigateWithParameters( 121 SendNavigateWithParameters(
122 page_id, url, PAGE_TRANSITION_LINK, url, 200, 0, redirects); 122 page_id, url, ui::PAGE_TRANSITION_LINK, url, 200, 0, redirects);
123 } 123 }
124 124
125 void TestRenderFrameHost::SendNavigateWithParameters( 125 void TestRenderFrameHost::SendNavigateWithParameters(
126 int page_id, 126 int page_id,
127 const GURL& url, 127 const GURL& url,
128 PageTransition transition, 128 ui::PageTransition transition,
129 const GURL& original_request_url, 129 const GURL& original_request_url,
130 int response_code, 130 int response_code,
131 const base::FilePath* file_path_for_history_item, 131 const base::FilePath* file_path_for_history_item,
132 const std::vector<GURL>& redirects) { 132 const std::vector<GURL>& redirects) {
133 FrameHostMsg_DidCommitProvisionalLoad_Params params; 133 FrameHostMsg_DidCommitProvisionalLoad_Params params;
134 params.page_id = page_id; 134 params.page_id = page_id;
135 params.url = url; 135 params.url = url;
136 params.referrer = Referrer(); 136 params.referrer = Referrer();
137 params.transition = transition; 137 params.transition = transition;
138 params.redirects = redirects; 138 params.redirects = redirects;
139 params.should_update_history = true; 139 params.should_update_history = true;
140 params.searchable_form_url = GURL(); 140 params.searchable_form_url = GURL();
141 params.searchable_form_encoding = std::string(); 141 params.searchable_form_encoding = std::string();
142 params.security_info = std::string(); 142 params.security_info = std::string();
143 params.gesture = NavigationGestureUser; 143 params.gesture = NavigationGestureUser;
144 params.contents_mime_type = contents_mime_type_; 144 params.contents_mime_type = contents_mime_type_;
145 params.is_post = false; 145 params.is_post = false;
146 params.http_status_code = response_code; 146 params.http_status_code = response_code;
147 params.socket_address.set_host("2001:db8::1"); 147 params.socket_address.set_host("2001:db8::1");
148 params.socket_address.set_port(80); 148 params.socket_address.set_port(80);
149 params.history_list_was_cleared = simulate_history_list_was_cleared_; 149 params.history_list_was_cleared = simulate_history_list_was_cleared_;
150 params.original_request_url = original_request_url; 150 params.original_request_url = original_request_url;
151 151
152 url::Replacements<char> replacements; 152 url::Replacements<char> replacements;
153 replacements.ClearRef(); 153 replacements.ClearRef();
154 params.was_within_same_page = transition != PAGE_TRANSITION_RELOAD && 154 params.was_within_same_page = transition != ui::PAGE_TRANSITION_RELOAD &&
155 transition != PAGE_TRANSITION_TYPED && 155 transition != ui::PAGE_TRANSITION_TYPED &&
156 url.ReplaceComponents(replacements) == 156 url.ReplaceComponents(replacements) ==
157 GetLastCommittedURL().ReplaceComponents(replacements); 157 GetLastCommittedURL().ReplaceComponents(replacements);
158 158
159 params.page_state = PageState::CreateForTesting( 159 params.page_state = PageState::CreateForTesting(
160 url, 160 url,
161 false, 161 false,
162 file_path_for_history_item ? "data" : NULL, 162 file_path_for_history_item ? "data" : NULL,
163 file_path_for_history_item); 163 file_path_for_history_item);
164 164
165 FrameHostMsg_DidCommitProvisionalLoad msg(GetRoutingID(), params); 165 FrameHostMsg_DidCommitProvisionalLoad msg(GetRoutingID(), params);
166 OnDidCommitProvisionalLoad(msg); 166 OnDidCommitProvisionalLoad(msg);
167 } 167 }
168 168
169 void TestRenderFrameHost::SendBeginNavigationWithURL(const GURL& url) { 169 void TestRenderFrameHost::SendBeginNavigationWithURL(const GURL& url) {
170 FrameHostMsg_BeginNavigation_Params params; 170 FrameHostMsg_BeginNavigation_Params params;
171 params.method = "GET"; 171 params.method = "GET";
172 params.url = url; 172 params.url = url;
173 params.referrer = Referrer(GURL(), blink::WebReferrerPolicyDefault); 173 params.referrer = Referrer(GURL(), blink::WebReferrerPolicyDefault);
174 params.load_flags = net::LOAD_NORMAL; 174 params.load_flags = net::LOAD_NORMAL;
175 params.has_user_gesture = false; 175 params.has_user_gesture = false;
176 params.transition_type = PAGE_TRANSITION_LINK; 176 params.transition_type = ui::PAGE_TRANSITION_LINK;
177 params.should_replace_current_entry = false; 177 params.should_replace_current_entry = false;
178 params.allow_download = true; 178 params.allow_download = true;
179 OnBeginNavigation(params); 179 OnBeginNavigation(params);
180 } 180 }
181 181
182 void TestRenderFrameHost::DidDisownOpener() { 182 void TestRenderFrameHost::DidDisownOpener() {
183 OnDidDisownOpener(); 183 OnDidDisownOpener();
184 } 184 }
185 185
186 } // namespace content 186 } // namespace content
OLDNEW
« no previous file with comments | « content/test/test_render_frame_host.h ('k') | content/test/test_render_view_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698