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

content/browser/web_contents/web_contents_android.cc

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 0131bf997260b8095ea9637b96a5e35d36d1fd85..76d2d39b090bae76cda534c8c3da1024436574ee 100644
--- a/content/browser/web_contents/web_contents_android.cc
+++ b/content/browser/web_contents/web_contents_android.cc
@@ -171,22 +171,22 @@
 }
 
 // static
-ScopedJavaLocalRef<jobject> FromNativePtr(JNIEnv* env,
-                                          jclass clazz,
-                                          jlong web_contents_ptr) {
+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 ScopedJavaLocalRef<jobject>();
+    return 0;
 
   // 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 ScopedJavaLocalRef<jobject>();
-  }
-
-  return web_contents_android->GetJavaObject();
+    return 0;
+  }
+
+  return web_contents_android->GetJavaObject().Release();
 }
 
 // static