Support redirectUrl at onHeadersReceived in WebRequest / DWR API

net/url_request/url_request_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shlobj.h>
 #endif
@@ skipping 348 matching lines @@
                                  const CompletionCallback& callback,
                                  GURL* new_url) OVERRIDE;
 
   virtual int OnBeforeSendHeaders(URLRequest* request,
                                   const CompletionCallback& callback,
                                   HttpRequestHeaders* headers) OVERRIDE;
 
   virtual int OnHeadersReceived(
       URLRequest* request,
       const CompletionCallback& callback,
+      GURL* new_url,
       const HttpResponseHeaders* original_response_headers,
       scoped_refptr<HttpResponseHeaders>* override_response_headers) OVERRIDE;
 
   virtual NetworkDelegate::AuthRequiredResponse OnAuthRequired(
       URLRequest* request,
       const AuthChallengeInfo& auth_info,
       const AuthCallback& callback,
       AuthCredentials* credentials) OVERRIDE;
 
   // Resets the callbacks and |stage_blocked_for_callback_|.
@@ skipping 92 matching lines @@
 
 int BlockingNetworkDelegate::OnBeforeSendHeaders(
     URLRequest* request,
     const CompletionCallback& callback,
     HttpRequestHeaders* headers) {
   TestNetworkDelegate::OnBeforeSendHeaders(request, callback, headers);
 
   return MaybeBlockStage(ON_BEFORE_SEND_HEADERS, callback);
 }
 
 int BlockingNetworkDelegate::OnHeadersReceived(

[battre, 2014/02/12 11:54:48]

I think this should have similar logic for redirects as
BlockingNetworkDelegate::OnBeforeURLRequest.

Then there should be a test similar to TEST_F(URLRequestTestHTTP,
NetworkDelegateRedirectRequest). Also you probably need to update
TestNetworkDelegate::OnBeforeRedirect.

     URLRequest* request,
     const CompletionCallback& callback,
+    GURL* new_url,
     const HttpResponseHeaders* original_response_headers,
     scoped_refptr<HttpResponseHeaders>* override_response_headers) {
   TestNetworkDelegate::OnHeadersReceived(
-      request, callback, original_response_headers,
+      request, callback, new_url, original_response_headers,
       override_response_headers);
 
   return MaybeBlockStage(ON_HEADERS_RECEIVED, callback);
 }
 
 NetworkDelegate::AuthRequiredResponse BlockingNetworkDelegate::OnAuthRequired(
     URLRequest* request,
     const AuthChallengeInfo& auth_info,
     const AuthCallback& callback,
     AuthCredentials* credentials) {
@@ skipping 1910 matching lines @@
 class FixedDateNetworkDelegate : public TestNetworkDelegate {
  public:
   explicit FixedDateNetworkDelegate(const std::string& fixed_date)
       : fixed_date_(fixed_date) {}
   virtual ~FixedDateNetworkDelegate() {}
 
   // net::NetworkDelegate implementation
   virtual int OnHeadersReceived(
       net::URLRequest* request,
       const net::CompletionCallback& callback,
+      GURL* new_url,
       const net::HttpResponseHeaders* original_response_headers,
       scoped_refptr<net::HttpResponseHeaders>* override_response_headers)
       OVERRIDE;
 
  private:
   std::string fixed_date_;
 
   DISALLOW_COPY_AND_ASSIGN(FixedDateNetworkDelegate);
 };
 
 int FixedDateNetworkDelegate::OnHeadersReceived(
     net::URLRequest* request,
     const net::CompletionCallback& callback,
+    GURL* new_url,
     const net::HttpResponseHeaders* original_response_headers,
     scoped_refptr<net::HttpResponseHeaders>* override_response_headers) {
   net::HttpResponseHeaders* new_response_headers =
       new net::HttpResponseHeaders(original_response_headers->raw_headers());
 
   new_response_headers->RemoveHeader("Date");
   new_response_headers->AddHeader("Date: " + fixed_date_);
 
   *override_response_headers = new_response_headers;
   return TestNetworkDelegate::OnHeadersReceived(request,
                                                 callback,
+                                                new_url,
                                                 original_response_headers,
                                                 override_response_headers);
 }
 
 // Test that cookie expiration times are adjusted for server/client clock
 // skew and that we handle incorrect timezone specifier "UTC" in HTTP Date
 // headers by defaulting to GMT. (crbug.com/135131)
 TEST_F(URLRequestTest, AcceptClockSkewCookieWithWrongDateTimezone) {
   LocalHttpTestServer test_server;
   ASSERT_TRUE(test_server.Start());
@@ skipping 1459 matching lines @@
   virtual int OnBeforeSendHeaders(URLRequest* request,
                                   const CompletionCallback& callback,
                                   HttpRequestHeaders* headers) OVERRIDE {
     TestNetworkDelegate::OnBeforeSendHeaders(request, callback, headers);
     return RunCallbackAsynchronously(request, callback);
   }
 
   virtual int OnHeadersReceived(
       URLRequest* request,
       const CompletionCallback& callback,
+      GURL* new_url,
       const HttpResponseHeaders* original_response_headers,
       scoped_refptr<HttpResponseHeaders>* override_response_headers) OVERRIDE {
-    TestNetworkDelegate::OnHeadersReceived(request, callback,
+    TestNetworkDelegate::OnHeadersReceived(request, callback, new_url,
                                            original_response_headers,
                                            override_response_headers);
     return RunCallbackAsynchronously(request, callback);
   }
 
   virtual NetworkDelegate::AuthRequiredResponse OnAuthRequired(
       URLRequest* request,
       const AuthChallengeInfo& auth_info,
       const AuthCallback& callback,
       AuthCredentials* credentials) OVERRIDE {
@@ skipping 3659 matching lines @@
 
     EXPECT_FALSE(r.is_pending());
     EXPECT_EQ(1, d->response_started_count());
     EXPECT_FALSE(d->received_data_before_response());
     EXPECT_EQ(d->bytes_received(), static_cast<int>(file_size));
   }
 }
 #endif  // !defined(DISABLE_FTP_SUPPORT)
 
 }  // namespace net