Fix certificate and keychain installation on Android.

net/base/mime_util.h

Index: net/base/mime_util.h
diff --git a/net/base/mime_util.h b/net/base/mime_util.h
index c8dfe86380985147bb93a53778d39fd2d1286ac7..1906eb53b07fa4724eea570400104cda91320b97 100644
--- a/net/base/mime_util.h
+++ b/net/base/mime_util.h
@@ -44,6 +44,7 @@ NET_EXPORT bool IsSupportedMediaMimeType(const std::string& mime_type);
 NET_EXPORT bool IsSupportedNonImageMimeType(const std::string& mime_type);
 NET_EXPORT bool IsUnsupportedTextMimeType(const std::string& mime_type);
 NET_EXPORT bool IsSupportedJavascriptMimeType(const std::string& mime_type);
+NET_EXPORT bool IsSupportedCertificateMimeType(const std::string& mime_type);
 
 // Get whether this mime type should be displayed in view-source mode.
 // (For example, XML.)
@@ -111,6 +112,22 @@ NET_EXPORT void GetMediaCodecsBlacklistedForTests(
 // Supported media types are defined at:
 // http://www.iana.org/assignments/media-types/index.html
 NET_EXPORT const std::string GetIANAMediaType(const std::string& mime_type);
+
+// A list of supported certificate-related mime types.
+//
+// IMPORTANT: These values *must* match the ones found in:
+//  net/android/java/src/org/chromium/net/AndroidNetworkLibrary.java

[darin (slow to review), 2012/11/27 05:24:34]

Instead of writing this comment, is it possible to construct some kind of
assertion that runs at build time?  It seems very fragile to rely on comments
for this sort of thing.  Has anyone considered some kind of auto-gen solution
for keeping these constants in sync?

It also looks like you have a bug.  The values of the constants don't match up!

[digit1, 2012/11/27 10:19:48]

This has been discussed on chromium-dev and actually implemented as a special
case in https://chromiumcodereview.appspot.com/10912136 for
net/base/net_error_list.h, but there is no general solution for this yet. I'll
try to cook something in a different patch first then.

Good catch otherwise :) Didn't see it during manual testing because the platform
doesn't distinguish between user and CA certs at the moment. :/

+//
+enum CertificateMimeType {
+  CERTIFICATE_MIME_TYPE_UNKNOWN = 0,
+  CERTIFICATE_MIME_TYPE_X509_USER_CERT = 1,
+  CERTIFICATE_MIME_TYPE_X509_CA_CERT = 2,
+  CERTIFICATE_MIME_TYPE_PKCS12_ARCHIVE = 3,
+};
+
+NET_EXPORT CertificateMimeType GetCertificateMimeTypeForMimeType(
+    const std::string& mime_type);
+
 }  // namespace net
 
 #endif  // NET_BASE_MIME_UTIL_H__