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

media/blink/multibuffer_data_source_unittest.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 <stddef.h>
 #include <stdint.h>
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 1185 matching lines @@
   InitializeWith206Response();
 
   EXPECT_EQ(MultibufferDataSource::METADATA, preload());
   EXPECT_FALSE(is_local_source());
 
   EXPECT_TRUE(data_source_->range_supported());
   CheckReadThenDefer();
 
   ReadAt(kDataSize);
 
-  data_source_->OnBufferingHaveEnough();
+  data_source_->OnBufferingHaveEnough(false);
   ASSERT_TRUE(active_loader());
 
   EXPECT_CALL(*this, ReadCallback(kDataSize));
   EXPECT_CALL(host_, AddBufferedByteRange(0, kDataSize * 2));
   ReceiveData(kDataSize);
 
   EXPECT_FALSE(active_loader_allownull());
 }
 
+TEST_F(MultibufferDataSourceTest,
+       ExternalResource_Response206_CancelAfterPlay) {
+  set_preload(BufferedDataSource::METADATA);
+  InitializeWith206Response();
+
+  EXPECT_EQ(MultibufferDataSource::METADATA, preload());
+  EXPECT_FALSE(is_local_source());
+
+  EXPECT_TRUE(data_source_->range_supported());
+  CheckReadThenDefer();
+
+  ReadAt(kDataSize);
+
+  // Marking the media as playing should prevent deferral. It also tells the
+  // data source to start buffering beyond the initial load.
+  data_source_->MediaIsPlaying();
+  data_source_->OnBufferingHaveEnough(false);
+  CheckCapacityDefer();
+  ASSERT_TRUE(active_loader());
+
+  // Read a bit from the beginning and ensure deferral hasn't happened yet.
+  EXPECT_CALL(*this, ReadCallback(kDataSize));
+  EXPECT_CALL(host_, AddBufferedByteRange(0, kDataSize * 2));
+  ReceiveData(kDataSize);
+  ASSERT_TRUE(active_loader());
+  data_source_->OnBufferingHaveEnough(true);
+  ASSERT_TRUE(active_loader());
+  ASSERT_FALSE(active_loader()->deferred());
+
+  // Deliver data until capacity is reached and verify deferral.
+  int bytes_received = 0;
+  EXPECT_CALL(host_, AddBufferedByteRange(_, _)).Times(testing::AtLeast(1));
+  while (active_loader() && !active_loader()->deferred()) {

[hubbe, 2016/03/14 23:16:05]

You probably want active_loader_allownull() here.
These kind of things would be easier to debug if we used CHECK instead of EXPECT
in the helper functions, as we would get backtraces...

[DaleCurtis, 2016/03/14 23:24:38]

Thanks! That was the issue. True, unfortunately CHECK() kills the test harness.
Perhaps we should just be printing stack traces when EXPECT fails? Might get a
bit spammy though.

+    ReceiveData(kDataSize);
+    bytes_received += kDataSize;
+  }
+  EXPECT_GT(bytes_received, 0);
+  EXPECT_LT(bytes_received + kDataSize, kFileSize);
+  EXPECT_FALSE(active_loader_allownull());
+}
+
 TEST_F(MultibufferDataSourceTest, SeekPastEOF) {
   GURL gurl(kHttpUrl);
   data_source_.reset(new MockMultibufferDataSource(
       gurl, message_loop_.task_runner(), url_index_,
       view_->mainFrame()->toWebLocalFrame(), &host_));
   data_source_->SetPreload(preload_);
 
   response_generator_.reset(new TestResponseGenerator(gurl, kDataSize + 1));
   EXPECT_CALL(*this, OnInitialize(true));
   data_source_->Initialize(base::Bind(&MultibufferDataSourceTest::OnInitialize,
@@ skipping 44 matching lines @@
   data_provider()->willFollowRedirect(url_loader(), request, response);
   Respond(response_generator_->Generate206(kDataSize));
   ReceiveData(kDataSize);
   EXPECT_CALL(host_, AddBufferedByteRange(0, kDataSize * 3));
   FinishLoading();
   EXPECT_FALSE(loading());
   Stop();
 }
 
 }  // namespace media