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

base/android/jni_generator/testNatives.golden

 // Copyright 2014 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.
 
 // This file is autogenerated by
 //     base/android/jni_generator/jni_generator.py
 // For
 //     org/chromium/TestJni
 
 #ifndef org_chromium_TestJni_JNI
@@ skipping 37 matching lines @@
     jstring url,
     jstring title,
     jboolean isFolder,
     jlong parentId) {
   ChromeBrowserProvider* native =
       reinterpret_cast<ChromeBrowserProvider*>(nativeChromeBrowserProvider);
   CHECK_NATIVE_PTR(env, jcaller, native, "AddBookmark", 0);
   return native->AddBookmark(env, jcaller, url, title, isFolder, parentId);
 }
 
-static ScopedJavaLocalRef<jstring> GetDomainAndRegistry(JNIEnv* env, jclass
-    jcaller,
+static jstring GetDomainAndRegistry(JNIEnv* env, jclass jcaller,
     jstring url);
 
 static jstring Java_org_chromium_TestJni_nativeGetDomainAndRegistry(JNIEnv* env,
     jclass jcaller,
     jstring url) {
-  return GetDomainAndRegistry(env, jcaller, url).Release();
+  return GetDomainAndRegistry(env, jcaller, url);
 }
 
 static void CreateHistoricalTabFromState(JNIEnv* env, jclass jcaller,
     jbyteArray state,
     jint tab_index);
 
 static void Java_org_chromium_TestJni_nativeCreateHistoricalTabFromState(JNIEnv*
     env, jclass jcaller,
     jbyteArray state,
     jint tab_index) {
   return CreateHistoricalTabFromState(env, jcaller, state, tab_index);
 }
 
-static ScopedJavaLocalRef<jbyteArray> GetStateAsByteArray(JNIEnv* env, jobject
-    jcaller,
+static jbyteArray GetStateAsByteArray(JNIEnv* env, jobject jcaller,
     jobject view);
 
 static jbyteArray Java_org_chromium_TestJni_nativeGetStateAsByteArray(JNIEnv*
     env, jobject jcaller,
     jobject view) {
-  return GetStateAsByteArray(env, jcaller, view).Release();
+  return GetStateAsByteArray(env, jcaller, view);
 }
 
-static ScopedJavaLocalRef<jobjectArray> GetAutofillProfileGUIDs(JNIEnv* env,
-    jclass jcaller);
+static jobjectArray GetAutofillProfileGUIDs(JNIEnv* env, jclass jcaller);
 
 static jobjectArray
     Java_org_chromium_TestJni_nativeGetAutofillProfileGUIDs(JNIEnv* env, jclass
     jcaller) {
-  return GetAutofillProfileGUIDs(env, jcaller).Release();
+  return GetAutofillProfileGUIDs(env, jcaller);
 }
 
 static void SetRecognitionResults(JNIEnv* env, jobject jcaller,
     jint sessionId,
     jobjectArray results);
 
 static void Java_org_chromium_TestJni_nativeSetRecognitionResults(JNIEnv* env,
     jobject jcaller,
     jint sessionId,
     jobjectArray results) {
@@ skipping 19 matching lines @@
 
 static jint FindAll(JNIEnv* env, jobject jcaller,
     jstring find);
 
 static jint Java_org_chromium_TestJni_nativeFindAll(JNIEnv* env, jobject
     jcaller,
     jstring find) {
   return FindAll(env, jcaller, find);
 }
 
-static ScopedJavaLocalRef<jobject> GetInnerClass(JNIEnv* env, jclass jcaller);
+static jobject GetInnerClass(JNIEnv* env, jclass jcaller);
 
 static jobject Java_org_chromium_TestJni_nativeGetInnerClass(JNIEnv* env, jclass
     jcaller) {
-  return GetInnerClass(env, jcaller).Release();
+  return GetInnerClass(env, jcaller);
 }
 
 static jobject Java_org_chromium_TestJni_nativeQueryBitmap(JNIEnv* env,
     jobject jcaller,
     jint nativeChromeBrowserProvider,
     jobjectArray projection,
     jstring selection,
     jobjectArray selectionArgs,
     jstring sortOrder) {
   ChromeBrowserProvider* native =
@@ skipping 127 matching lines @@
                            kMethodsTestJniSize) < 0) {
     jni_generator::HandleRegistrationError(
         env, TestJni_clazz(env), __FILE__);
     return false;
   }
 
   return true;
 }
 
 #endif  // org_chromium_TestJni_JNI