Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(427)

Unified Diff: net/base/mime_util_unittest.cc

Issue 218303002: Fix: canPlayType() gives false positive for */ogg and audio/x-wav (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressing comments Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/base/mime_util.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/base/mime_util_unittest.cc
diff --git a/net/base/mime_util_unittest.cc b/net/base/mime_util_unittest.cc
index 3bb49956431f087083b85d5d179bd6d12da6d01e..568f4353097a72b981e64d619a9ea5869e706e4d 100644
--- a/net/base/mime_util_unittest.cc
+++ b/net/base/mime_util_unittest.cc
@@ -94,6 +94,42 @@ TEST(MimeUtilTest, LookupTypes) {
EXPECT_FALSE(IsSupportedNonImageMimeType("application/vnd.doc;x=y+json"));
}
+TEST(MimeUtilTest, StrictMediaMimeType) {
+ EXPECT_TRUE(IsStrictMediaMimeType("video/webm"));
+ EXPECT_TRUE(IsStrictMediaMimeType("audio/webm"));
+
+ EXPECT_TRUE(IsStrictMediaMimeType("audio/wav"));
+ EXPECT_TRUE(IsStrictMediaMimeType("audio/x-wav"));
+
+#if defined(OS_ANDROID)
+ EXPECT_FALSE(IsStrictMediaMimeType("video/ogg"));
+#else
+ EXPECT_TRUE(IsStrictMediaMimeType("video/ogg"));
+#endif // OS_ANDROID
+ EXPECT_TRUE(IsStrictMediaMimeType("audio/ogg"));
+ EXPECT_TRUE(IsStrictMediaMimeType("application/ogg"));
+
+ // TODO(amogh.bihani): Fix these test when bug 53193 is fixed.
Ryan Sleevi 2014/04/07 16:47:47 nit: Rather than "fix these", which is somewhat am
amogh.bihani 2014/04/08 03:29:14 Done.
+ // http://crbug.com/53193 ----------------------------------------------------
+ EXPECT_FALSE(IsStrictMediaMimeType("audio/mpeg"));
+ EXPECT_FALSE(IsStrictMediaMimeType("audio/mp3"));
+ EXPECT_FALSE(IsStrictMediaMimeType("audio/x-mp3"));
+
+ EXPECT_FALSE(IsStrictMediaMimeType("video/mp4"));
+ EXPECT_FALSE(IsStrictMediaMimeType("video/x-mp4v"));
+ EXPECT_FALSE(IsStrictMediaMimeType("audio/mp4"));
+ EXPECT_FALSE(IsStrictMediaMimeType("audio/x-mp4a"));
+
+ EXPECT_FALSE(IsStrictMediaMimeType("application/x-mpegurl"));
+ EXPECT_FALSE(IsStrictMediaMimeType("application/vnd.apple.mpegurl"));
+ // ---------------------------------------------------------------------------
+
+ EXPECT_FALSE(IsStrictMediaMimeType("video/unknown"));
+ EXPECT_FALSE(IsStrictMediaMimeType("audio/unknown"));
+ EXPECT_FALSE(IsStrictMediaMimeType("application/unknown"));
+ EXPECT_FALSE(IsStrictMediaMimeType("unknown/unknown"));
+}
+
TEST(MimeUtilTest, MatchesMimeType) {
EXPECT_TRUE(MatchesMimeType("*", "video/x-mpeg"));
EXPECT_TRUE(MatchesMimeType("video/*", "video/x-mpeg"));
« no previous file with comments | « net/base/mime_util.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698