Fix handling of user and CA certificates on Android.

chrome/browser/chrome_content_browser_client.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_
 #define CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_
 
 #include <set>
 #include <string>
 #include <utility>
@@ skipping 132 matching lines @@
       int render_process_id,
       int render_view_id,
       const net::HttpNetworkSession* network_session,
       net::SSLCertRequestInfo* cert_request_info,
       const base::Callback<void(net::X509Certificate*)>& callback) OVERRIDE;
   virtual void AddNewCertificate(
       net::URLRequest* request,
       net::X509Certificate* cert,
       int render_process_id,
       int render_view_id) OVERRIDE;
+#if defined(OS_ANDROID)
+  virtual void AddNewCertificateOrKeychainAndroid(
+      net::URLRequest* request,
+      const char* data,
+      size_t data_len,
+      bool is_pkcs12) OVERRIDE;
+#endif
   virtual content::MediaObserver* GetMediaObserver() OVERRIDE;
   virtual void RequestDesktopNotificationPermission(
       const GURL& source_origin,
       int callback_context,
       int render_process_id,
       int render_view_id) OVERRIDE;
   virtual WebKit::WebNotificationPresenter::Permission
       CheckDesktopNotificationPermission(
           const GURL& source_origin,
           content::ResourceContext* context,
@@ skipping 75 matching lines @@
   // Cached version of the locale so we can return the locale on the I/O
   // thread.
   std::string io_thread_application_locale_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient);
 };
 
 }  // namespace chrome
 
 #endif  // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_