| Index: media/base/pipeline_impl_unittest.cc
|
| ===================================================================
|
| --- media/base/pipeline_impl_unittest.cc (revision 113907)
|
| +++ media/base/pipeline_impl_unittest.cc (working copy)
|
| @@ -21,13 +21,11 @@
|
| using ::testing::DeleteArg;
|
| using ::testing::InSequence;
|
| using ::testing::Invoke;
|
| -using ::testing::InvokeArgument;
|
| using ::testing::Mock;
|
| using ::testing::NotNull;
|
| using ::testing::Return;
|
| using ::testing::ReturnRef;
|
| using ::testing::StrictMock;
|
| -using ::testing::WithArg;
|
|
|
| namespace media {
|
|
|
| @@ -128,7 +126,7 @@
|
| void InitializeVideoDecoder(MockDemuxerStream* stream) {
|
| EXPECT_CALL(*mocks_->video_decoder(),
|
| Initialize(stream, _, _))
|
| - .WillOnce(WithArg<1>(Invoke(&RunPipelineStatusOKCB)));
|
| + .WillOnce(Invoke(&RunFilterCallback3));
|
| EXPECT_CALL(*mocks_->video_decoder(), SetPlaybackRate(0.0f));
|
| EXPECT_CALL(*mocks_->video_decoder(),
|
| Seek(mocks_->demuxer()->GetStartTime(), _))
|
|
|
| Property changes on: media/base/pipeline_impl_unittest.cc
|
| ___________________________________________________________________
|
| Added: svn:mergeinfo
|
|
|
|
|