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

content/browser/web_contents/web_contents_android.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/web_contents/web_contents_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/command_line.h"
@@ skipping 153 matching lines @@
     return;
 
   WebContents* web_contents = web_contents_android->web_contents();
   if (!web_contents)
     return;
 
   delete web_contents;
 }
 
 // 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 0;
   }
 
-  return web_contents_android->GetJavaObject();
+  return web_contents_android->GetJavaObject().Release();
 }
 
 // static
 bool WebContentsAndroid::Register(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 WebContentsAndroid::WebContentsAndroid(WebContents* web_contents)
     : web_contents_(web_contents),
       navigation_controller_(&(web_contents->GetController())),
@@ skipping 341 matching lines @@
   web_contents_->StopMediaSession();
 }
 
 ScopedJavaLocalRef<jstring>  WebContentsAndroid::GetEncoding(
     JNIEnv* env, jobject obj) const {
   return base::android::ConvertUTF8ToJavaString(env,
                                                 web_contents_->GetEncoding());
 }
 
 }  // namespace content