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

base/android/jni_generator/testEagerCalledByNativesOption.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/example/jni_generator/Test
 
 #ifndef org_chromium_example_jni_generator_Test_JNI
@@ skipping 42 matching lines @@
       g_Test_testStaticMethodWithParam, as_jint(iParam));
   return ret;
 }
 
 static jdouble testMethodWithNoParam(JNIEnv* env) {
   jdouble ret = env->CallStaticDoubleMethod(Test_clazz(env),
       g_Test_testMethodWithNoParam);
   return ret;
 }
 
-static ScopedJavaLocalRef<jstring> testStaticMethodWithNoParam(JNIEnv* env) {
+static base::android::ScopedJavaLocalRef<jstring>
+    testStaticMethodWithNoParam(JNIEnv* env) {
   jstring ret =
       static_cast<jstring>(env->CallStaticObjectMethod(Test_clazz(env),
       g_Test_testStaticMethodWithNoParam));
-  return ScopedJavaLocalRef<jstring>(env, ret);
+  return base::android::ScopedJavaLocalRef<jstring>(env, ret);
 }
 }  // namespace
 
 // Step 3: RegisterNatives.
 
 static const JNINativeMethod kMethodsTest[] = {
     { "nativeMethod",
 "("
 "J"
 "I"
@@ skipping 62 matching lines @@
   return true;
 }
 
 extern "C" JNIEXPORT bool JNICALL
 Java_org_chromium_example_jni_generator_Test_nativeInitNativeClass(JNIEnv* env,
     jclass clazz) {
   return RegisterNativesImpl(env, clazz);
 }
 
 #endif  // org_chromium_example_jni_generator_Test_JNI