Fix handling of user and CA certificates on Android.

chrome/browser/chrome_content_browser_client.cc

Index: chrome/browser/chrome_content_browser_client.cc
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index fa09d6586cfc175c0352b25489085398a6ffdc79..a7c0233e68ed66fdaf5297a3f6b4ac12c9d7a1d6 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -119,6 +119,7 @@
 #include "chrome/browser/chrome_browser_main_linux.h"
 #elif defined(OS_ANDROID)
 #include "chrome/browser/chrome_browser_main_android.h"
+#include "net/android/network_library.h"
 #elif defined(OS_POSIX)
 #include "chrome/browser/chrome_browser_main_posix.h"
 #endif
@@ -1277,6 +1278,18 @@ void ChromeContentBrowserClient::AddNewCertificate(
   new SSLAddCertHandler(request, cert, render_process_id, render_view_id);
 }
 
+#if defined(OS_ANDROID)
+void ChromeContentBrowserClient::AddNewCertificateOrKeychainAndroid(
+    net::URLRequest* request,
+    const char* data,
+    size_t data_len,
+    bool is_pkcs12) {
+  // This launches a new Android activity (CertInstaller).
+  (void)request;
+  net::android::StoreCertificateOrKeychain(data, data_len, is_pkcs12);
+}
+#endif
+
 content::MediaObserver* ChromeContentBrowserClient::GetMediaObserver() {
   return MediaInternals::GetInstance();
 }