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

Unified Diff: components/mime_util/mime_util_unittest.cc

Issue 1423663012: Removing x-x509-user-cert mime handler. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 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
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..a85904a8ae34267f0a26363c379d2ee9e626a952 100644
--- a/components/mime_util/mime_util_unittest.cc
+++ b/components/mime_util/mime_util_unittest.cc
@@ -26,12 +26,12 @@ 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-user-cert"));
EXPECT_TRUE(IsSupportedNonImageMimeType("application/x-x509-ca-cert"));
EXPECT_TRUE(IsSupportedNonImageMimeType("application/x-pkcs12"));
#if 0 // Disabled until http://crbug.com/318217 is resolved.
@@ -56,11 +56,11 @@ TEST(MimeUtilTest, LookupTypes) {
}
TEST(MimeUtilTest, TestGetCertificateMimeTypeForMimeType) {
+#if defined(OS_ANDROID)
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"));
@@ -68,6 +68,10 @@ TEST(MimeUtilTest, TestGetCertificateMimeTypeForMimeType) {
GetCertificateMimeTypeForMimeType("application/x-pkcs12"));
#else
EXPECT_EQ(net::CERTIFICATE_MIME_TYPE_UNKNOWN,
+ GetCertificateMimeTypeForMimeType("application/x-x509-user-cert"));
+ EXPECT_EQ(net::CERTIFICATE_MIME_TYPE_UNKNOWN,
+ GetCertificateMimeTypeForMimeType("Application/X-X509-USER-CERT"));
+ EXPECT_EQ(net::CERTIFICATE_MIME_TYPE_UNKNOWN,
GetCertificateMimeTypeForMimeType("application/x-x509-ca-cert"));
EXPECT_EQ(net::CERTIFICATE_MIME_TYPE_UNKNOWN,
GetCertificateMimeTypeForMimeType("application/x-pkcs12"));

Powered by Google App Engine
This is Rietveld 408576698