Merge from Chromium at DEPS revision 260458
This commit was generated by merge_to_master.py.
Change-Id: I140fa91b7f09c8efba4424e99ccb87b94a11d022
diff --git a/net/url_request/url_request_http_job.h b/net/url_request/url_request_http_job.h
index 33014e5..95b77c9 100644
--- a/net/url_request/url_request_http_job.h
+++ b/net/url_request/url_request_http_job.h
@@ -122,6 +122,8 @@
HttpRequestHeaders* headers) const OVERRIDE;
virtual int64 GetTotalReceivedBytes() const OVERRIDE;
virtual void DoneReading() OVERRIDE;
+ virtual void DoneReadingRedirectResponse() OVERRIDE;
+
virtual HostPortPair GetSocketAddress() const OVERRIDE;
virtual void NotifyURLRequestDestroyed() OVERRIDE;
@@ -254,6 +256,9 @@
// layers of the network stack.
scoped_refptr<HttpResponseHeaders> override_response_headers_;
+ // The network delegate can mark a URL as safe for redirection.
+ GURL allowed_unsafe_redirect_url_;
+
// Flag used to verify that |this| is not deleted while we are awaiting
// a callback from the NetworkDelegate. Used as a fail-fast mechanism.
// True if we are waiting a callback and