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

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

Issue 2741313002: Renamed WasWithinSamePage to WasWithinSameDocument. (Closed)
Patch Set: Addressed review comments Created 3 years, 9 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_web_contents.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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_web_contents.h" 5 #include "content/test/test_web_contents.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "content/browser/browser_url_handler_impl.h" 9 #include "content/browser/browser_url_handler_impl.h"
10 #include "content/browser/frame_host/cross_process_frame_connector.h" 10 #include "content/browser/frame_host/cross_process_frame_connector.h"
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 transition, false, -1, -1); 124 transition, false, -1, -1);
125 } 125 }
126 126
127 void TestWebContents::TestDidNavigateWithSequenceNumber( 127 void TestWebContents::TestDidNavigateWithSequenceNumber(
128 RenderFrameHost* render_frame_host, 128 RenderFrameHost* render_frame_host,
129 int nav_entry_id, 129 int nav_entry_id,
130 bool did_create_new_entry, 130 bool did_create_new_entry,
131 const GURL& url, 131 const GURL& url,
132 const Referrer& referrer, 132 const Referrer& referrer,
133 ui::PageTransition transition, 133 ui::PageTransition transition,
134 bool was_within_same_page, 134 bool was_within_same_document,
135 int item_sequence_number, 135 int item_sequence_number,
136 int document_sequence_number) { 136 int document_sequence_number) {
137 TestRenderFrameHost* rfh = 137 TestRenderFrameHost* rfh =
138 static_cast<TestRenderFrameHost*>(render_frame_host); 138 static_cast<TestRenderFrameHost*>(render_frame_host);
139 rfh->InitializeRenderFrameIfNeeded(); 139 rfh->InitializeRenderFrameIfNeeded();
140 140
141 if (!rfh->is_loading()) 141 if (!rfh->is_loading())
142 rfh->SimulateNavigationStart(url); 142 rfh->SimulateNavigationStart(url);
143 143
144 FrameHostMsg_DidCommitProvisionalLoad_Params params; 144 FrameHostMsg_DidCommitProvisionalLoad_Params params;
145 145
146 params.nav_entry_id = nav_entry_id; 146 params.nav_entry_id = nav_entry_id;
147 params.frame_unique_name = std::string(); 147 params.frame_unique_name = std::string();
148 params.item_sequence_number = item_sequence_number; 148 params.item_sequence_number = item_sequence_number;
149 params.document_sequence_number = document_sequence_number; 149 params.document_sequence_number = document_sequence_number;
150 params.url = url; 150 params.url = url;
151 params.base_url = GURL(); 151 params.base_url = GURL();
152 params.referrer = referrer; 152 params.referrer = referrer;
153 params.transition = transition; 153 params.transition = transition;
154 params.redirects = std::vector<GURL>(); 154 params.redirects = std::vector<GURL>();
155 params.should_update_history = true; 155 params.should_update_history = true;
156 params.contents_mime_type = std::string("text/html"); 156 params.contents_mime_type = std::string("text/html");
157 params.socket_address = net::HostPortPair(); 157 params.socket_address = net::HostPortPair();
158 params.intended_as_new_entry = did_create_new_entry; 158 params.intended_as_new_entry = did_create_new_entry;
159 params.did_create_new_entry = did_create_new_entry; 159 params.did_create_new_entry = did_create_new_entry;
160 params.should_replace_current_entry = false; 160 params.should_replace_current_entry = false;
161 params.gesture = NavigationGestureUser; 161 params.gesture = NavigationGestureUser;
162 params.method = "GET"; 162 params.method = "GET";
163 params.post_id = 0; 163 params.post_id = 0;
164 params.was_within_same_page = was_within_same_page; 164 params.was_within_same_document = was_within_same_document;
165 params.http_status_code = 200; 165 params.http_status_code = 200;
166 params.url_is_unreachable = false; 166 params.url_is_unreachable = false;
167 if (item_sequence_number != -1 && document_sequence_number != -1) { 167 if (item_sequence_number != -1 && document_sequence_number != -1) {
168 params.page_state = PageState::CreateForTestingWithSequenceNumbers( 168 params.page_state = PageState::CreateForTestingWithSequenceNumbers(
169 url, item_sequence_number, document_sequence_number); 169 url, item_sequence_number, document_sequence_number);
170 } else { 170 } else {
171 params.page_state = PageState::CreateFromURL(url); 171 params.page_state = PageState::CreateFromURL(url);
172 } 172 }
173 params.original_request_url = GURL(); 173 params.original_request_url = GURL();
174 params.is_overriding_user_agent = false; 174 params.is_overriding_user_agent = false;
(...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after
401 int route_id) { 401 int route_id) {
402 } 402 }
403 403
404 void TestWebContents::SaveFrameWithHeaders(const GURL& url, 404 void TestWebContents::SaveFrameWithHeaders(const GURL& url,
405 const Referrer& referrer, 405 const Referrer& referrer,
406 const std::string& headers) { 406 const std::string& headers) {
407 save_frame_headers_ = headers; 407 save_frame_headers_ = headers;
408 } 408 }
409 409
410 } // namespace content 410 } // namespace content
OLDNEW
« no previous file with comments | « content/test/test_web_contents.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698