Splits PipelineImpl into main and media thread components.

media/test/pipeline_integration_test.cc

Index: media/test/pipeline_integration_test.cc
diff --git a/media/test/pipeline_integration_test.cc b/media/test/pipeline_integration_test.cc
index 51a33bc8576f3ad6cf6efd18f60747e87b5fc686..7739764612b14ec6906afcaf750bbfcaacfd8992 100644
--- a/media/test/pipeline_integration_test.cc
+++ b/media/test/pipeline_integration_test.cc
@@ -1200,17 +1200,16 @@ TEST_F(PipelineIntegrationTest, MediaSource_ConfigChange_WebM) {
       ReadTestDataFile("bear-640x360.webm");
   source.AppendAtTime(base::TimeDelta::FromSeconds(kAppendTimeSec),
                       second_file->data(), second_file->data_size());
-
   source.EndOfStream();
 
+  Play();
+  EXPECT_TRUE(WaitUntilOnEnded());
+
   EXPECT_EQ(1u, pipeline_->GetBufferedTimeRanges().size());
   EXPECT_EQ(0, pipeline_->GetBufferedTimeRanges().start(0).InMilliseconds());
   EXPECT_EQ(kAppendTimeMs + k640WebMFileDurationMs,
             pipeline_->GetBufferedTimeRanges().end(0).InMilliseconds());
 
-  Play();
-
-  EXPECT_TRUE(WaitUntilOnEnded());
   source.Shutdown();
   Stop();
 }
@@ -1227,6 +1226,8 @@ TEST_F(PipelineIntegrationTest, MediaSource_Remove_Updates_BufferedRanges) {
 
   source.RemoveRange(base::TimeDelta::FromMilliseconds(1000),
                      base::TimeDelta::FromMilliseconds(k320WebMFileDurationMs));
+  message_loop_.RunUntilIdle();
+
   buffered_ranges = pipeline_->GetBufferedTimeRanges();
   EXPECT_EQ(1u, buffered_ranges.size());
   EXPECT_EQ(0, buffered_ranges.start(0).InMilliseconds());
@@ -1260,6 +1261,8 @@ TEST_F(PipelineIntegrationTest, MediaSource_FillUp_Buffer) {
     // reached (the data will be evicted from the front of the buffered range).
     source.EvictCodedFrames(media_time, file->data_size());
     source.AppendAtTime(media_time, file->data(), file->data_size());
+    message_loop_.RunUntilIdle();
+
     buffered_ranges = pipeline_->GetBufferedTimeRanges();
   } while (buffered_ranges.size() == 1 &&
            buffered_ranges.start(0) == base::TimeDelta::FromSeconds(0));
@@ -1281,17 +1284,16 @@ TEST_F(PipelineIntegrationTest,
       ReadTestDataFile("bear-640x360-av_enc-av.webm");
   source.AppendAtTime(base::TimeDelta::FromSeconds(kAppendTimeSec),
                       second_file->data(), second_file->data_size());
-
   source.EndOfStream();
 
+  Play();
+  EXPECT_TRUE(WaitUntilOnEnded());
+
   EXPECT_EQ(1u, pipeline_->GetBufferedTimeRanges().size());
   EXPECT_EQ(0, pipeline_->GetBufferedTimeRanges().start(0).InMilliseconds());
   EXPECT_EQ(kAppendTimeMs + k640WebMFileDurationMs,
             pipeline_->GetBufferedTimeRanges().end(0).InMilliseconds());
 
-  Play();
-
-  EXPECT_TRUE(WaitUntilOnEnded());
   source.Shutdown();
   Stop();
 }
@@ -1397,15 +1399,14 @@ TEST_F(PipelineIntegrationTest, MediaSource_ADTS_TimestampOffset) {
       second_file->data(), second_file->data_size());
   source.EndOfStream();
 
+  Play();
+  EXPECT_TRUE(WaitUntilOnEnded());
+
   EXPECT_EQ(592, source.last_timestamp_offset().InMilliseconds());
   EXPECT_EQ(1u, pipeline_->GetBufferedTimeRanges().size());
   EXPECT_EQ(0, pipeline_->GetBufferedTimeRanges().start(0).InMilliseconds());
   EXPECT_EQ(592, pipeline_->GetBufferedTimeRanges().end(0).InMilliseconds());
 
-  Play();
-
-  EXPECT_TRUE(WaitUntilOnEnded());
-
   // Verify preroll is stripped.
   EXPECT_HASH_EQ("-0.06,0.97,-0.90,-0.70,-0.53,-0.34,", GetAudioHash());
 }
