Change WebURLLoaderClient::willFollowRedirect() API to return bool

media/blink/resource_multibuffer_data_provider.cc

 // Copyright 2015 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 "media/blink/resource_multibuffer_data_provider.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 145 matching lines @@
 
 void ResourceMultiBufferDataProvider::SetDeferred(bool deferred) {
   if (!active_loader_ || active_loader_->deferred() == deferred)
     return;
   active_loader_->SetDeferred(deferred);
 }
 
 /////////////////////////////////////////////////////////////////////////////
 // WebURLLoaderClient implementation.
 
-void ResourceMultiBufferDataProvider::willFollowRedirect(
+bool ResourceMultiBufferDataProvider::willFollowRedirect(
     WebURLLoader* loader,
     WebURLRequest& newRequest,
     const WebURLResponse& redirectResponse,
     int64_t encodedDataLength) {
   redirects_to_ = newRequest.url();
   url_data_->set_valid_until(base::Time::Now() +
                              GetCacheValidUntil(redirectResponse));
 
   // This test is vital for security!
   if (cors_mode_ == UrlData::CORS_UNSPECIFIED) {
     // We allow the redirect if the origin is the same.
     if (origin_ != redirects_to_.GetOrigin()) {
       // We also allow the redirect if we don't have any data in the
       // cache, as that means that no dangerous data mixing can occur.
       if (url_data_->multibuffer()->map().empty() && fifo_.empty())
-        return;
+        return true;
 
       active_loader_ = nullptr;
       url_data_->Fail();

[Nate Chapin, 2016/09/06 16:46:14]

I don't know this code at all, but it smells like it should return false
sometimes.

[tyoshino (SeeGerritForStatus), 2016/09/07 10:52:28]

Yeah. I'll ask the owner for review.

-      return;  // "this" may be deleted now.
+      // "this" may be deleted now.
     }
   }
+  return true;
 }
 
 void ResourceMultiBufferDataProvider::didSendData(
     WebURLLoader* loader,
     unsigned long long bytes_sent,
     unsigned long long total_bytes_to_be_sent) {
   NOTIMPLEMENTED();
 }
 
 void ResourceMultiBufferDataProvider::didReceiveResponse(
@@ skipping 340 matching lines @@
   }
 
   if (byte_pos() != first_byte_position) {
     return false;
   }
 
   return true;
 }
 
 }  // namespace media