Recognize json media types as (non-image) mime types.

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"
 
@@ skipping 55 matching lines @@
 
   EXPECT_TRUE(IsSupportedImageMimeType("image/jpeg"));
   EXPECT_FALSE(IsSupportedImageMimeType("image/lolcat"));
   EXPECT_TRUE(IsSupportedNonImageMimeType("text/html"));
   EXPECT_TRUE(IsSupportedNonImageMimeType("text/css"));
   EXPECT_TRUE(IsSupportedNonImageMimeType("text/"));
   EXPECT_TRUE(IsSupportedNonImageMimeType("text/banana"));
   EXPECT_FALSE(IsSupportedNonImageMimeType("text/vcard"));
   EXPECT_FALSE(IsSupportedNonImageMimeType("application/virus"));
   EXPECT_TRUE(IsSupportedNonImageMimeType("application/x-x509-user-cert"));
+  EXPECT_TRUE(IsSupportedNonImageMimeType("application/json"));
+  EXPECT_TRUE(IsSupportedNonImageMimeType("application/+json"));
+  EXPECT_TRUE(IsSupportedNonImageMimeType("application/x-suggestions+json"));
+  EXPECT_TRUE(IsSupportedNonImageMimeType("application/x-s+json;x=2"));
 #if defined(OS_ANDROID)
   EXPECT_TRUE(IsSupportedNonImageMimeType("application/x-x509-ca-cert"));
   EXPECT_TRUE(IsSupportedNonImageMimeType("application/x-pkcs12"));
 #endif
 
   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, 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"));
   EXPECT_TRUE(MatchesMimeType("aaa*aaa", "aaaaaa"));
   EXPECT_TRUE(MatchesMimeType("*", std::string()));
   EXPECT_FALSE(MatchesMimeType("video/", "video/x-mpeg"));
   EXPECT_FALSE(MatchesMimeType(std::string(), "video/x-mpeg"));
   EXPECT_FALSE(MatchesMimeType(std::string(), std::string()));
   EXPECT_FALSE(MatchesMimeType("video/x-mpeg", std::string()));
   EXPECT_FALSE(MatchesMimeType("application/*+xml", "application/xml"));
   EXPECT_FALSE(MatchesMimeType("application/*+xml",
                                     "application/html+xmlz"));
   EXPECT_FALSE(MatchesMimeType("application/*+xml",
@@ skipping 81 matching lines @@
   std::string nonAscii("application/nonutf8");
   EXPECT_TRUE(IsMimeType(nonAscii));
 #if defined(OS_WIN)
   nonAscii.append(WideToUTF8(std::wstring(L"\u2603")));
 #else
   nonAscii.append("\u2603");  // unicode snowman
 #endif
   EXPECT_FALSE(IsMimeType(nonAscii));
 
   EXPECT_TRUE(IsMimeType("application/mime"));
+  EXPECT_TRUE(IsMimeType("application/json"));
+  EXPECT_TRUE(IsMimeType("application/x-suggestions+json"));
+  EXPECT_TRUE(IsMimeType("application/+json"));
   EXPECT_TRUE(IsMimeType("audio/mime"));
   EXPECT_TRUE(IsMimeType("example/mime"));
   EXPECT_TRUE(IsMimeType("image/mime"));
   EXPECT_TRUE(IsMimeType("message/mime"));
   EXPECT_TRUE(IsMimeType("model/mime"));
   EXPECT_TRUE(IsMimeType("multipart/mime"));
   EXPECT_TRUE(IsMimeType("text/mime"));
   EXPECT_TRUE(IsMimeType("TEXT/mime"));
   EXPECT_TRUE(IsMimeType("Text/mime"));
   EXPECT_TRUE(IsMimeType("TeXt/mime"));
@@ skipping 100 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