| Index: content/browser/loader/async_resource_handler.cc
|
| diff --git a/content/browser/loader/async_resource_handler.cc b/content/browser/loader/async_resource_handler.cc
|
| index 69e831bd29849f323538c65c841323dbed1be4f4..5e04120f10ab5503d6f84926a3fb37fa81f9ca5f 100644
|
| --- a/content/browser/loader/async_resource_handler.cc
|
| +++ b/content/browser/loader/async_resource_handler.cc
|
| @@ -29,6 +29,7 @@
|
| #include "net/base/load_flags.h"
|
| #include "net/base/net_log.h"
|
| #include "net/base/net_util.h"
|
| +#include "net/url_request/redirect_info.h"
|
|
|
| using base::TimeTicks;
|
|
|
| @@ -134,9 +135,10 @@ bool AsyncResourceHandler::OnUploadProgress(uint64 position,
|
| new ResourceMsg_UploadProgress(GetRequestID(), position, size));
|
| }
|
|
|
| -bool AsyncResourceHandler::OnRequestRedirected(const GURL& new_url,
|
| - ResourceResponse* response,
|
| - bool* defer) {
|
| +bool AsyncResourceHandler::OnRequestRedirected(
|
| + const net::RedirectInfo& redirect_info,
|
| + ResourceResponse* response,
|
| + bool* defer) {
|
| const ResourceRequestInfoImpl* info = GetRequestInfo();
|
| if (!info->filter())
|
| return false;
|
| @@ -146,7 +148,7 @@ bool AsyncResourceHandler::OnRequestRedirected(const GURL& new_url,
|
|
|
| if (rdh_->delegate()) {
|
| rdh_->delegate()->OnRequestRedirected(
|
| - new_url, request(), info->GetContext(), response);
|
| + redirect_info.url, request(), info->GetContext(), response);
|
| }
|
|
|
| DevToolsNetLogObserver::PopulateResponseInfo(request(), response);
|
| @@ -159,8 +161,7 @@ bool AsyncResourceHandler::OnRequestRedirected(const GURL& new_url,
|
| // and hopefully those will eventually all be owned by the browser. It's
|
| // possible this is still needed while renderer-owned ones exist.
|
| return info->filter()->Send(new ResourceMsg_ReceivedRedirect(
|
| - GetRequestID(), new_url, request()->first_party_for_cookies(),
|
| - response->head));
|
| + GetRequestID(), redirect_info, response->head));
|
| }
|
|
|
| bool AsyncResourceHandler::OnResponseStarted(ResourceResponse* response,
|
|
|