Fix: canPlayType() gives false positive for */ogg and audio/x-wav

net/base/mime_util_unittest.cc

 // Copyright (c) 2012 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 "base/basictypes.h"
 #include "base/strings/string_split.h"
 #include "base/strings/utf_string_conversions.h"
 #include "net/base/mime_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+#if defined(OS_ANDROID)
+#define EXPECT_TRUE_NON_ANDROID EXPECT_FALSE

[scherkus (not reviewing), 2014/04/02 16:26:46]

considering this is only used in one place I don't think it's worth defining a
macro here -- put the #if defined(OS_ANDROID) check in the test itself

[amogh.bihani, 2014/04/03 03:57:13]

Done.

+#else
+#define EXPECT_TRUE_NON_ANDROID EXPECT_TRUE
+#endif  // OS_ANDROID
+
 namespace net {
 
 TEST(MimeUtilTest, ExtensionTest) {
   const struct {
     const base::FilePath::CharType* extension;
     const char* mime_type;
     bool valid;
   } tests[] = {
     { FILE_PATH_LITERAL("png"), "image/png", true },
     { FILE_PATH_LITERAL("css"), "text/css", true },
@@ skipping 66 matching lines @@
   EXPECT_TRUE(IsSupportedMimeType("image/jpeg"));
   EXPECT_FALSE(IsSupportedMimeType("image/lolcat"));
   EXPECT_TRUE(IsSupportedMimeType("text/html"));
   EXPECT_TRUE(IsSupportedMimeType("text/banana"));
   EXPECT_FALSE(IsSupportedMimeType("text/vcard"));
   EXPECT_FALSE(IsSupportedMimeType("application/virus"));
   EXPECT_FALSE(IsSupportedMimeType("application/x-json"));
   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"));
+
+  EXPECT_TRUE_NON_ANDROID(IsStrictMediaMimeType("video/ogg"));
+  EXPECT_TRUE(IsStrictMediaMimeType("audio/ogg"));
+  EXPECT_TRUE(IsStrictMediaMimeType("application/ogg"));
+
+  // TODO(amogh.bihani): Fix these test when bug 53193 is fixed.
+  // 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"));
   EXPECT_TRUE(MatchesMimeType("video/*", "video/*"));
   EXPECT_TRUE(MatchesMimeType("video/x-mpeg", "video/x-mpeg"));
   EXPECT_TRUE(MatchesMimeType("application/*+xml",
                                    "application/html+xml"));
   EXPECT_TRUE(MatchesMimeType("application/*+xml", "application/+xml"));
   EXPECT_TRUE(MatchesMimeType("application/*+json",
                                    "application/x-myformat+json"));
@@ skipping 214 matching lines @@
   std::string post_data;
   AddMultipartValueForUpload("value name", "value", "boundary",
                              "content type", &post_data);
   AddMultipartValueForUpload("value name", "value", "boundary",
                              "", &post_data);
   AddMultipartFinalDelimiterForUpload("boundary", &post_data);
   EXPECT_STREQ(ref_output, post_data.c_str());
 }
 
 }  // namespace net