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..b521d68bd8edd5964d635e177ae71cd1844a72d8 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 crypto-related mime types.

[Ryan Sleevi, 2012/11/15 20:06:04]

nit: certificate-related

+//
+// IMPORTANT: These values *must* match the ones found in:
+//  net/android/java/src/org/chromium/net/AndroidNetworkLibrary.java
+//
+enum CertificateType {
+    CERTIFICATE_TYPE_UNKNOWN         = 0,
+    CERTIFICATE_TYPE_X509_USER_CERT  = 1,
+    CERTIFICATE_TYPE_X509_CA_CERT    = 2,
+    CERTIFICATE_TYPE_PKCS12_ARCHIVE = 3,

[Ryan Sleevi, 2012/11/15 20:06:04]

nit: whitespace

+};
+
+NET_EXPORT CertificateType GetCertificateTypeForMimeType(
+    const std::string& mime_type);
+
 }  // namespace net
 
 #endif  // NET_BASE_MIME_UTIL_H__