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

media/blink/multibuffer_data_source.cc

Index: media/blink/multibuffer_data_source.cc
diff --git a/media/blink/multibuffer_data_source.cc b/media/blink/multibuffer_data_source.cc
index 67a61367b8a70176660ce9f9be6010b54b88352e..ae27022839b1654c409bb0c3ef9585b90de37e12 100644
--- a/media/blink/multibuffer_data_source.cc
+++ b/media/blink/multibuffer_data_source.cc
@@ -314,9 +314,10 @@ void MultibufferDataSource::SetBitrate(int bitrate) {
                             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);