Refactor client cert private key handling.

android_webview/browser/aw_contents_client_bridge.h

Index: android_webview/browser/aw_contents_client_bridge.h
diff --git a/android_webview/browser/aw_contents_client_bridge.h b/android_webview/browser/aw_contents_client_bridge.h
index a88cab0aad6ce886144f2812556ecd535c7e0665..48fde9e85dff120b407ead945e2e0b3909ea553b 100644
--- a/android_webview/browser/aw_contents_client_bridge.h
+++ b/android_webview/browser/aw_contents_client_bridge.h
@@ -122,8 +122,6 @@ class AwContentsClientBridge {
   void CancelJsResult(JNIEnv*, const base::android::JavaRef<jobject>&, int id);
 
  private:
-  void HandleErrorInClientCertificateResponse(int id);
-
   JavaObjectWeakGlobalRef java_ref_;
 
   typedef const base::Callback<void(content::CertificateRequestResultType)>
@@ -131,9 +129,7 @@ class AwContentsClientBridge {
   IDMap<std::unique_ptr<CertErrorCallback>> pending_cert_error_callbacks_;
   IDMap<std::unique_ptr<content::JavaScriptDialogManager::DialogClosedCallback>>
       pending_js_dialog_callbacks_;
-  // |pending_client_cert_request_delegates_| owns its pointers, but IDMap
-  // doesn't provide Release, so ownership is managed manually.
-  IDMap<content::ClientCertificateDelegate*>
+  IDMap<std::unique_ptr<content::ClientCertificateDelegate>>
       pending_client_cert_request_delegates_;
 };