Add RedirectInfo as a redirect parameter to ResourceThrottles.

components/navigation_interception/intercept_navigation_resource_throttle.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 "components/navigation_interception/intercept_navigation_resource_throttle.h"
 
 #include "components/navigation_interception/navigation_params.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/child_process_security_policy.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/resource_context.h"
 #include "content/public/browser/resource_controller.h"
 #include "content/public/browser/resource_request_info.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/referrer.h"
 #include "net/http/http_response_headers.h"
+#include "net/url_request/redirect_info.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_job_factory.h"
 #include "net/url_request/url_request.h"
 #include "ui/base/page_transition_types.h"
 
 using content::BrowserThread;
 using content::ChildProcessSecurityPolicy;
 using ui::PageTransition;
 using content::Referrer;
 using content::RenderProcessHost;
@@ skipping 46 matching lines @@
 InterceptNavigationResourceThrottle::~InterceptNavigationResourceThrottle() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 }
 
 void InterceptNavigationResourceThrottle::WillStartRequest(bool* defer) {
   *defer =
       CheckIfShouldIgnoreNavigation(request_->url(), request_->method(), false);
 }
 
 void InterceptNavigationResourceThrottle::WillRedirectRequest(
-    const GURL& new_url,
+    const net::RedirectInfo& redirect_info,
     bool* defer) {
-  *defer =
-      CheckIfShouldIgnoreNavigation(new_url, GetMethodAfterRedirect(), true);
+  *defer = CheckIfShouldIgnoreNavigation(redirect_info.new_url,
+                                         redirect_info.new_method, true);
 }
 
 const char* InterceptNavigationResourceThrottle::GetNameForLogging() const {
   return "InterceptNavigationResourceThrottle";
 }
 
-std::string InterceptNavigationResourceThrottle::GetMethodAfterRedirect() {
-  net::HttpResponseHeaders* headers = request_->response_headers();
-  if (!headers)
-    return request_->method();
-  // TODO(davidben): Plumb net::RedirectInfo through content::ResourceThrottle
-  // and unexpose net::URLRequest::ComputeMethodForRedirect.
-  return net::URLRequest::ComputeMethodForRedirect(
-             request_->method(), headers->response_code());

[davidben, 2015/02/05 20:44:06]

All that work to remove this one function. :-)

-}
-
 bool InterceptNavigationResourceThrottle::CheckIfShouldIgnoreNavigation(
     const GURL& url,
     const std::string& method,
     bool is_redirect) {
   const ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(request_);
   if (!info)
     return false;
 
   int render_process_id, render_frame_id;
   if (!info->GetAssociatedRenderFrame(&render_process_id, &render_frame_id))
@@ skipping 30 matching lines @@
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   if (should_ignore_navigation) {
     controller()->CancelAndIgnore();
   } else {
     controller()->Resume();
   }
 }
 
 }  // namespace navigation_interception