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

media/blink/buffered_data_source.cc

Index: media/blink/buffered_data_source.cc
diff --git a/media/blink/buffered_data_source.cc b/media/blink/buffered_data_source.cc
index d1a6c224f452373fa20a6505308d902e51ff1622..8dd6b900a6693d5bc077391905f8cbe19bd2aba9 100644
--- a/media/blink/buffered_data_source.cc
+++ b/media/blink/buffered_data_source.cc
@@ -253,10 +253,12 @@ void BufferedDataSource::SetBitrate(int bitrate) {
                                     bitrate));
 }
 
-void BufferedDataSource::OnBufferingHaveEnough() {
+void BufferedDataSource::OnBufferingHaveEnough(bool always_cancel) {
   DCHECK(render_task_runner_->BelongsToCurrentThread());
-  if (loader_ && preload_ == METADATA && !media_has_played_ && !IsStreaming())
+  if (loader_ && (always_cancel || (preload_ == METADATA &&
+                                    !media_has_played_ && !IsStreaming()))) {
     loader_->CancelUponDeferral();
+  }
 }
 
 int64_t BufferedDataSource::GetMemoryUsage() const {