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

Unified Diff: net/base/mime_util_unittest.cc

Issue 228823003: Adding check for MIME types that do not take codecs parameter (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 8 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
« net/base/mime_util.h ('K') | « 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 27205815647bf5667bc4a319c77c20f44f1b78bb..f7a7a57a903bfb3e0ae2d68e15aecaa44966e1a6 100644
--- a/net/base/mime_util_unittest.cc
+++ b/net/base/mime_util_unittest.cc
@@ -105,16 +105,16 @@ TEST(MimeUtilTest, StrictMediaMimeType) {
EXPECT_TRUE(IsStrictMediaMimeType("audio/ogg"));
EXPECT_TRUE(IsStrictMediaMimeType("application/ogg"));
- // TODO(amogh.bihani): These formats should be in stict-format_map_. This will
- // be fixed with bug 53193 (http://crbug.com/53193)---------------------------
EXPECT_FALSE(IsStrictMediaMimeType("audio/mpeg"));
EXPECT_FALSE(IsStrictMediaMimeType("audio/mp3"));
EXPECT_FALSE(IsStrictMediaMimeType("audio/x-mp3"));
+ // TODO(amogh.bihani): These formats should be in stict_format_map_. This will
+ // be fixed with bug 53193 (http://crbug.com/53193)---------------------------
scherkus (not reviewing) 2014/04/10 18:30:11 nit: you can just say "This will be fixed in http:
amogh.bihani 2014/04/11 05:24:07 Done.
EXPECT_FALSE(IsStrictMediaMimeType("video/mp4"));
- EXPECT_FALSE(IsStrictMediaMimeType("video/x-mp4v"));
+ EXPECT_FALSE(IsStrictMediaMimeType("video/x-m4v"));
EXPECT_FALSE(IsStrictMediaMimeType("audio/mp4"));
- EXPECT_FALSE(IsStrictMediaMimeType("audio/x-mp4a"));
+ EXPECT_FALSE(IsStrictMediaMimeType("audio/x-m4a"));
Ryan Sleevi 2014/04/10 19:04:16 Seems like an unrelated change?
amogh.bihani 2014/04/11 05:24:07 Yes it is an unrelated change. This test was added
EXPECT_FALSE(IsStrictMediaMimeType("application/x-mpegurl"));
EXPECT_FALSE(IsStrictMediaMimeType("application/vnd.apple.mpegurl"));
@@ -126,6 +126,35 @@ TEST(MimeUtilTest, StrictMediaMimeType) {
EXPECT_FALSE(IsStrictMediaMimeType("unknown/unknown"));
}
+TEST(MimeUtilTest, MimeTypeDoesNotNeedCodecs) {
+ EXPECT_TRUE(MimeTypeDoesNotNeedCodecs("audio/mpeg"));
+ EXPECT_TRUE(MimeTypeDoesNotNeedCodecs("audio/mp3"));
+ EXPECT_TRUE(MimeTypeDoesNotNeedCodecs("audio/x-mp3"));
+
+ EXPECT_FALSE(MimeTypeDoesNotNeedCodecs("audio/webm"));
+ EXPECT_FALSE(MimeTypeDoesNotNeedCodecs("video/webm"));
+
+ EXPECT_FALSE(MimeTypeDoesNotNeedCodecs("audio/wav"));
+ EXPECT_FALSE(MimeTypeDoesNotNeedCodecs("audio/x-wav"));
+
+ EXPECT_FALSE(MimeTypeDoesNotNeedCodecs("audio/ogg"));
+ EXPECT_FALSE(MimeTypeDoesNotNeedCodecs("video/ogg"));
+ EXPECT_FALSE(MimeTypeDoesNotNeedCodecs("application/ogg"));
+
+ EXPECT_FALSE(MimeTypeDoesNotNeedCodecs("audio/mp4"));
+ EXPECT_FALSE(MimeTypeDoesNotNeedCodecs("video/mp4"));
+ EXPECT_FALSE(MimeTypeDoesNotNeedCodecs("audio/x-m4a"));
+ EXPECT_FALSE(MimeTypeDoesNotNeedCodecs("video/x-m4v"));
+
+ EXPECT_FALSE(MimeTypeDoesNotNeedCodecs("application/x-mpegurl"));
+ EXPECT_FALSE(MimeTypeDoesNotNeedCodecs("application/vnd.apple.mpegurl"));
+
+ EXPECT_FALSE(MimeTypeDoesNotNeedCodecs("video/unknown"));
+ EXPECT_FALSE(MimeTypeDoesNotNeedCodecs("audio/unknown"));
+ EXPECT_FALSE(MimeTypeDoesNotNeedCodecs("application/unknown"));
+ EXPECT_FALSE(MimeTypeDoesNotNeedCodecs("unknown/unknown"));
+}
+
TEST(MimeUtilTest, MatchesMimeType) {
EXPECT_TRUE(MatchesMimeType("*", "video/x-mpeg"));
EXPECT_TRUE(MatchesMimeType("video/*", "video/x-mpeg"));
« net/base/mime_util.h ('K') | « net/base/mime_util.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698