Refactor client cert private key handling.

android_webview/browser/aw_contents_client_bridge.h

 // Copyright (c) 2013 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 ANDROID_WEBVIEW_BROWSER_AW_CONTENTS_CLIENT_BRIDGE_H_
 #define ANDROID_WEBVIEW_BROWSER_AW_CONTENTS_CLIENT_BRIDGE_H_
 
 #include <jni.h>
 #include <memory>
 
@@ skipping 104 matching lines @@
       jint request_id,
       const base::android::JavaRef<jobjectArray>& encoded_chain_ref,
       const base::android::JavaRef<jobject>& private_key_ref);
   void ConfirmJsResult(JNIEnv*,
                        const base::android::JavaRef<jobject>&,
                        int id,
                        const base::android::JavaRef<jstring>& prompt);
   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)>
       CertErrorCallback;
   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_;
 };
 
 bool RegisterAwContentsClientBridge(JNIEnv* env);
 
 }  // namespace android_webview
 
 #endif  // ANDROID_WEBVIEW_BROWSER_AW_CONTENTS_CLIENT_BRIDGE_H_