Plumb redirect info out of net, through content, and into child processes.

content/child/resource_dispatcher_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 <string>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/shared_memory.h"
@@ skipping 41 matching lines @@
          received_response_(false),
          total_encoded_data_length_(0),
          total_downloaded_data_length_(0),
          complete_(false),
          bridge_(bridge) {
   }
 
   virtual void OnUploadProgress(uint64 position, uint64 size) OVERRIDE {
   }
 
-  virtual bool OnReceivedRedirect(const GURL& new_url,
-                                  const GURL& new_first_party_for_cookies,
+  virtual bool OnReceivedRedirect(const net::RedirectInfo& redirect_info,
                                   const ResourceResponseInfo& info) OVERRIDE {
     ++seen_redirects_;
     if (defer_on_redirect_)
       bridge_->SetDefersLoading(true);
     return follow_redirects_;
   }
 
   virtual void OnReceivedResponse(const ResourceResponseInfo& info) OVERRIDE {
     EXPECT_FALSE(received_response_);
     received_response_ = true;
@@ skipping 171 matching lines @@
     EXPECT_EQ(expected_request_id, args.a);
     message_queue_.erase(message_queue_.begin());
   }
 
   void NotifyReceivedRedirect(int request_id) {
     ResourceResponseHead head;
     std::string raw_headers(kTestRedirectHeaders);
     std::replace(raw_headers.begin(), raw_headers.end(), '\n', '\0');
     head.headers = new net::HttpResponseHeaders(raw_headers);
     head.error_code = net::OK;
+    net::RedirectInfo redirect_info;
+    redirect_info.status_code = 302;
+    redirect_info.new_method = "GET";
+    redirect_info.new_url = GURL(kTestPageUrl);
+    redirect_info.new_first_party_for_cookies = GURL(kTestPageUrl);
     EXPECT_EQ(true, dispatcher_.OnMessageReceived(
-        ResourceMsg_ReceivedRedirect(request_id, GURL(kTestPageUrl),
-                                     GURL(kTestPageUrl), head)));
+        ResourceMsg_ReceivedRedirect(request_id, redirect_info, head)));
   }
 
   void NotifyReceivedResponse(int request_id) {
     ResourceResponseHead head;
     std::string raw_headers(kTestPageHeaders);
     std::replace(raw_headers.begin(), raw_headers.end(), '\n', '\0');
     head.headers = new net::HttpResponseHeaders(raw_headers);
     head.mime_type = kTestPageMimeType;
     head.charset = kTestPageCharset;
     head.error_code = net::OK;
@@ skipping 447 matching lines @@
     bridge->Start(this);
 
     dispatcher()->OnMessageReceived(
         ResourceMsg_ReceivedResponse(0, response_head));
   }
 
   // RequestPeer methods.
   virtual void OnUploadProgress(uint64 position, uint64 size) OVERRIDE {
   }
 
-  virtual bool OnReceivedRedirect(const GURL& new_url,
-                                  const GURL& new_first_party_for_cookies,
+  virtual bool OnReceivedRedirect(const net::RedirectInfo& redirect_info,
                                   const ResourceResponseInfo& info) OVERRIDE {
     return true;
   }
 
   virtual void OnReceivedResponse(const ResourceResponseInfo& info) OVERRIDE {
     response_info_ = info;
   }
 
   virtual void OnDownloadedData(int len, int encoded_data_length) OVERRIDE {
   }
@@ skipping 57 matching lines @@
   response_head.error_code = net::OK;
 
   PerformTest(response_head);
 
   EXPECT_EQ(base::TimeTicks(), response_info().load_timing.request_start);
   EXPECT_EQ(base::TimeTicks(),
             response_info().load_timing.connect_timing.dns_start);
 }
 
 }  // namespace content