Test fixes for M57 ffmpeg roll.

media/test/pipeline_integration_test_base.cc

Index: media/test/pipeline_integration_test_base.cc
diff --git a/media/test/pipeline_integration_test_base.cc b/media/test/pipeline_integration_test_base.cc
index 422caa31f30c874e92b0f45e2056667b1b2673ef..f40f590f0bcb73b2ec0c757c5be92beaaae0ec9e 100644
--- a/media/test/pipeline_integration_test_base.cc
+++ b/media/test/pipeline_integration_test_base.cc
@@ -35,6 +35,7 @@ using ::testing::AtLeast;
 using ::testing::AtMost;
 using ::testing::Invoke;
 using ::testing::InvokeWithoutArgs;
+using ::testing::Return;
 using ::testing::SaveArg;
 
 namespace media {
@@ -151,7 +152,7 @@ PipelineStatus PipelineIntegrationTestBase::StartInternal(
       .WillRepeatedly(
           Invoke(this, &PipelineIntegrationTestBase::CheckDuration));
   EXPECT_CALL(*this, OnVideoNaturalSizeChange(_)).Times(AtMost(1));
-  EXPECT_CALL(*this, OnVideoOpacityChange(_)).Times(AtMost(1));
+  EXPECT_CALL(*this, OnVideoOpacityChange(_)).WillRepeatedly(Return());

[DaleCurtis, 2017/01/18 18:20:31]

.Times(AnyNumber()) also works.

[liberato (no reviews please), 2017/01/18 18:49:29]

didn't know that, thanks!

   CreateDemuxer(std::move(data_source));
 
   if (cdm_context) {