Enable VP9 in MP4 by default

content/browser/media/media_canplaytype_browsertest.cc

Index: content/browser/media/media_canplaytype_browsertest.cc
diff --git a/content/browser/media/media_canplaytype_browsertest.cc b/content/browser/media/media_canplaytype_browsertest.cc
index 3235bdf155f80661cdcb5bdf52e92f713f5f5d66..f9e859ba7b8bc05a74de64d1ceaeb90092df012a 100644
--- a/content/browser/media/media_canplaytype_browsertest.cc
+++ b/content/browser/media/media_canplaytype_browsertest.cc
@@ -851,7 +851,6 @@ IN_PROC_BROWSER_TEST_F(MediaCanPlayTypeTest, CodecSupportTest_mp4) {
   EXPECT_EQ(kHevcSupported,
             CanPlay("'video/mp4; codecs=\"hvc1.1.6.L93.B0, mp4a.40.5\"'"));
 
-  // switches::kEnableVp9InMp4 is enabled in MediaBrowserTest.
   EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"vp09.00.10.08\"'"));
 
   TestMPEGUnacceptableCombinations("video/mp4");
@@ -1533,24 +1532,19 @@ IN_PROC_BROWSER_TEST_P(MediaCanPlayNewVp9TypeTest,
 
   // Platform support is sadly ambiguous for profiles > 0.
   // TODO(chcunningham): Plumb proper querying of platform support - give a firm
-  // answer.
+  // answer. See https://crbug.com/604566.
   EXPECT_EQ(new_vp9_maybe, CanPlay(mime_prefix + "codecs=\"vp09.01.10.08\"'"));
   EXPECT_EQ(new_vp9_maybe, CanPlay(mime_prefix + "codecs=\"vp09.02.10.08\"'"));
   EXPECT_EQ(new_vp9_maybe, CanPlay(mime_prefix + "codecs=\"vp09.03.10.08\"'"));
 }
 
 const CanPlayTypeNewVp9Params kNewVp9ParamVariants[] = {
-    // Expect CanPlay(...) = kNotEmpty when command line flag empty.
-    {"", "video/mp4", kNot, kNot},
+    // Expect CanPlay(...) = kProbably/kMaybe for MP4 as MP4 supports new style
+    // codec string unconditionally.
+    {"", "video/mp4", kPropProbably, kPropMaybe},
+    // Expect CanPlay(...) = kProbably/kMaybe for WebM, only if the relevant
+    // flags are enabled..
     {"", "video/webm", kNot, kNot},
-    // Expect CanPlay(...) = kProbably/kMaybe for MP4, but not for WebM for
-    // these command line flags.
-    {switches::kEnableVp9InMp4, "video/mp4", kPropProbably, kPropMaybe},
-    {switches::kEnableVp9InMp4, "video/webm", kNot, kNot},
-    // Expect CanPlay(...) = kProbably/kMaybe for WebM, but not for MP4 for
-    // these command line flags.
-    {switches::kEnableHDR, "video/mp4", kNot, kNot},
-    {switches::kEnableNewVp9CodecString, "video/mp4", kNot, kNot},
     {switches::kEnableHDR, "video/webm", kProbably, kMaybe},
     {switches::kEnableNewVp9CodecString, "video/webm", kProbably, kMaybe},
 };