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

base/android/jni_generator/testNatives.golden

Index: base/android/jni_generator/testNatives.golden
diff --git a/base/android/jni_generator/testNatives.golden b/base/android/jni_generator/testNatives.golden
index 51bd6f0b6186ca64990f2c54a28384db840fc4c6..64f76c10d8931f03d07fc1475ced52bacffe4492 100644
--- a/base/android/jni_generator/testNatives.golden
+++ b/base/android/jni_generator/testNatives.golden
@@ -55,14 +55,13 @@
   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,
@@ -76,23 +75,21 @@
   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();
-}
-
-static ScopedJavaLocalRef<jobjectArray> GetAutofillProfileGUIDs(JNIEnv* env,
-    jclass jcaller);
+  return GetStateAsByteArray(env, jcaller, view);
+}
+
+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,
@@ -132,11 +129,11 @@
   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,