Enable VP9 in MP4 by default

media/filters/chunk_demuxer_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/filters/chunk_demuxer.h"
 
 #include <stddef.h>
 #include <stdint.h>
 #include <algorithm>
 #include <utility>
@@ skipping 4752 matching lines @@
   ASSERT_TRUE(AppendInitSegmentWithSourceId(kId1, HAS_AUDIO | HAS_VIDEO));
   EXPECT_NE(nullptr, GetStream(DemuxerStream::AUDIO));
   EXPECT_NE(nullptr, GetStream(DemuxerStream::VIDEO));
 
   // Removing the id should remove also the DemuxerStreams.
   demuxer_->RemoveId(kId1);
   EXPECT_EQ(nullptr, GetStream(DemuxerStream::AUDIO));
   EXPECT_EQ(nullptr, GetStream(DemuxerStream::VIDEO));
 }
 
+TEST_F(ChunkDemuxerTest, Mp4Vp9CodecSupport) {
+  ChunkDemuxer::Status expected = ChunkDemuxer::kNotSupported;
+#if BUILDFLAG(USE_PROPRIETARY_CODECS)
+  expected = ChunkDemuxer::kOk;
+#endif
+
+  EXPECT_EQ(demuxer_->AddId("source_id", "video/mp4", "vp09.00.10.08"),
+            expected);
+}
+
 // TODO(servolk): Add a unit test with multiple audio/video tracks using the
 // same codec type in a single SourceBufferState, when WebM parser supports
 // multiple tracks. crbug.com/646900
 
-class ChunkDemuxerMp4Vp9Test : public ChunkDemuxerTest,
-                               public WithParamInterface<bool> {
- public:
-  void SetUp() override {
-    ChunkDemuxerTest::SetUp();
-    const bool enable_mp4_vp9_demuxing = GetParam();
-    if (enable_mp4_vp9_demuxing) {
-      base::CommandLine::ForCurrentProcess()->AppendSwitch(
-          switches::kEnableVp9InMp4);
-    }
-  }
-};
-
-TEST_P(ChunkDemuxerMp4Vp9Test, CodecSupport) {
-  ChunkDemuxer::Status expected = ChunkDemuxer::kNotSupported;
-
-#if BUILDFLAG(USE_PROPRIETARY_CODECS)
-  const bool enable_mp4_vp9_demuxing = GetParam();
-  if (enable_mp4_vp9_demuxing) {
-    expected = ChunkDemuxer::kOk;
-  } else {
-    EXPECT_MEDIA_LOG(
-        HasSubstr("Codec 'vp09.00.10.08' is not supported for 'video/mp4'"));
-  }
-#endif
-
-  EXPECT_EQ(demuxer_->AddId("source_id", "video/mp4", "vp09.00.10.08"),
-            expected);
-}
-
-INSTANTIATE_TEST_CASE_P(EnableDisableMp4Vp9Demuxing,
-                        ChunkDemuxerMp4Vp9Test,
-                        ::testing::Bool());
-
 }  // namespace media