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

content/child/npapi/plugin_url_fetcher.cc

Index: content/child/npapi/plugin_url_fetcher.cc
diff --git a/content/child/npapi/plugin_url_fetcher.cc b/content/child/npapi/plugin_url_fetcher.cc
index 39825fdcfff6b10a5d80433f0d13ffc14483c48b..b83f8a0e1b698baed785745226a79099207f8963 100644
--- a/content/child/npapi/plugin_url_fetcher.cc
+++ b/content/child/npapi/plugin_url_fetcher.cc
@@ -23,7 +23,7 @@
 #include "net/base/load_flags.h"
 #include "net/base/net_errors.h"
 #include "net/http/http_response_headers.h"
-#include "net/url_request/url_request.h"
+#include "net/url_request/redirect_info.h"
 #include "third_party/WebKit/public/platform/WebURLLoaderClient.h"
 #include "third_party/WebKit/public/platform/WebURLResponse.h"
 #include "webkit/child/resource_loader_bridge.h"
@@ -191,8 +191,7 @@ void PluginURLFetcher::OnUploadProgress(uint64 position, uint64 size) {
 }
 
 bool PluginURLFetcher::OnReceivedRedirect(
-    const GURL& new_url,
-    const GURL& new_first_party_for_cookies,
+    const net::RedirectInfo& redirect_info,
     const ResourceResponseInfo& info) {
   if (!plugin_stream_)
     return false;
@@ -206,42 +205,28 @@ bool PluginURLFetcher::OnReceivedRedirect(
   // initiated by plug-ins.
   if (is_plugin_src_load_ &&
       !plugin_stream_->instance()->webplugin()->CheckIfRunInsecureContent(
-          new_url)) {
+          redirect_info.url)) {
     plugin_stream_->DidFail(resource_id_);  // That will delete |this|.
     return false;
   }
 
-  // It's unfortunate that this logic of when a redirect's method changes is
-  // in url_request.cc, but weburlloader_impl.cc and this file have to duplicate
-  // it instead of passing that information.
-  int response_code;
-  if (info.headers) {
-    response_code = info.headers->response_code();
-  } else {
-    // A redirect may have NULL headers if it came from URLRequestRedirectJob.
-    //
-    // TODO(davidben): Get the actual response code from the browser. Either
-    // fake enough of headers to have a response code or pass it down as part of
-    // https://crbug.com/384609.
-    response_code = 307;
-  }
-  method_ = net::URLRequest::ComputeMethodForRedirect(method_, response_code);
   GURL old_url = url_;
-  url_ = new_url;
-  first_party_for_cookies_ = new_first_party_for_cookies;
+  url_ = redirect_info.url;
+  method_ = redirect_info.method;

[mmenke, 2014/07/17 16:55:09]

I don't think we need method_ any more - we only needed to track the old method
for ComputerMethodForRedirect.

[davidben, 2014/07/17 22:03:54]

Done.

+  first_party_for_cookies_ = redirect_info.first_party_for_cookies;
 
   // If the plugin does not participate in url redirect notifications then just
   // block cross origin 307 POST redirects.

[mmenke, 2014/07/17 16:55:09]

Hrm...Should we be allowing other cross origin redirects of POSTs?  I guess so?

[davidben, 2014/07/17 22:03:54]

I'm not sure. I suspect that actually should include status code 308 now. (Or
maybe checking if method_ changes (hah, maybe we do want it)) Though even if we
then fix that, in the other case, the plugin also internally reimplements
ComputeMethodForRedirect and also wouldn't be aware of 308. I figured I'd leave
it for now.

I dunno. None of this code is long for this world, and I think this was
originally for Flash which now implements redirect notification and is using
PPAPI anyway.

   if (!notify_redirects_) {
-    if (response_code == 307 && method_ == "POST" &&
-        old_url.GetOrigin() != new_url.GetOrigin()) {
+    if (redirect_info.status_code == 307 && method_ == "POST" &&
+        old_url.GetOrigin() != url_.GetOrigin()) {
       plugin_stream_->DidFail(resource_id_);  // That will delete |this|.
       return false;
     }
   } else {
     // Pause the request while we ask the plugin what to do about the redirect.
     bridge_->SetDefersLoading(true);
-    plugin_stream_->WillSendRequest(url_, response_code);
+    plugin_stream_->WillSendRequest(url_, redirect_info.status_code);
   }
 
   return true;