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

Unified Diff: components/mime_util/mime_util.cc

Issue 1423663012: Removing x-x509-user-cert mime handler. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removing certificate mime types. Created 5 years 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.cc
diff --git a/components/mime_util/mime_util.cc b/components/mime_util/mime_util.cc
index fa7471bc4be5ae204f0ad676fe2f5d962b95ca02..c0a139c1293100f1be97ea9453f209a6572d48d1 100644
--- a/components/mime_util/mime_util.cc
+++ b/components/mime_util/mime_util.cc
@@ -18,20 +18,6 @@ namespace mime_util {
namespace {
-// Dictionary of cryptographic file mime types.
-struct CertificateMimeTypeInfo {
- const char* const mime_type;
- net::CertificateMimeType cert_type;
-};
-
-const CertificateMimeTypeInfo kSupportedCertificateTypes[] = {
- {"application/x-x509-user-cert", net::CERTIFICATE_MIME_TYPE_X509_USER_CERT},
-#if defined(OS_ANDROID)
- {"application/x-x509-ca-cert", net::CERTIFICATE_MIME_TYPE_X509_CA_CERT},
- {"application/x-pkcs12", net::CERTIFICATE_MIME_TYPE_PKCS12_ARCHIVE},
-#endif
-};
-
// From WebKit's WebCore/platform/MIMETypeRegistry.cpp:
const char* const kSupportedImageTypes[] = {"image/jpeg",
@@ -146,8 +132,6 @@ MimeUtil::MimeUtil() {
javascript_types_.insert(kSupportedJavascriptTypes[i]);
non_image_types_.insert(kSupportedJavascriptTypes[i]);
}
- for (size_t i = 0; i < arraysize(kSupportedCertificateTypes); ++i)
- non_image_types_.insert(kSupportedCertificateTypes[i].mime_type);
}
bool MimeUtil::IsSupportedImageMimeType(const std::string& mime_type) const {
@@ -207,28 +191,8 @@ bool IsSupportedJavascriptMimeType(const std::string& mime_type) {
return g_mime_util.Get().IsSupportedJavascriptMimeType(mime_type);
}
-bool IsSupportedCertificateMimeType(const std::string& mime_type) {
- net::CertificateMimeType file_type =
- GetCertificateMimeTypeForMimeType(mime_type);
- return file_type != net::CERTIFICATE_MIME_TYPE_UNKNOWN;
-}
-
bool IsSupportedMimeType(const std::string& mime_type) {
return g_mime_util.Get().IsSupportedMimeType(mime_type);
}
-net::CertificateMimeType GetCertificateMimeTypeForMimeType(
- const std::string& mime_type) {
- // Don't create a map, there is only one entry in the table,
- // except on Android.
- for (size_t i = 0; i < arraysize(kSupportedCertificateTypes); ++i) {
- if (base::EqualsCaseInsensitiveASCII(
- mime_type, kSupportedCertificateTypes[i].mime_type)) {
- return kSupportedCertificateTypes[i].cert_type;
- }
- }
-
- return net::CERTIFICATE_MIME_TYPE_UNKNOWN;
-}
-
} // namespace mime_util

Powered by Google App Engine
This is Rietveld 408576698