Change WebURLLoaderClient::willFollowRedirect() API to return bool

content/child/web_url_loader_impl.cc

 // Copyright 2014 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/child/web_url_loader_impl.h"
 
 #include <openssl/ssl.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 622 matching lines @@
                       request_.reportRawHeaders());
 
   WebURLRequest new_request;
   PopulateURLRequestForRedirect(
       request_, redirect_info, referrer_policy_,
       info.was_fetched_via_service_worker
           ? blink::WebURLRequest::SkipServiceWorker::None
           : blink::WebURLRequest::SkipServiceWorker::All,
       &new_request);
 
-  client_->willFollowRedirect(loader_, new_request, response,
-                              info.encoded_data_length);
-  request_ = new_request;
+  bool follow = client_->willFollowRedirect(loader_, new_request, response,
+                                            info.encoded_data_length);
+  if (follow) {

[jochen (gone - plz use gerrit), 2016/09/30 11:11:24]

maybe just early exist if !follow here?

[tyoshino (SeeGerritForStatus), 2016/10/04 04:02:25]

Yeah. Done

+    request_ = new_request;
 
-  // Only follow the redirect if WebKit left the URL unmodified.
-  if (redirect_info.new_url == GURL(new_request.url())) {

[jochen (gone - plz use gerrit), 2016/09/30 11:11:24]

can we DCHECK() that redirect_info.new_url == new_request.url() at this point?

[tyoshino (SeeGerritForStatus), 2016/10/04 04:02:24]

Added

     // First-party cookie logic moved from DocumentLoader in Blink to
     // net::URLRequest in the browser. Assert that Blink didn't try to change it
     // to something else.
     DCHECK_EQ(redirect_info.new_first_party_for_cookies.spec(),
               request_.firstPartyForCookies().string().utf8());
     return true;
   }
 
-  // We assume that WebKit only changes the URL to suppress a redirect, and we
-  // assume that it does so by setting it to be invalid.
-  DCHECK(!new_request.url().isValid());
+  request_ = WebURLRequest();
+
   return false;
 }
 
 void WebURLLoaderImpl::Context::OnReceivedResponse(
     const ResourceResponseInfo& initial_info) {
   if (!client_)
     return;
 
   TRACE_EVENT_WITH_FLOW0(
       "loading", "WebURLLoaderImpl::Context::OnReceivedResponse",
@@ skipping 581 matching lines @@
     response->clearHTTPHeaderField(webStringName);
     while (response_headers->EnumerateHeader(&iterator, name, &value)) {
       response->addHTTPHeaderField(webStringName,
                                    WebString::fromLatin1(value));
     }
   }
   return true;
 }
 
 }  // namespace content