Change WebURLLoaderClient::willFollowRedirect() API to return bool

content/renderer/media/android/media_info_loader.cc

 // Copyright 2013 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/renderer/media/android/media_info_loader.h"
 
 #include <utility>
 
 #include "base/bits.h"
 #include "base/callback_helpers.h"
@@ skipping 72 matching lines @@
     loader.reset(frame->createAssociatedURLLoader(options));
   }
 
   // Start the resource loading.
   loader->loadAsynchronously(request, this);
   active_loader_.reset(new media::ActiveLoader(std::move(loader)));
 }
 
 /////////////////////////////////////////////////////////////////////////////
 // blink::WebURLLoaderClient implementation.
-void MediaInfoLoader::willFollowRedirect(
+bool MediaInfoLoader::willFollowRedirect(
     WebURLLoader* loader,
     WebURLRequest& newRequest,
     const WebURLResponse& redirectResponse) {
   // The load may have been stopped and |ready_cb| is destroyed.
   // In this case we shouldn't do anything.
-  if (ready_cb_.is_null()) {
-    // Set the url in the request to an invalid value (empty url).
-    newRequest.setURL(blink::WebURL());
-    return;
-  }
+  if (ready_cb_.is_null())
+    return false;
 
   // Only allow |single_origin_| if we haven't seen a different origin yet.
   if (single_origin_)
     single_origin_ = url_.GetOrigin() == GURL(newRequest.url()).GetOrigin();
 
   url_ = newRequest.url();
   first_party_url_ = newRequest.firstPartyForCookies();
   allow_stored_credentials_ = newRequest.allowStoredCredentials();
+
+  return true;
 }
 
 void MediaInfoLoader::didSendData(
     WebURLLoader* loader,
     unsigned long long bytes_sent,
     unsigned long long total_bytes_to_be_sent) {
   NOTIMPLEMENTED();
 }
 
 void MediaInfoLoader::didReceiveResponse(
@@ skipping 85 matching lines @@
 void MediaInfoLoader::DidBecomeReady(Status status) {
   UMA_HISTOGRAM_TIMES("Media.InfoLoadDelay",
                       base::TimeTicks::Now() - start_time_);
   active_loader_.reset();
   if (!ready_cb_.is_null())
     base::ResetAndReturn(&ready_cb_).Run(status, url_, first_party_url_,
                                          allow_stored_credentials_);
 }
 
 }  // namespace content