| Index: android_webview/native/aw_contents_statics.cc
|
| diff --git a/android_webview/native/aw_contents_statics.cc b/android_webview/native/aw_contents_statics.cc
|
| index 6e2948c750f40a5fe8b32f9ecfccf83d59b72397..60c352cef809109c0fe2a0a79efd20e6cde2850d 100644
|
| --- a/android_webview/native/aw_contents_statics.cc
|
| +++ b/android_webview/native/aw_contents_statics.cc
|
| @@ -20,6 +20,7 @@
|
| using base::android::AttachCurrentThread;
|
| using base::android::ConvertJavaStringToUTF8;
|
| using base::android::JavaParamRef;
|
| +using base::android::JavaRef;
|
| using base::android::ScopedJavaGlobalRef;
|
| using base::android::ScopedJavaLocalRef;
|
| using content::BrowserThread;
|
| @@ -28,10 +29,10 @@ namespace android_webview {
|
|
|
| namespace {
|
|
|
| -void ClientCertificatesCleared(ScopedJavaGlobalRef<jobject>* callback) {
|
| +void ClientCertificatesCleared(const JavaRef<jobject>& callback) {
|
| DCHECK_CURRENTLY_ON(BrowserThread::UI);
|
| JNIEnv* env = AttachCurrentThread();
|
| - Java_AwContentsStatics_clientCertificatesCleared(env, *callback);
|
| + Java_AwContentsStatics_clientCertificatesCleared(env, callback);
|
| }
|
|
|
| void NotifyClientCertificatesChanged() {
|
| @@ -46,13 +47,11 @@ void ClearClientCertPreferences(JNIEnv* env,
|
| const JavaParamRef<jclass>&,
|
| const JavaParamRef<jobject>& callback) {
|
| DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
|
| - ScopedJavaGlobalRef<jobject>* j_callback = new ScopedJavaGlobalRef<jobject>();
|
| - j_callback->Reset(env, callback);
|
| BrowserThread::PostTaskAndReply(
|
| - BrowserThread::IO,
|
| - FROM_HERE,
|
| + BrowserThread::IO, FROM_HERE,
|
| base::Bind(&NotifyClientCertificatesChanged),
|
| - base::Bind(&ClientCertificatesCleared, base::Owned(j_callback)));
|
| + base::Bind(&ClientCertificatesCleared,
|
| + ScopedJavaGlobalRef<jobject>(env, callback)));
|
| }
|
|
|
| // static
|
|
|