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 504863b65429bc402e63820e474db35fa316ffd5..1882efeff985da9f23c40435450d0d5a07cbeaab 100644 |
--- a/content/browser/media/media_canplaytype_browsertest.cc |
+++ b/content/browser/media/media_canplaytype_browsertest.cc |
@@ -404,6 +404,14 @@ IN_PROC_BROWSER_TEST_F(MediaCanPlayTypeTest, CodecSupportTest_mp4) { |
EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"avc1.42E01E\"'")); |
EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"avc3.42E01E\"'")); |
+ EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"avc3.42801E\"'")); |
+ EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"avc3.42C01E\"'")); |
+ |
+ EXPECT_EQ(kPropMaybe, CanPlay("'video/mp4; codecs=\"avc1.42E11E\"'")); |
+ EXPECT_EQ(kPropMaybe, CanPlay("'video/mp4; codecs=\"avc1.42101E\"'")); |
+ EXPECT_EQ(kPropMaybe, CanPlay("'video/mp4; codecs=\"avc1.42701E\"'")); |
+ EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"avc1.42F01E\"'")); |
+ |
EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"mp4a.40.2\"'")); |
EXPECT_EQ(kPropProbably, |
CanPlay("'video/mp4; codecs=\"avc1.42E01E, mp4a.40.2\"'")); |
@@ -430,6 +438,14 @@ IN_PROC_BROWSER_TEST_F(MediaCanPlayTypeTest, CodecSupportTest_mp4) { |
EXPECT_EQ(kPropProbably, CanPlay("'video/x-m4v; codecs=\"avc1.42E01E\"'")); |
EXPECT_EQ(kPropProbably, CanPlay("'video/x-m4v; codecs=\"avc3.42E01E\"'")); |
+ EXPECT_EQ(kPropProbably, CanPlay("'video/x-m4v; codecs=\"avc3.42801E\"'")); |
+ EXPECT_EQ(kPropProbably, CanPlay("'video/x-m4v; codecs=\"avc3.42C01E\"'")); |
+ |
+ EXPECT_EQ(kPropMaybe, CanPlay("'video/x-m4v; codecs=\"avc1.42E11E\"'")); |
+ EXPECT_EQ(kPropMaybe, CanPlay("'video/x-m4v; codecs=\"avc1.42101E\"'")); |
+ EXPECT_EQ(kPropMaybe, CanPlay("'video/x-m4v; codecs=\"avc1.42701E\"'")); |
+ EXPECT_EQ(kPropProbably, CanPlay("'video/x-m4v; codecs=\"avc1.42F01E\"'")); |
+ |
EXPECT_EQ(kPropProbably, CanPlay("'video/x-m4v; codecs=\"mp4a.40.2\"'")); |
EXPECT_EQ(kPropProbably, |
CanPlay("'video/x-m4v; codecs=\"avc1.42E01E, mp4a.40.2\"'")); |
@@ -502,6 +518,20 @@ IN_PROC_BROWSER_TEST_F(MediaCanPlayTypeTest, CodecSupportTest_HLS) { |
EXPECT_EQ(probablyCanPlayHLS, |
CanPlay("'application/x-mpegurl; codecs=\"avc3.42E01E\"'")); |
EXPECT_EQ(probablyCanPlayHLS, |
+ CanPlay("'application/x-mpegurl; codecs=\"avc3.42801E\"'")); |
+ EXPECT_EQ(probablyCanPlayHLS, |
+ CanPlay("'application/x-mpegurl; codecs=\"avc3.42C01E\"'")); |
+ |
+ EXPECT_EQ(maybeCanPlayHLS, |
+ CanPlay("'application/x-mpegurl; codecs=\"avc1.42E11E\"'")); |
+ EXPECT_EQ(maybeCanPlayHLS, |
+ CanPlay("'application/x-mpegurl; codecs=\"avc1.42101E\"'")); |
+ EXPECT_EQ(maybeCanPlayHLS, |
+ CanPlay("'application/x-mpegurl; codecs=\"avc1.42701E\"'")); |
+ EXPECT_EQ(probablyCanPlayHLS, |
+ CanPlay("'application/x-mpegurl; codecs=\"avc1.42F01E\"'")); |
+ |
+ EXPECT_EQ(probablyCanPlayHLS, |
CanPlay("'application/x-mpegurl; codecs=\"mp4a.40.2\"'")); |
EXPECT_EQ(probablyCanPlayHLS, |
CanPlay("'application/x-mpegurl; codecs=\"avc1.42E01E, mp4a.40.2\"'")); |
@@ -537,6 +567,20 @@ IN_PROC_BROWSER_TEST_F(MediaCanPlayTypeTest, CodecSupportTest_HLS) { |
EXPECT_EQ(probablyCanPlayHLS, |
CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc3.42E01E\"'")); |
EXPECT_EQ(probablyCanPlayHLS, |
+ CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc3.42801E\"'")); |
+ EXPECT_EQ(probablyCanPlayHLS, |
+ CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc3.42C01E\"'")); |
+ |
+ EXPECT_EQ(maybeCanPlayHLS, |
+ CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc1.42E11E\"'")); |
+ EXPECT_EQ(maybeCanPlayHLS, |
+ CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc1.42101E\"'")); |
+ EXPECT_EQ(maybeCanPlayHLS, |
+ CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc1.42701E\"'")); |
+ EXPECT_EQ(probablyCanPlayHLS, |
+ CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc1.42F01E\"'")); |
+ |
+ EXPECT_EQ(probablyCanPlayHLS, |
CanPlay("'application/vnd.apple.mpegurl; codecs=\"mp4a.40.2\"'")); |
EXPECT_EQ(maybeCanPlayHLS, |