Fix handling of user and CA certificates on Android.

content/public/browser/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 CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_
 #define CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_
 
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 316 matching lines @@
   // Adds a downloaded client cert. The embedder should ensure that there's
   // a private key for the cert, displays the cert to the user, and adds it upon
   // user approval. If the downloaded data could not be interpreted as a valid
   // certificate, |cert| will be NULL.
   virtual void AddNewCertificate(
       net::URLRequest* request,
       net::X509Certificate* cert,
       int render_process_id,
       int render_view_id) {}
 
+#if defined(OS_ANDROID)
+  // Adds either a DER-encoded X-509 certificate or PKCS#12 keychain
+  // through the Android system's CertInstaller activity.
+  virtual void AddNewCertificateOrKeychainAndroid(
+      net::URLRequest* request,
+      const char* data,
+      size_t data_len,
+      bool is_pkcs12) {}
+#endif
+
   // Returns a a class to get notifications about media event. The embedder can
   // return NULL if they're not interested.
   virtual MediaObserver* GetMediaObserver();
 
   // Asks permission to show desktop notifications.
   virtual void RequestDesktopNotificationPermission(
       const GURL& source_origin,
       int callback_context,
       int render_process_id,
       int render_view_id) {}
@@ skipping 120 matching lines @@
   // This is called on a worker thread.
   virtual
       crypto::CryptoModuleBlockingPasswordDelegate* GetCryptoPasswordDelegate(
           const GURL& url);
 #endif
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_