Upstream certificate and mime Android implementation.

net/base/x509_certificate_openssl.cc

Index: net/base/x509_certificate_openssl.cc
diff --git a/net/base/x509_certificate_openssl.cc b/net/base/x509_certificate_openssl.cc
index 5416a76563de3eb5567a757ceafc5dc8069f2776..519f6c2215d714cb7b7e7019747901a67780d43a 100644
--- a/net/base/x509_certificate_openssl.cc
+++ b/net/base/x509_certificate_openssl.cc
@@ -424,6 +424,8 @@ X509_STORE* X509Certificate::cert_store() {
   return X509InitSingleton::GetInstance()->store();
 }
 
+#if !defined(OS_ANDROID)
+
 int X509Certificate::VerifyInternal(const std::string& hostname,
                                     int flags,
                                     CertVerifyResult* verify_result) const {
@@ -503,6 +505,8 @@ int X509Certificate::VerifyInternal(const std::string& hostname,
   return OK;
 }
 
+#endif  // !OS_ANDROID

[wtc, 2011/08/09 18:47:22]

!OS_ANDROID => !defined(OS_ANDROID)

[michaelbai, 2011/08/11 16:10:18]

Done.

+
 bool X509Certificate::GetDEREncoded(std::string* encoded) {
   DERCache der_cache;
   if (!GetDERAndCacheIfNeeded(cert_handle_, &der_cache))