Add client cert support to android_webview

android_webview/native/aw_contents_client_bridge.h

Index: android_webview/native/aw_contents_client_bridge.h
diff --git a/android_webview/native/aw_contents_client_bridge.h b/android_webview/native/aw_contents_client_bridge.h
index 4cd6c6caa130d8c18dbaac68fe876996bad320f1..24a27e33c8e5f3689088acc101a0cda3c823e9f5 100644
--- a/android_webview/native/aw_contents_client_bridge.h
+++ b/android_webview/native/aw_contents_client_bridge.h
@@ -29,6 +29,7 @@ namespace android_webview {
 // any references.
 class AwContentsClientBridge : public AwContentsClientBridgeBase {
  public:
+  typedef base::Callback<void(net::X509Certificate*)> SelectCertificateCallback;

[boliu, 2014/04/18 17:10:12]

Move this typedef to base class

[sgurun-gerrit only, 2014/04/19 01:28:50]

Done.

 
   AwContentsClientBridge(JNIEnv* env, jobject obj);
   virtual ~AwContentsClientBridge();
@@ -39,6 +40,9 @@ class AwContentsClientBridge : public AwContentsClientBridgeBase {
                                      const GURL& request_url,
                                      const base::Callback<void(bool)>& callback,
                                      bool* cancel_request) OVERRIDE;
+  virtual void SelectClientCertificate(
+      net::SSLCertRequestInfo* cert_request_info,
+      const SelectCertificateCallback& callback) OVERRIDE;
 
   virtual void RunJavaScriptDialog(
       content::JavaScriptMessageType message_type,
@@ -56,16 +60,23 @@ class AwContentsClientBridge : public AwContentsClientBridgeBase {
 
   // Methods called from Java.
   void ProceedSslError(JNIEnv* env, jobject obj, jboolean proceed, jint id);
+  void ProvideClientCertificateResponse(JNIEnv* env, jobject object,
+      jint request_id, jobjectArray encoded_chain_ref,
+      jobject private_key_ref);
   void ConfirmJsResult(JNIEnv*, jobject, int id, jstring prompt);
   void CancelJsResult(JNIEnv*, jobject, int id);
 
  private:
+  void HandleErrorInClientCertificateResponse(int id);
+
   JavaObjectWeakGlobalRef java_ref_;
 
   typedef const base::Callback<void(bool)> CertErrorCallback;
   IDMap<CertErrorCallback, IDMapOwnPointer> pending_cert_error_callbacks_;
   IDMap<content::JavaScriptDialogManager::DialogClosedCallback, IDMapOwnPointer>
       pending_js_dialog_callbacks_;
+  IDMap<SelectCertificateCallback, IDMapOwnPointer>
+      pending_client_cert_request_callbacks_;
 };
 
 bool RegisterAwContentsClientBridge(JNIEnv* env);