Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / media / filters / pipeline_integration_test_base.cc

diff --git a/src/media/filters/pipeline_integration_test_base.cc b/src/media/filters/pipeline_integration_test_base.cc
index 3a3c91f..dcd5065 100644 (file)
--- a/src/media/filters/pipeline_integration_test_base.cc
+++ b/src/media/filters/pipeline_integration_test_base.cc
@@ -20,6 +20,7 @@
 using ::testing::_;
 using ::testing::AnyNumber;
 using ::testing::AtMost;
+using ::testing::InvokeWithoutArgs;
 using ::testing::SaveArg;
 
 namespace media {
@@ -46,6 +47,10 @@ PipelineIntegrationTestBase::~PipelineIntegrationTestBase() {
   Stop();
 }
 
+void PipelineIntegrationTestBase::SaveStatus(PipelineStatus status) {
+  pipeline_status_ = status;
+}
+
 void PipelineIntegrationTestBase::OnStatusCallback(
     PipelineStatus status) {
   pipeline_status_ = status;
@@ -177,8 +182,11 @@ void PipelineIntegrationTestBase::Pause() {
 bool PipelineIntegrationTestBase::Seek(base::TimeDelta seek_time) {
   ended_ = false;
 
-  EXPECT_CALL(*this, OnBufferingStateChanged(BUFFERING_HAVE_ENOUGH));
-  pipeline_->Seek(seek_time, QuitOnStatusCB(PIPELINE_OK));
+  EXPECT_CALL(*this, OnBufferingStateChanged(BUFFERING_HAVE_ENOUGH))
+      .WillOnce(InvokeWithoutArgs(&message_loop_, &base::MessageLoop::QuitNow));
+  pipeline_->Seek(seek_time,
+                  base::Bind(&PipelineIntegrationTestBase::SaveStatus,
+                             base::Unretained(this)));
   message_loop_.Run();
   return (pipeline_status_ == PIPELINE_OK);
 }
@@ -293,7 +301,6 @@ scoped_ptr<Renderer> PipelineIntegrationTestBase::CreateRenderer(
 
   scoped_ptr<RendererImpl> renderer_impl(
       new RendererImpl(message_loop_.message_loop_proxy(),
-                       demuxer_.get(),
                        audio_renderer.Pass(),
                        video_renderer.Pass()));
 
@@ -304,7 +311,7 @@ scoped_ptr<Renderer> PipelineIntegrationTestBase::CreateRenderer(
   if (clockless_playback_)
     renderer_impl->EnableClocklessVideoPlaybackForTesting();
 
-  return renderer_impl.PassAs<Renderer>();
+  return renderer_impl.Pass();
 }
 
 void PipelineIntegrationTestBase::SetDecryptor(