Change WebURLLoaderClient::willFollowRedirect() API to return bool

third_party/WebKit/Source/platform/testing/weburl_loader_mock.cc

 // Copyright 2016 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 "platform/testing/weburl_loader_mock.h"
 
 #include "platform/testing/weburl_loader_mock_factory_impl.h"
 #include "public/platform/URLConversion.h"
 #include "public/platform/WebData.h"
 #include "public/platform/WebURLError.h"
@@ skipping 64 matching lines @@
   newRequest.setFrameType(request.getFrameType());
   newRequest.setSkipServiceWorker(request.skipServiceWorker());
   newRequest.setShouldResetAppCache(request.shouldResetAppCache());
   newRequest.setFetchRequestMode(request.getFetchRequestMode());
   newRequest.setFetchCredentialsMode(request.getFetchCredentialsMode());
   newRequest.setHTTPMethod(request.httpMethod());
   newRequest.setHTTPBody(request.httpBody());
 
   WeakPtr<WebURLLoaderMock> self = weak_factory_.createWeakPtr();
 
-  client_->willFollowRedirect(this, newRequest, redirectResponse,
-                              kRedirectResponseOverheadBytes);
+  bool follow = client_->willFollowRedirect(this, newRequest, redirectResponse,
+                                            kRedirectResponseOverheadBytes);
+  if (!follow)
+    newRequest = WebURLRequest();

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

why this?

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

Just preserving the old behavior. Before this change, newRequest was guaranteed
to be cleared when not following.

 
   // |this| might be deleted in willFollowRedirect().
   if (!self)
     return newRequest;
 
-  if (redirectURL != KURL(newRequest.url())) {
-    // Only follow the redirect if WebKit left the URL unmodified.
-    // 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(!newRequest.url().isValid());
+  if (!follow)
     cancel();
-  }
 
   return newRequest;
 }
 
 void WebURLLoaderMock::loadSynchronously(const WebURLRequest& request,
                                          WebURLResponse& response,
                                          WebURLError& error,
                                          WebData& data,
                                          int64_t& encoded_data_length) {
   if (factory_->IsMockedURL(request.url())) {
@@ skipping 52 matching lines @@
   // In principle this is NOTIMPLEMENTED(), but if we put that here it floods
   // the console during webkit unit tests, so we leave the function empty.
   DCHECK(runner);
 }
 
 WeakPtr<WebURLLoaderMock> WebURLLoaderMock::GetWeakPtr() {
   return weak_factory_.createWeakPtr();
 }
 
 } // namespace blink