| Index: android_webview/native/aw_contents_client_bridge.cc
|
| diff --git a/android_webview/native/aw_contents_client_bridge.cc b/android_webview/native/aw_contents_client_bridge.cc
|
| index d05a32b840c823701e618cc135193d0e212752e3..9b4e00ff1a8b906fe0eb86142a5ae826e10bac64 100644
|
| --- a/android_webview/native/aw_contents_client_bridge.cc
|
| +++ b/android_webview/native/aw_contents_client_bridge.cc
|
| @@ -80,9 +80,8 @@ void AwContentsClientBridge::AllowCertificateError(
|
| int cert_error,
|
| net::X509Certificate* cert,
|
| const GURL& request_url,
|
| - const base::Callback<void(bool)>& callback,
|
| + const base::Callback<void(content::CertificateRequestResultType)>& callback,
|
| bool* cancel_request) {
|
| -
|
| DCHECK_CURRENTLY_ON(BrowserThread::UI);
|
| JNIEnv* env = AttachCurrentThread();
|
|
|
| @@ -119,7 +118,8 @@ void AwContentsClientBridge::ProceedSslError(JNIEnv* env,
|
| LOG(WARNING) << "Ignoring unexpected ssl error proceed callback";
|
| return;
|
| }
|
| - callback->Run(proceed);
|
| + callback->Run(proceed ? content::CERTIFICATE_REQUEST_RESULT_TYPE_CONTINUE
|
| + : content::CERTIFICATE_REQUEST_RESULT_TYPE_CANCEL);
|
| pending_cert_error_callbacks_.Remove(id);
|
| }
|
|
|
|
|