Fix certificate and keychain installation on Android.

net/base/cert_database_openssl.cc

Index: net/base/cert_database_openssl.cc
diff --git a/net/base/cert_database_openssl.cc b/net/base/cert_database_openssl.cc
index 7459b078c8868a1bcdedd173e00dda15b96aa093..bd67a56730c6dddc38112135ee150b0cced86189 100644
--- a/net/base/cert_database_openssl.cc
+++ b/net/base/cert_database_openssl.cc
@@ -22,6 +22,18 @@ CertDatabase::CertDatabase()
 CertDatabase::~CertDatabase() {}
 
 int CertDatabase::CheckUserCert(X509Certificate* cert) {
+#if defined(OS_ANDROID)

[darin (slow to review), 2012/12/11 00:00:08]

nit: Would it make more sense to create a CertDatabaseAndroid instead?  It seems
like CertDatabase does nothing under OS_ANDROID.

+// NOTE: This method shall never be called on Android.
+//
+// On other platforms, it is only used by the SSLAddCertHandler class
+// to handle veritication and installation of downloaded certificates.
+//
+// On Android, the certificate data is passed directly to the system's
+// CertInstaller activity, which handles verification, naming,
+// installation and UI (for success/failure).
+  NOTIMPLEMENTED();
+  return ERR_NOT_IMPLEMENTED;
+#else  // OS_ANDROID
   if (!cert)
     return ERR_CERT_INVALID;
   if (cert->HasExpired())
@@ -32,10 +44,10 @@ int CertDatabase::CheckUserCert(X509Certificate* cert) {
     return ERR_NO_PRIVATE_KEY_FOR_CERT;
 
   return OK;
+#endif  // OS_ANDROID
 }
 
 int CertDatabase::AddUserCert(X509Certificate* cert) {
-  // TODO(bulach): implement me.
   NOTIMPLEMENTED();
   return ERR_NOT_IMPLEMENTED;
 }