Revert 259154 "Remove HasAudio(), HasVideo(), GetInitialNaturalS..."

trunk/src/media/filters/pipeline_integration_test_base.cc

Index: trunk/src/media/filters/pipeline_integration_test_base.cc
===================================================================
--- trunk/src/media/filters/pipeline_integration_test_base.cc	(revision 259158)
+++ trunk/src/media/filters/pipeline_integration_test_base.cc	(working copy)
@@ -17,7 +17,6 @@
 #include "media/filters/opus_audio_decoder.h"
 #include "media/filters/vpx_video_decoder.h"
 
-using ::testing::_;
 using ::testing::AnyNumber;
 using ::testing::AtMost;
 
@@ -103,17 +102,17 @@
 
 bool PipelineIntegrationTestBase::Start(const base::FilePath& file_path,
                                         PipelineStatus expected_status) {
-  EXPECT_CALL(*this, OnMetadata(_)).Times(AtMost(1));
-  EXPECT_CALL(*this, OnPrerollCompleted()).Times(AtMost(1));
+  EXPECT_CALL(*this, OnBufferingState(Pipeline::kHaveMetadata))
+      .Times(AtMost(1));
+  EXPECT_CALL(*this, OnBufferingState(Pipeline::kPrerollCompleted))
+      .Times(AtMost(1));
   pipeline_->Start(
       CreateFilterCollection(file_path, NULL),
       base::Bind(&PipelineIntegrationTestBase::OnEnded, base::Unretained(this)),
       base::Bind(&PipelineIntegrationTestBase::OnError, base::Unretained(this)),
       QuitOnStatusCB(expected_status),
-      base::Bind(&PipelineIntegrationTestBase::OnMetadata,
+      base::Bind(&PipelineIntegrationTestBase::OnBufferingState,
                  base::Unretained(this)),
-      base::Bind(&PipelineIntegrationTestBase::OnPrerollCompleted,
-                 base::Unretained(this)),
       base::Closure());
   message_loop_.Run();
   return (pipeline_status_ == PIPELINE_OK);
@@ -136,18 +135,18 @@
 
 bool PipelineIntegrationTestBase::Start(const base::FilePath& file_path,
                                         Decryptor* decryptor) {
-  EXPECT_CALL(*this, OnMetadata(_)).Times(AtMost(1));
-  EXPECT_CALL(*this, OnPrerollCompleted()).Times(AtMost(1));
+  EXPECT_CALL(*this, OnBufferingState(Pipeline::kHaveMetadata))
+      .Times(AtMost(1));
+  EXPECT_CALL(*this, OnBufferingState(Pipeline::kPrerollCompleted))
+      .Times(AtMost(1));
   pipeline_->Start(
       CreateFilterCollection(file_path, decryptor),
       base::Bind(&PipelineIntegrationTestBase::OnEnded, base::Unretained(this)),
       base::Bind(&PipelineIntegrationTestBase::OnError, base::Unretained(this)),
       base::Bind(&PipelineIntegrationTestBase::OnStatusCallback,
                  base::Unretained(this)),
-      base::Bind(&PipelineIntegrationTestBase::OnMetadata,
+      base::Bind(&PipelineIntegrationTestBase::OnBufferingState,
                  base::Unretained(this)),
-      base::Bind(&PipelineIntegrationTestBase::OnPrerollCompleted,
-                 base::Unretained(this)),
       base::Closure());
   message_loop_.Run();
   return (pipeline_status_ == PIPELINE_OK);
@@ -164,7 +163,7 @@
 bool PipelineIntegrationTestBase::Seek(base::TimeDelta seek_time) {
   ended_ = false;
 
-  EXPECT_CALL(*this, OnPrerollCompleted());
+  EXPECT_CALL(*this, OnBufferingState(Pipeline::kPrerollCompleted));
   pipeline_->Seek(seek_time, QuitOnStatusCB(PIPELINE_OK));
   message_loop_.Run();
   return (pipeline_status_ == PIPELINE_OK);