Enable vp09 codec string in WebM by default

media/base/mime_util_unittest.cc

 // Copyright 2015 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 <stddef.h>
 
 #include "base/macros.h"
 #include "base/strings/string_split.h"
 #include "base/strings/stringprintf.h"
 #include "base/test/scoped_command_line.h"
@@ skipping 248 matching lines @@
                                   &out_colorspace));
   if (kUsePropCodecs) {
     EXPECT_FALSE(out_is_ambiguous);
     EXPECT_EQ(kCodecH264, out_codec);
     EXPECT_EQ(H264PROFILE_BASELINE, out_profile);
     EXPECT_EQ(30, out_level);
     EXPECT_EQ(VideoColorSpace::REC709(), out_colorspace);
   }
 
   // Valid VP9 string.
-  EnableNewVp9CodecStringSupport();
   EXPECT_TRUE(ParseVideoCodecString("video/webm", "vp09.00.10.08",
                                     &out_is_ambiguous, &out_codec, &out_profile,
                                     &out_level, &out_colorspace));
   EXPECT_FALSE(out_is_ambiguous);
   EXPECT_EQ(kCodecVP9, out_codec);
   EXPECT_EQ(VP9PROFILE_PROFILE0, out_profile);
   EXPECT_EQ(10, out_level);
   EXPECT_EQ(VideoColorSpace::REC709(), out_colorspace);
 
   // Valid VP9 string with REC601 color space.
   EXPECT_TRUE(ParseVideoCodecString("video/webm", "vp09.02.10.10.01.06.06.06",
                                     &out_is_ambiguous, &out_codec, &out_profile,
                                     &out_level, &out_colorspace));
   EXPECT_FALSE(out_is_ambiguous);
   EXPECT_EQ(kCodecVP9, out_codec);
   EXPECT_EQ(VP9PROFILE_PROFILE2, out_profile);
   EXPECT_EQ(10, out_level);
   EXPECT_EQ(VideoColorSpace::REC601(), out_colorspace);
 
-  // Restore to avoid polluting other tests.
-  DisableNewVp9CodecStringSupport_ForTesting();
-
   // Ambiguous AVC string (when proprietary codecs are supported).
   EXPECT_EQ(
       kUsePropCodecs,
       ParseVideoCodecString("video/mp4", "avc3", &out_is_ambiguous, &out_codec,
                             &out_profile, &out_level, &out_colorspace));
   if (kUsePropCodecs) {
     EXPECT_TRUE(out_is_ambiguous);
     EXPECT_EQ(kCodecH264, out_codec);
     EXPECT_EQ(VIDEO_CODEC_PROFILE_UNKNOWN, out_profile);
     EXPECT_EQ(0, out_level);
@@ skipping 55 matching lines @@
 
   // Video codec is not valid for audio API.
   EXPECT_FALSE(ParseAudioCodecString("audio/webm", "vp09.00.10.08",
                                      &out_is_ambiguous, &out_codec));
 
   // Made up codec is also not valid.
   EXPECT_FALSE(ParseAudioCodecString("audio/webm", "bogus", &out_is_ambiguous,
                                      &out_codec));
 }
 
-// See deeper string parsing testing in video_codecs_unittests.cc.
-TEST(MimeUtilTest, ExperimentalMultiPartVp9) {
-
-  // Multi-part VP9 string not enabled by default.
-  EXPECT_FALSE(IsSupportedMediaFormat("video/webm", {"vp09.00.10.08"}));
-
-  // Should work if enabled.
-  EnableNewVp9CodecStringSupport();
-  EXPECT_TRUE(IsSupportedMediaFormat("video/webm", {"vp09.00.10.08"}));
-  // Restore to avoid polluting other tests.
-  DisableNewVp9CodecStringSupport_ForTesting();
-}
-
 TEST(IsCodecSupportedOnAndroidTest, EncryptedCodecsFailWithoutPlatformSupport) {
   // Vary all parameters except |has_platform_decoders|.
   MimeUtil::PlatformInfo states_to_vary = VaryAllFields();
   states_to_vary.has_platform_decoders = false;
 
   // Disable platform decoders.
   MimeUtil::PlatformInfo test_states;
   test_states.has_platform_decoders = false;
 
   // Every codec should fail since platform support is missing and we've
@@ skipping 160 matching lines @@
   }
 
   // NOTE
   // We do not call IsCodecSupportedOnAndroid because the following checks
   // are made at a higher level in mime code (parsing rather than checks for
   // platform support).
 }
 
 }  // namespace internal
 }  // namespace media