| Index: media/base/mime_util_unittest.cc
|
| diff --git a/media/base/mime_util_unittest.cc b/media/base/mime_util_unittest.cc
|
| index c682a6b397feeea862afa51a78cccff4854dd299..9d0221b690a9b5b88446d891373372cd9b24cf48 100644
|
| --- a/media/base/mime_util_unittest.cc
|
| +++ b/media/base/mime_util_unittest.cc
|
| @@ -266,7 +266,6 @@ TEST(MimeUtilTest, ParseVideoCodecString) {
|
| }
|
|
|
| // Valid VP9 string.
|
| - EnableNewVp9CodecStringSupport();
|
| EXPECT_TRUE(ParseVideoCodecString("video/webm", "vp09.00.10.08",
|
| &out_is_ambiguous, &out_codec, &out_profile,
|
| &out_level, &out_colorspace));
|
| @@ -286,9 +285,6 @@ TEST(MimeUtilTest, ParseVideoCodecString) {
|
| 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,
|
| @@ -364,19 +360,6 @@ TEST(MimeUtilTest, ParseAudioCodecString) {
|
| &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();
|
|
|