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

content/shell/browser/shell_mojo_test_utils_android.cc

Index: content/shell/browser/shell_mojo_test_utils_android.cc
diff --git a/content/shell/browser/shell_mojo_test_utils_android.cc b/content/shell/browser/shell_mojo_test_utils_android.cc
index 04d3ad6aad92530e7213b6f790f4fa11ddb743e2..966aa5b143174a49244cd11506eb19870aad6d7f 100644
--- a/content/shell/browser/shell_mojo_test_utils_android.cc
+++ b/content/shell/browser/shell_mojo_test_utils_android.cc
@@ -33,10 +33,9 @@
   delete reinterpret_cast<TestEnvironment*>(test_environment);
 }
 
-static ScopedJavaLocalRef<jobject> CreateServiceRegistryPair(
-    JNIEnv* env,
-    jclass jcaller,
-    jlong native_test_environment) {
+static jobject CreateServiceRegistryPair(JNIEnv* env,
+                                         jclass jcaller,
+                                         jlong native_test_environment) {
   TestEnvironment* test_environment =
       reinterpret_cast<TestEnvironment*>(native_test_environment);
 
@@ -61,7 +60,7 @@
   test_environment->wrappers.push_back(wrapper_b);
 
   return Java_ShellMojoTestUtils_makePair(env, wrapper_a->GetObj().obj(),
-                                          wrapper_b->GetObj().obj());
+                                          wrapper_b->GetObj().obj()).Release();
 }
 
 static void RunLoop(JNIEnv* env, jclass jcaller, jlong timeout_ms) {