Run ac3, eac3 and hevc unit tests in all configs

media/filters/ffmpeg_demuxer_unittest.cc

Index: media/filters/ffmpeg_demuxer_unittest.cc
diff --git a/media/filters/ffmpeg_demuxer_unittest.cc b/media/filters/ffmpeg_demuxer_unittest.cc
index e22e4545916e8f4cd413beedf0308150ac6ead0f..14e9ea024dad862182280a1c121637bc84a676db 100644
--- a/media/filters/ffmpeg_demuxer_unittest.cc
+++ b/media/filters/ffmpeg_demuxer_unittest.cc
@@ -100,11 +100,12 @@ class FFmpegDemuxerTest : public testing::Test {
 
   void InitializeDemuxerWithTimelineOffset(bool enable_text,
                                            base::Time timeline_offset) {
-    EXPECT_CALL(host_, SetDuration(_));
+    if (demuxer_init_expected_status_ == PIPELINE_OK)

[ddorwin, 2016/01/23 00:38:56]

This doesn't really need to be a member.

Add InitializeDemuxerExpectUnsupportedFormat() or something like that to pass
DEMUXER_ERROR_NO_SUPPORTED_STREAMS to this function as |expected_status|. Since
we have two calls anyway (in the #if and #else), this will be clearer

[servolk, 2016/02/10 18:58:50]

Done.

+      EXPECT_CALL(host_, SetDuration(_));
     WaitableMessageLoopEvent event;
     demuxer_->Initialize(&host_, event.GetPipelineStatusCB(), enable_text);
     demuxer_->timeline_offset_ = timeline_offset;
-    event.RunAndWaitForStatus(PIPELINE_OK);
+    event.RunAndWaitForStatus(demuxer_init_expected_status_);
   }
 
   void InitializeDemuxerText(bool enable_text) {

[ddorwin, 2016/01/23 00:38:56]

Unrelated except that it may avoid adding an |expected_status| parameter here:

Calling this from InitializeDemuxer() seems overly complex. This should probably
just be called InitializeDemuxerWithText() then InitializeDemuxer should call
the function below directly. That also avoids unclear |true| parameters at the
call site.

WDYT?

[servolk, 2016/02/10 18:58:50]

Yeah, I think it would be cleaner if we just had a single InitializeDemuxer
method with 3 parameters, and then we can use default arguments to keep usage
simple for most common cases.

@@ -205,6 +206,7 @@ class FFmpegDemuxerTest : public testing::Test {
   // Fixture members.
   scoped_ptr<FileDataSource> data_source_;
   scoped_ptr<FFmpegDemuxer> demuxer_;
+  media::PipelineStatus demuxer_init_expected_status_ = PIPELINE_OK;
   StrictMock<MockDemuxerHost> host_;
   base::MessageLoop message_loop_;
 
@@ -1117,9 +1119,9 @@ TEST_F(FFmpegDemuxerTest, NaturalSizeWithPASP) {
 
 #endif
 
-#if BUILDFLAG(ENABLE_HEVC_DEMUXING)
 TEST_F(FFmpegDemuxerTest, HEVC_in_MP4_container) {
   CreateDemuxer("bear-hevc-frag.mp4");
+#if BUILDFLAG(ENABLE_HEVC_DEMUXING)
   InitializeDemuxer();
 
   DemuxerStream* video = demuxer_->GetStream(DemuxerStream::VIDEO);
@@ -1130,12 +1132,15 @@ TEST_F(FFmpegDemuxerTest, HEVC_in_MP4_container) {
 
   video->Read(NewReadCB(FROM_HERE, 1042, 200200, false));
   message_loop_.Run();
-}
+#else
+  demuxer_init_expected_status_ = DEMUXER_ERROR_NO_SUPPORTED_STREAMS;
+  InitializeDemuxer();
 #endif
+}
 
-#if BUILDFLAG(ENABLE_AC3_EAC3_AUDIO_DEMUXING)
 TEST_F(FFmpegDemuxerTest, Read_AC3_Audio) {
   CreateDemuxer("bear-ac3-only-frag.mp4");
+#if BUILDFLAG(ENABLE_AC3_EAC3_AUDIO_DEMUXING)
   InitializeDemuxer();
 
   // Attempt a read from the audio stream and run the message loop until done.
@@ -1147,10 +1152,15 @@ TEST_F(FFmpegDemuxerTest, Read_AC3_Audio) {
 
   audio->Read(NewReadCB(FROM_HERE, 836, 34830, true));
   message_loop_.Run();
+#else
+  demuxer_init_expected_status_ = DEMUXER_ERROR_NO_SUPPORTED_STREAMS;
+  InitializeDemuxer();
+#endif
 }
 
 TEST_F(FFmpegDemuxerTest, Read_EAC3_Audio) {
   CreateDemuxer("bear-eac3-only-frag.mp4");
+#if BUILDFLAG(ENABLE_AC3_EAC3_AUDIO_DEMUXING)
   InitializeDemuxer();
 
   // Attempt a read from the audio stream and run the message loop until done.
@@ -1162,7 +1172,10 @@ TEST_F(FFmpegDemuxerTest, Read_EAC3_Audio) {
 
   audio->Read(NewReadCB(FROM_HERE, 872, 34830, true));
   message_loop_.Run();
+#else
+  demuxer_init_expected_status_ = DEMUXER_ERROR_NO_SUPPORTED_STREAMS;
+  InitializeDemuxer();
+#endif
 }
-#endif  // ENABLE_AC3_EAC3_AUDIO_DEMUXING
 
 }  // namespace media