Index: content/browser/android/content_view_core_impl.cc |
diff --git a/content/browser/android/content_view_core_impl.cc b/content/browser/android/content_view_core_impl.cc |
index dd9bab868ac8c7921370b381c6b292f95a86996b..a1a84e762df42d9d9a215623208d781b26f21494 100644 |
--- a/content/browser/android/content_view_core_impl.cc |
+++ b/content/browser/android/content_view_core_impl.cc |
@@ -1463,19 +1463,17 @@ jlong Init(JNIEnv* env, |
return reinterpret_cast<intptr_t>(view); |
} |
-static jobject FromWebContentsAndroid( |
- JNIEnv* env, |
- jclass clazz, |
- jobject jweb_contents) { |
+static ScopedJavaLocalRef<jobject> |
+FromWebContentsAndroid(JNIEnv* env, jclass clazz, jobject jweb_contents) { |
WebContents* web_contents = WebContents::FromJavaWebContents(jweb_contents); |
if (!web_contents) |
- return NULL; |
+ return ScopedJavaLocalRef<jobject>(); |
ContentViewCore* view = ContentViewCore::FromWebContents(web_contents); |
if (!view) |
- return NULL; |
+ return ScopedJavaLocalRef<jobject>(); |
- return view->GetJavaObject().Release(); |
+ return view->GetJavaObject(); |
} |
bool RegisterContentViewCore(JNIEnv* env) { |