Add RedirectInfo as a redirect parameter to ResourceThrottles.

components/navigation_interception/intercept_navigation_resource_throttle_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 "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/run_loop.h"
 #include "base/synchronization/waitable_event.h"
 #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/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_dispatcher_host.h"
 #include "content/public/browser/resource_dispatcher_host_delegate.h"
 #include "content/public/browser/resource_request_info.h"
 #include "content/public/browser/resource_throttle.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/test/mock_resource_context.h"
 #include "content/public/test/test_renderer_host.h"
 #include "net/base/request_priority.h"
 #include "net/http/http_response_headers.h"
 #include "net/http/http_response_info.h"
+#include "net/url_request/redirect_info.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_test_util.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using content::ResourceType;
 using testing::_;
 using testing::Eq;
 using testing::Ne;
 using testing::Property;
@@ skipping 109 matching lines @@
       response_info.headers = new net::HttpResponseHeaders(
           "Status: 302 Found\0\0");
     }
   }
 
   void ThrottleWillStartRequest(bool* defer) {
     DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
     throttle_->WillStartRequest(defer);
   }
 
-  void ThrottleWillRedirectRequest(const GURL& new_url, bool* defer) {
+  void ThrottleWillRedirectRequest(const GURL& new_url,
+                                   const std::string& new_method,
+                                   bool* defer) {
     DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
-    throttle_->WillRedirectRequest(new_url, defer);
+    net::RedirectInfo redirect_info;
+    redirect_info.new_url = new_url;
+    redirect_info.new_method = new_method;

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

Nit: Maybe assemble the net::RedirectInfo in the caller? Makes it easier to test
other configurations if we want to.

[mmenke, 2015/02/05 21:20:53]

Done.

+    throttle_->WillRedirectRequest(redirect_info, defer);
   }
 
   bool request_resumed() const {
     return throttle_controller_.status() ==
         MockResourceController::RESUMED;
   }
 
   bool request_cancelled() const {
     return throttle_controller_.status() ==
         MockResourceController::CANCELLED;
@@ skipping 41 matching lines @@
       int render_frame_id,
       bool* defer) {
     DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
     TestIOThreadState* io_thread_state =
         new TestIOThreadState(url, render_process_id, render_frame_id,
                               request_method, redirect_mode,
                               mock_callback_receiver_.get());
 
     SetIOThreadState(io_thread_state);
 
-    if (redirect_mode == REDIRECT_MODE_NO_REDIRECT)
+    if (redirect_mode == REDIRECT_MODE_NO_REDIRECT) {
       io_thread_state->ThrottleWillStartRequest(defer);
-    else
-      io_thread_state->ThrottleWillRedirectRequest(url, defer);
+    } else {
+      // 302 redirects convert POSTs to gets.
+      io_thread_state->ThrottleWillRedirectRequest(url, "GET", defer);
+    }
   }
 
  protected:
   enum ShouldIgnoreNavigationCallbackAction {
     IgnoreNavigation,
     DontIgnoreNavigation
   };
 
   void SetUpWebContentsDelegateAndDrainRunLoop(
       ShouldIgnoreNavigationCallbackAction callback_action,
@@ skipping 231 matching lines @@
           REDIRECT_MODE_302,
           web_contents()->GetRenderViewHost()->GetProcess()->GetID(),
           web_contents()->GetMainFrame()->GetRoutingID(),
           base::Unretained(&defer)));
 
   // Wait for the request to finish processing.
   base::RunLoop().RunUntilIdle();
 }
 
 }  // namespace navigation_interception