Merge M50: "Disable "pause-and-buffer" on Android, cancel suspended players."

media/blink/multibuffer_data_source.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 "media/blink/multibuffer_data_source.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
@@ skipping 296 matching lines @@
                                 base::Bind(&MultibufferDataSource::StopLoader,
                                            weak_factory_.GetWeakPtr()));
 }
 
 void MultibufferDataSource::SetBitrate(int bitrate) {
   render_task_runner_->PostTask(
       FROM_HERE, base::Bind(&MultibufferDataSource::SetBitrateTask,
                             weak_factory_.GetWeakPtr(), bitrate));
 }
 
-void MultibufferDataSource::OnBufferingHaveEnough() {
+void MultibufferDataSource::OnBufferingHaveEnough(bool always_cancel) {
   DCHECK(render_task_runner_->BelongsToCurrentThread());
-  if (reader_ && preload_ == METADATA && !media_has_played_ && !IsStreaming()) {
+  if (reader_ && (always_cancel || (preload_ == METADATA &&
+                                    !media_has_played_ && !IsStreaming()))) {
     cancel_on_defer_ = true;
     if (!loading_)
       reader_.reset(nullptr);
   }
 }
 
 int64_t MultibufferDataSource::GetMemoryUsage() const {
   // TODO(hubbe): Make more accurate when url_data_ is shared.
   return url_data_->CachedSize()
          << url_data_->multibuffer()->block_size_shift();
@@ skipping 243 matching lines @@
   reader_->SetMaxBuffer(back_buffer, pin_forwards);
 
   if (preload_ == METADATA) {
     reader_->SetPreload(0, 0);
   } else {
     reader_->SetPreload(preload + kPreloadHighExtra, preload);
   }
 }
 
 }  // namespace media