Revert of jni_generator: Make all object-returning natives return ScopedJavaLocalRef.

content/browser/android/content_view_core_impl.cc

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