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

content/browser/loader/throttling_resource_handler.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 "content/browser/loader/throttling_resource_handler.h"
 
 #include "content/browser/loader/resource_request_info_impl.h"
 #include "content/public/browser/resource_throttle.h"
 #include "content/public/common/resource_response.h"
 #include "net/url_request/url_request.h"
@@ skipping 13 matching lines @@
     throttles_[i]->set_controller(this);
     // Throttles must have a name, as otherwise, bugs where a throttle fails
     // to resume a request can be very difficult to debug.
     DCHECK(throttles_[i]->GetNameForLogging());
   }
 }
 
 ThrottlingResourceHandler::~ThrottlingResourceHandler() {
 }
 
-bool ThrottlingResourceHandler::OnRequestRedirected(const GURL& new_url,
-                                                    ResourceResponse* response,
-                                                    bool* defer) {
+bool ThrottlingResourceHandler::OnRequestRedirected(
+    const net::RedirectInfo& redirect_info,
+    ResourceResponse* response,
+    bool* defer) {
   DCHECK(!cancelled_by_resource_throttle_);
 
   *defer = false;
   while (next_index_ < throttles_.size()) {
     int index = next_index_;
-    throttles_[index]->WillRedirectRequest(new_url, defer);
+    throttles_[index]->WillRedirectRequest(redirect_info.new_url, defer);
     next_index_++;
     if (cancelled_by_resource_throttle_)
       return false;
     if (*defer) {
       OnRequestDefered(index);
       deferred_stage_ = DEFERRED_REDIRECT;
-      deferred_url_ = new_url;
+      deferred_redirect_ = redirect_info;
       deferred_response_ = response;
       return true;  // Do not cancel.
     }
   }
 
   next_index_ = 0;  // Reset for next time.
 
-  return next_handler_->OnRequestRedirected(new_url, response, defer);
+  return next_handler_->OnRequestRedirected(redirect_info, response, defer);
 }
 
 bool ThrottlingResourceHandler::OnWillStart(const GURL& url, bool* defer) {
   DCHECK(!cancelled_by_resource_throttle_);
 
   *defer = false;
   while (next_index_ < throttles_.size()) {
     int index = next_index_;
     throttles_[index]->WillStartRequest(defer);
     next_index_++;
@@ skipping 124 matching lines @@
   if (!OnBeforeNetworkStart(url, &defer)) {
     controller()->Cancel();
   } else if (!defer) {
     controller()->Resume();
   }
 }
 
 void ThrottlingResourceHandler::ResumeRedirect() {
   DCHECK(!cancelled_by_resource_throttle_);
 
-  GURL new_url = deferred_url_;
-  deferred_url_ = GURL();
+  net::RedirectInfo redirect_info = deferred_redirect_;
+  deferred_redirect_ = net::RedirectInfo();
   scoped_refptr<ResourceResponse> response;
   deferred_response_.swap(response);
 
   bool defer = false;
-  if (!OnRequestRedirected(new_url, response.get(), &defer)) {
+  if (!OnRequestRedirected(redirect_info, response.get(), &defer)) {
     controller()->Cancel();
   } else if (!defer) {
     controller()->Resume();
   }
 }
 
 void ThrottlingResourceHandler::ResumeResponse() {
   DCHECK(!cancelled_by_resource_throttle_);
 
   scoped_refptr<ResourceResponse> response;
   deferred_response_.swap(response);
 
   bool defer = false;
   if (!OnResponseStarted(response.get(), &defer)) {
     controller()->Cancel();
   } else if (!defer) {
     controller()->Resume();
   }
 }
 
 void ThrottlingResourceHandler::OnRequestDefered(int throttle_index) {
   request()->LogBlockedBy(throttles_[throttle_index]->GetNameForLogging());
 }
 
 }  // namespace content