@@ -1529,14 +1530,13 @@ TEST_F(PipelineIntegrationTest, MediaSource_MP3_TimestampOffset) {
                                 second_file->data_size());
   source.EndOfStream();
 
+  Play();
+  EXPECT_TRUE(WaitUntilOnEnded());
+
   EXPECT_EQ(613, source.last_timestamp_offset().InMilliseconds());
   EXPECT_EQ(1u, pipeline_->GetBufferedTimeRanges().size());
   EXPECT_EQ(0, pipeline_->GetBufferedTimeRanges().start(0).InMilliseconds());
   EXPECT_EQ(613, pipeline_->GetBufferedTimeRanges().end(0).InMilliseconds());
-
-  Play();
-
-  EXPECT_TRUE(WaitUntilOnEnded());
 }
 
 TEST_F(PipelineIntegrationTest, MediaSource_MP3_Icecast) {
@@ -1558,17 +1558,16 @@ TEST_F(PipelineIntegrationTest, MediaSource_ConfigChange_MP4) {
       ReadTestDataFile("bear-1280x720-av_frag.mp4");
   source.AppendAtTime(base::TimeDelta::FromSeconds(kAppendTimeSec),
                       second_file->data(), second_file->data_size());
-
   source.EndOfStream();
 
+  Play();
+  EXPECT_TRUE(WaitUntilOnEnded());
+
   EXPECT_EQ(1u, pipeline_->GetBufferedTimeRanges().size());
   EXPECT_EQ(0, pipeline_->GetBufferedTimeRanges().start(0).InMilliseconds());
   EXPECT_EQ(kAppendTimeMs + k1280IsoFileDurationMs,
             pipeline_->GetBufferedTimeRanges().end(0).InMilliseconds());
 
-  Play();
-
-  EXPECT_TRUE(WaitUntilOnEnded());
   source.Shutdown();
   Stop();
 }
@@ -1585,17 +1584,16 @@ TEST_F(PipelineIntegrationTest,
       ReadTestDataFile("bear-1280x720-v_frag-cenc.mp4");
   source.AppendAtTime(base::TimeDelta::FromSeconds(kAppendTimeSec),
                       second_file->data(), second_file->data_size());
-
   source.EndOfStream();
 
+  Play();
+  EXPECT_TRUE(WaitUntilOnEnded());
+
   EXPECT_EQ(1u, pipeline_->GetBufferedTimeRanges().size());
   EXPECT_EQ(0, pipeline_->GetBufferedTimeRanges().start(0).InMilliseconds());
   EXPECT_EQ(kAppendTimeMs + k1280IsoFileDurationMs,
             pipeline_->GetBufferedTimeRanges().end(0).InMilliseconds());
 
-  Play();
-
-  EXPECT_TRUE(WaitUntilOnEnded());
   source.Shutdown();
   Stop();
 }
@@ -1613,17 +1611,16 @@ TEST_F(PipelineIntegrationTest,
       ReadTestDataFile("bear-1280x720-v_frag-cenc-key_rotation.mp4");
   source.AppendAtTime(base::TimeDelta::FromSeconds(kAppendTimeSec),
                       second_file->data(), second_file->data_size());
-
   source.EndOfStream();
 
+  Play();
+  EXPECT_TRUE(WaitUntilOnEnded());
+
   EXPECT_EQ(1u, pipeline_->GetBufferedTimeRanges().size());
   EXPECT_EQ(0, pipeline_->GetBufferedTimeRanges().start(0).InMilliseconds());
   EXPECT_EQ(kAppendTimeMs + k1280IsoFileDurationMs,
             pipeline_->GetBufferedTimeRanges().end(0).InMilliseconds());
 
-  Play();
-
-  EXPECT_TRUE(WaitUntilOnEnded());
   source.Shutdown();
   Stop();
 }