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

Unified Diff: content/browser/frame_host/navigation_handle_impl.cc

Issue 2660403006: Convert RenderViewHostTest to use the new navigation callbacks. (Closed)
Patch Set: Created 3 years, 11 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/frame_host/navigation_handle_impl.cc
diff --git a/content/browser/frame_host/navigation_handle_impl.cc b/content/browser/frame_host/navigation_handle_impl.cc
index fd595cf16216f28e9e72351f1e0307b5b2120af3..e78d675c892ffe04d923cecaccf9ce38f427a887 100644
--- a/content/browser/frame_host/navigation_handle_impl.cc
+++ b/content/browser/frame_host/navigation_handle_impl.cc
@@ -277,6 +277,11 @@ bool NavigationHandleImpl::IsErrorPage() {
return state_ == DID_COMMIT_ERROR_PAGE;
}
+net::HostPortPair NavigationHandleImpl::GetSocketAddress() {
+ DCHECK(state_ == DID_COMMIT || state_ == DID_COMMIT_ERROR_PAGE);
+ return socket_address_;
+}
+
void NavigationHandleImpl::Resume() {
if (state_ != DEFERRING_START && state_ != DEFERRING_REDIRECT &&
state_ != DEFERRING_RESPONSE) {
@@ -580,6 +585,8 @@ void NavigationHandleImpl::DidCommitNavigation(
has_user_gesture_ = (params.gesture == NavigationGestureUser);
transition_ = params.transition;
render_frame_host_ = render_frame_host;
+ base_url_ = params.base_url;
+ socket_address_ = params.socket_address;
// If an error page reloads, net_error_code might be 200 but we still want to
// count it as an error page.

Powered by Google App Engine
This is Rietveld 408576698