| Index: android_webview/java/src/org/chromium/android_webview/AwContentsClientBridge.java
|
| diff --git a/android_webview/java/src/org/chromium/android_webview/AwContentsClientBridge.java b/android_webview/java/src/org/chromium/android_webview/AwContentsClientBridge.java
|
| index 7172cfb23b258f1c61c4596c4bcb11d0202d9b60..dfba3b8aa632560b6eb226b5563ab996d7741b13 100644
|
| --- a/android_webview/java/src/org/chromium/android_webview/AwContentsClientBridge.java
|
| +++ b/android_webview/java/src/org/chromium/android_webview/AwContentsClientBridge.java
|
| @@ -4,6 +4,7 @@
|
|
|
| package org.chromium.android_webview;
|
|
|
| +import android.content.Context;
|
| import android.net.http.SslCertificate;
|
| import android.net.http.SslError;
|
| import android.webkit.ValueCallback;
|
| @@ -44,9 +45,9 @@ public class AwContentsClientBridge {
|
| // are allowed by the user, because this functionality is already handled via
|
| // ssl_policy in native layers.
|
| @CalledByNative
|
| - private boolean allowCertificateError(int certError, byte[] derBytes, final String url,
|
| - final int id) {
|
| - final SslCertificate cert = SslUtil.getCertificateFromDerBytes(derBytes);
|
| + private boolean allowCertificateError(Context context, int certError, byte[] derBytes,
|
| + final String url, final int id) {
|
| + final SslCertificate cert = SslUtil.getCertificateFromDerBytes(context, derBytes);
|
| if (cert == null) {
|
| // if the certificate or the client is null, cancel the request
|
| return false;
|
| @@ -110,4 +111,4 @@ public class AwContentsClientBridge {
|
| private native void nativeConfirmJsResult(int nativeAwContentsClientBridge, int id,
|
| String prompt);
|
| private native void nativeCancelJsResult(int nativeAwContentsClientBridge, int id);
|
| -}
|
| +}
|
|
|