Chromium Code Reviews| Index: net/url_request/url_request_unittest.cc |
| diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc |
| index c44b1a60a6627a295aa51072567fb5209eacf3b2..b77ca8e8e6a6cbc4633f35980f9205cfb01ac0bf 100644 |
| --- a/net/url_request/url_request_unittest.cc |
| +++ b/net/url_request/url_request_unittest.cc |
| @@ -4078,7 +4078,7 @@ class AsyncLoggingUrlRequestDelegate : public TestDelegate { |
| // URLRequest::Delegate implementation: |
| void virtual OnReceivedRedirect(URLRequest* request, |
| - const GURL& new_url, |
| + const RedirectInfo& redirect_info, |
| bool* defer_redirect) OVERRIDE { |
| *defer_redirect = true; |
| AsyncDelegateLogger::Run( |
| @@ -4088,7 +4088,7 @@ class AsyncLoggingUrlRequestDelegate : public TestDelegate { |
| LOAD_STATE_WAITING_FOR_DELEGATE, |
| base::Bind( |
| &AsyncLoggingUrlRequestDelegate::OnReceivedRedirectLoggingComplete, |
| - base::Unretained(this), request, new_url)); |
| + base::Unretained(this), request, redirect_info)); |
| } |
| virtual void OnResponseStarted(URLRequest* request) OVERRIDE { |
| @@ -4116,9 +4116,9 @@ class AsyncLoggingUrlRequestDelegate : public TestDelegate { |
| private: |
| void OnReceivedRedirectLoggingComplete(URLRequest* request, |
| - const GURL& new_url) { |
| + const RedirectInfo& redirect_info) { |
| bool defer_redirect = false; |
| - TestDelegate::OnReceivedRedirect(request, new_url, &defer_redirect); |
| + TestDelegate::OnReceivedRedirect(request, redirect_info, &defer_redirect); |
| // FollowDeferredRedirect should not be called after cancellation. |
| if (cancel_stage_ == CANCEL_ON_RECEIVED_REDIRECT) |
| return; |
| @@ -4577,9 +4577,9 @@ const char kExtraValue[] = "fubar"; |
| class RedirectWithAdditionalHeadersDelegate : public TestDelegate { |
| virtual void OnReceivedRedirect(net::URLRequest* request, |
| - const GURL& new_url, |
| + const RedirectInfo& redirect_info, |
| bool* defer_redirect) OVERRIDE { |
| - TestDelegate::OnReceivedRedirect(request, new_url, defer_redirect); |
| + TestDelegate::OnReceivedRedirect(request, redirect_info, defer_redirect); |
| request->SetExtraRequestHeaderByName(kExtraHeader, kExtraValue, false); |
| } |
| }; |
| @@ -4613,9 +4613,9 @@ const char kExtraHeaderToRemove[] = "To-Be-Removed"; |
| class RedirectWithHeaderRemovalDelegate : public TestDelegate { |
| virtual void OnReceivedRedirect(net::URLRequest* request, |
|
mmenke
2014/07/17 16:55:09
While you're here, mind getting rid of these net::
davidben
2014/07/17 22:03:55
Done.
|
| - const GURL& new_url, |
| - bool* defer_redirect) OVERRIDE { |
| - TestDelegate::OnReceivedRedirect(request, new_url, defer_redirect); |
| + const RedirectInfo& redirect_info, |
| + bool* defer_redirect) OVERRIDE { |
| + TestDelegate::OnReceivedRedirect(request, redirect_info, defer_redirect); |
| request->RemoveRequestHeaderByName(kExtraHeaderToRemove); |
| } |
| }; |