| Index: android_webview/native/aw_contents.cc
|
| diff --git a/android_webview/native/aw_contents.cc b/android_webview/native/aw_contents.cc
|
| index a44fb06c5c6945cbc8b05ac3e8faea6b47783fce..2d3d1c9422aa80bc02736e3953ccce002fbccdc2 100644
|
| --- a/android_webview/native/aw_contents.cc
|
| +++ b/android_webview/native/aw_contents.cc
|
| @@ -470,21 +470,19 @@ jint GetAwDrawGLFunction(JNIEnv* env, jclass) {
|
| }
|
|
|
| namespace {
|
| -// |message| is passed as base::Owned, so it will automatically be deleted
|
| -// when the callback goes out of scope.
|
| -void DocumentHasImagesCallback(ScopedJavaGlobalRef<jobject>* message,
|
| +void DocumentHasImagesCallback(const ScopedJavaGlobalRef<jobject>& message,
|
| bool has_images) {
|
| Java_AwContents_onDocumentHasImagesResponse(AttachCurrentThread(),
|
| has_images,
|
| - message->obj());
|
| + message.obj());
|
| }
|
| } // namespace
|
|
|
| void AwContents::DocumentHasImages(JNIEnv* env, jobject obj, jobject message) {
|
| - ScopedJavaGlobalRef<jobject>* j_message = new ScopedJavaGlobalRef<jobject>();
|
| - j_message->Reset(env, message);
|
| + ScopedJavaGlobalRef<jobject> j_message;
|
| + j_message.Reset(env, message);
|
| render_view_host_ext_->DocumentHasImages(
|
| - base::Bind(&DocumentHasImagesCallback, base::Owned(j_message)));
|
| + base::Bind(&DocumentHasImagesCallback, j_message));
|
| }
|
|
|
| namespace {
|
|
|