Replace FFmpegDemuxer thread per element with base::TaskScheduler.

media/filters/blocking_url_protocol_unittest.cc

Index: media/filters/blocking_url_protocol_unittest.cc
diff --git a/media/filters/blocking_url_protocol_unittest.cc b/media/filters/blocking_url_protocol_unittest.cc
index 266f893b5452e5cee48d8f22a23b69673a7ef426..3d940ca93354a838cbc7af56b6eb7d87563ede6d 100644
--- a/media/filters/blocking_url_protocol_unittest.cc
+++ b/media/filters/blocking_url_protocol_unittest.cc
@@ -20,9 +20,10 @@ namespace media {
 class BlockingUrlProtocolTest : public testing::Test {
  public:
   BlockingUrlProtocolTest()
-      : url_protocol_(&data_source_,
-                      base::Bind(&BlockingUrlProtocolTest::OnDataSourceError,
-                                 base::Unretained(this))) {
+      : url_protocol_(new BlockingUrlProtocol(
+            &data_source_,
+            base::Bind(&BlockingUrlProtocolTest::OnDataSourceError,
+                       base::Unretained(this)))) {
     CHECK(data_source_.Initialize(GetTestDataFilePath("bear-320x240.webm")));
   }
 
@@ -33,7 +34,7 @@ class BlockingUrlProtocolTest : public testing::Test {
   MOCK_METHOD0(OnDataSourceError, void());
 
   FileDataSource data_source_;
-  BlockingUrlProtocol url_protocol_;
+  std::unique_ptr<BlockingUrlProtocol> url_protocol_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(BlockingUrlProtocolTest);
@@ -43,35 +44,35 @@ class BlockingUrlProtocolTest : public testing::Test {
 TEST_F(BlockingUrlProtocolTest, Read) {
   // Set read head to zero as Initialize() will have parsed a bit of the file.
   int64_t position = 0;
-  EXPECT_TRUE(url_protocol_.SetPosition(0));
-  EXPECT_TRUE(url_protocol_.GetPosition(&position));
+  EXPECT_TRUE(url_protocol_->SetPosition(0));
+  EXPECT_TRUE(url_protocol_->GetPosition(&position));
   EXPECT_EQ(0, position);
 
   // Read 32 bytes from offset zero and verify position.
   uint8_t buffer[32];
-  EXPECT_EQ(32, url_protocol_.Read(32, buffer));
-  EXPECT_TRUE(url_protocol_.GetPosition(&position));
+  EXPECT_EQ(32, url_protocol_->Read(32, buffer));
+  EXPECT_TRUE(url_protocol_->GetPosition(&position));
   EXPECT_EQ(32, position);
 
   // Read an additional 32 bytes and verify position.
-  EXPECT_EQ(32, url_protocol_.Read(32, buffer));
-  EXPECT_TRUE(url_protocol_.GetPosition(&position));
+  EXPECT_EQ(32, url_protocol_->Read(32, buffer));
+  EXPECT_TRUE(url_protocol_->GetPosition(&position));
   EXPECT_EQ(64, position);
 
   // Seek to end and read until EOF.
   int64_t size = 0;
-  EXPECT_TRUE(url_protocol_.GetSize(&size));
-  EXPECT_TRUE(url_protocol_.SetPosition(size - 48));
-  EXPECT_EQ(32, url_protocol_.Read(32, buffer));
-  EXPECT_TRUE(url_protocol_.GetPosition(&position));
+  EXPECT_TRUE(url_protocol_->GetSize(&size));
+  EXPECT_TRUE(url_protocol_->SetPosition(size - 48));
+  EXPECT_EQ(32, url_protocol_->Read(32, buffer));
+  EXPECT_TRUE(url_protocol_->GetPosition(&position));
   EXPECT_EQ(size - 16, position);
 
-  EXPECT_EQ(16, url_protocol_.Read(32, buffer));
-  EXPECT_TRUE(url_protocol_.GetPosition(&position));
+  EXPECT_EQ(16, url_protocol_->Read(32, buffer));
+  EXPECT_TRUE(url_protocol_->GetPosition(&position));
   EXPECT_EQ(size, position);
 
-  EXPECT_EQ(0, url_protocol_.Read(32, buffer));
-  EXPECT_TRUE(url_protocol_.GetPosition(&position));
+  EXPECT_EQ(0, url_protocol_->Read(32, buffer));
+  EXPECT_TRUE(url_protocol_->GetPosition(&position));
   EXPECT_EQ(size, position);
 }
 
@@ -80,23 +81,23 @@ TEST_F(BlockingUrlProtocolTest, ReadError) {
 
   uint8_t buffer[32];
   EXPECT_CALL(*this, OnDataSourceError());
-  EXPECT_EQ(AVERROR(EIO), url_protocol_.Read(32, buffer));
+  EXPECT_EQ(AVERROR(EIO), url_protocol_->Read(32, buffer));
 }
 
 TEST_F(BlockingUrlProtocolTest, GetSetPosition) {
   int64_t size;
   int64_t position;
-  EXPECT_TRUE(url_protocol_.GetSize(&size));
-  EXPECT_TRUE(url_protocol_.GetPosition(&position));
+  EXPECT_TRUE(url_protocol_->GetSize(&size));
+  EXPECT_TRUE(url_protocol_->GetPosition(&position));
 
-  EXPECT_TRUE(url_protocol_.SetPosition(512));
-  EXPECT_FALSE(url_protocol_.SetPosition(size + 1));
-  EXPECT_FALSE(url_protocol_.SetPosition(-1));
-  EXPECT_TRUE(url_protocol_.GetPosition(&position));
+  EXPECT_TRUE(url_protocol_->SetPosition(512));
+  EXPECT_FALSE(url_protocol_->SetPosition(size + 1));
+  EXPECT_FALSE(url_protocol_->SetPosition(-1));
+  EXPECT_TRUE(url_protocol_->GetPosition(&position));
   EXPECT_EQ(512, position);
 
-  EXPECT_TRUE(url_protocol_.SetPosition(size));
-  EXPECT_TRUE(url_protocol_.GetPosition(&position));
+  EXPECT_TRUE(url_protocol_->SetPosition(size));
+  EXPECT_TRUE(url_protocol_->GetPosition(&position));
   EXPECT_EQ(size, position);
 }
 
@@ -104,18 +105,22 @@ TEST_F(BlockingUrlProtocolTest, GetSize) {
   int64_t data_source_size = 0;
   int64_t url_protocol_size = 0;
   EXPECT_TRUE(data_source_.GetSize(&data_source_size));
-  EXPECT_TRUE(url_protocol_.GetSize(&url_protocol_size));
+  EXPECT_TRUE(url_protocol_->GetSize(&url_protocol_size));
   EXPECT_NE(0, data_source_size);
   EXPECT_EQ(data_source_size, url_protocol_size);
 }
 
 TEST_F(BlockingUrlProtocolTest, IsStreaming) {
   EXPECT_FALSE(data_source_.IsStreaming());
-  EXPECT_FALSE(url_protocol_.IsStreaming());
+  EXPECT_FALSE(url_protocol_->IsStreaming());
 
   data_source_.force_streaming_for_testing();
+  url_protocol_.reset(new BlockingUrlProtocol(
+      &data_source_,
+      base::Bind(&BlockingUrlProtocolTest::OnDataSourceError,
+                 base::Unretained(this))));

[xhwang, 2017/02/23 23:45:42]

I am a bit lost, why do you need to create a new BlockingUrlProtocol here?

[DaleCurtis, 2017/02/24 23:40:29]

Because I switched IsStreaming() to be set at construction time instead of
always being queried from the DataSource; this also makes it clear that this
value can never change.

   EXPECT_TRUE(data_source_.IsStreaming());
-  EXPECT_TRUE(url_protocol_.IsStreaming());
+  EXPECT_TRUE(url_protocol_->IsStreaming());
 }
 
 }  // namespace media