Index: components/mime_util/mime_util_unittest.cc |
diff --git a/components/mime_util/mime_util_unittest.cc b/components/mime_util/mime_util_unittest.cc |
index c44be23b45ee7abe93d79364fb883251bb56ccef..42e714d3b1cebb635a8ae174cc7f4229cbc68288 100644 |
--- a/components/mime_util/mime_util_unittest.cc |
+++ b/components/mime_util/mime_util_unittest.cc |
@@ -26,14 +26,11 @@ TEST(MimeUtilTest, LookupTypes) { |
EXPECT_FALSE(IsSupportedNonImageMimeType("text/vcard")); |
EXPECT_FALSE(IsSupportedNonImageMimeType("application/virus")); |
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")); |
#if 0 // Disabled until http://crbug.com/318217 is resolved. |
EXPECT_TRUE(IsSupportedMediaMimeType("application/vnd.apple.mpegurl")); |
EXPECT_TRUE(IsSupportedMediaMimeType("application/x-mpegurl")); |
@@ -55,25 +52,4 @@ TEST(MimeUtilTest, LookupTypes) { |
EXPECT_FALSE(IsSupportedNonImageMimeType("Application/VND.DOC;X=Y+JSON")); |
} |
-TEST(MimeUtilTest, TestGetCertificateMimeTypeForMimeType) { |
- EXPECT_EQ(net::CERTIFICATE_MIME_TYPE_X509_USER_CERT, |
- GetCertificateMimeTypeForMimeType("application/x-x509-user-cert")); |
- EXPECT_EQ(net::CERTIFICATE_MIME_TYPE_X509_USER_CERT, |
- GetCertificateMimeTypeForMimeType("Application/X-X509-USER-CERT")); |
-#if defined(OS_ANDROID) |
- // Only Android supports CA Certs and PKCS12 archives. |
- EXPECT_EQ(net::CERTIFICATE_MIME_TYPE_X509_CA_CERT, |
- GetCertificateMimeTypeForMimeType("application/x-x509-ca-cert")); |
- EXPECT_EQ(net::CERTIFICATE_MIME_TYPE_PKCS12_ARCHIVE, |
- GetCertificateMimeTypeForMimeType("application/x-pkcs12")); |
-#else |
- EXPECT_EQ(net::CERTIFICATE_MIME_TYPE_UNKNOWN, |
- GetCertificateMimeTypeForMimeType("application/x-x509-ca-cert")); |
- EXPECT_EQ(net::CERTIFICATE_MIME_TYPE_UNKNOWN, |
- GetCertificateMimeTypeForMimeType("application/x-pkcs12")); |
-#endif |
- EXPECT_EQ(net::CERTIFICATE_MIME_TYPE_UNKNOWN, |
- GetCertificateMimeTypeForMimeType("text/plain")); |
-} |
- |
} // namespace mime_util |