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

media/blink/multibuffer_data_source.h

 // 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.
 
 #ifndef MEDIA_BLINK_MULTIBUFFER_DATA_SOURCE_H_
 #define MEDIA_BLINK_MULTIBUFFER_DATA_SOURCE_H_
 
 #include <stdint.h>
 
 #include <string>
@@ skipping 74 matching lines @@
 
   // Notifies changes in playback state for controlling media buffering
   // behavior.
   void MediaPlaybackRateChanged(double playback_rate) override;
   void MediaIsPlaying() override;
   bool media_has_played() const override;
 
   // Returns true if the resource is local.
   bool assume_fully_buffered() override;
 
-  // Cancels any open network connections once reaching the deferred state for
-  // preload=metadata, non-streaming resources that have not started playback.
-  // If already deferred, connections will be immediately closed.
-  void OnBufferingHaveEnough() override;
+  // Cancels any open network connections once reaching the deferred state. If
+  // |always_cancel| is false this is done only for preload=metadata, non-
+  // streaming resources that have not started playback. If |always_cancel| is
+  // true, all resource types will have their connections canceled. If already
+  // deferred, connections will be immediately closed.
+  void OnBufferingHaveEnough(bool always_cancel) override;
 
   int64_t GetMemoryUsage() const override;
 
   // DataSource implementation.
   // Called from demuxer thread.
   void Stop() override;
 
   void Read(int64_t position,
             int size,
             uint8_t* data,
@@ skipping 131 matching lines @@
   // reaching into this class from multiple threads to attain a WeakPtr.
   base::WeakPtr<MultibufferDataSource> weak_ptr_;
   base::WeakPtrFactory<MultibufferDataSource> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(MultibufferDataSource);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BLINK_MULTIBUFFER_DATA_SOURCE_H_