Index: content/browser/web_contents/web_contents_android.cc |
diff --git a/content/browser/web_contents/web_contents_android.cc b/content/browser/web_contents/web_contents_android.cc |
index 76d2d39b090bae76cda534c8c3da1024436574ee..0131bf997260b8095ea9637b96a5e35d36d1fd85 100644 |
--- a/content/browser/web_contents/web_contents_android.cc |
+++ b/content/browser/web_contents/web_contents_android.cc |
@@ -171,22 +171,22 @@ static void DestroyWebContents(JNIEnv* env, |
} |
// static |
-jobject FromNativePtr(JNIEnv* env, |
- jclass clazz, |
- jlong web_contents_ptr) { |
+ScopedJavaLocalRef<jobject> FromNativePtr(JNIEnv* env, |
+ jclass clazz, |
+ jlong web_contents_ptr) { |
WebContentsAndroid* web_contents_android = |
reinterpret_cast<WebContentsAndroid*>(web_contents_ptr); |
if (!web_contents_android) |
- return 0; |
+ return ScopedJavaLocalRef<jobject>(); |
// Check to make sure this object hasn't been destroyed. |
if (g_allocated_web_contents_androids.Get().find(web_contents_android) == |
g_allocated_web_contents_androids.Get().end()) { |
- return 0; |
+ return ScopedJavaLocalRef<jobject>(); |
} |
- return web_contents_android->GetJavaObject().Release(); |
+ return web_contents_android->GetJavaObject(); |
} |
// static |