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

content/shell/browser/shell_mojo_test_utils_android.cc

 // 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.
 
 #include "content/shell/browser/shell_mojo_test_utils_android.h"
 
 #include "base/memory/scoped_vector.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "content/browser/mojo/service_registry_android.h"
@@ skipping 15 matching lines @@
 static jlong SetupTestEnvironment(JNIEnv* env, jclass jcaller) {
   return reinterpret_cast<intptr_t>(new TestEnvironment());
 }
 
 static void TearDownTestEnvironment(JNIEnv* env,
                                     jclass jcaller,
                                     jlong test_environment) {
   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);
 
   content::ServiceRegistryImpl* registry_a = new ServiceRegistryImpl();
   test_environment->registries.push_back(registry_a);
   content::ServiceRegistryImpl* registry_b = new ServiceRegistryImpl();
   test_environment->registries.push_back(registry_b);
 
   mojo::ServiceProviderPtr exposed_services_a;
   registry_a->Bind(GetProxy(&exposed_services_a));
   registry_b->BindRemoteServiceProvider(exposed_services_a.Pass());
 
   mojo::ServiceProviderPtr exposed_services_b;
   registry_b->Bind(GetProxy(&exposed_services_b));
   registry_a->BindRemoteServiceProvider(exposed_services_b.Pass());
 
   content::ServiceRegistryAndroid* wrapper_a =
       new ServiceRegistryAndroid(registry_a);
   test_environment->wrappers.push_back(wrapper_a);
   content::ServiceRegistryAndroid* wrapper_b =
       new ServiceRegistryAndroid(registry_b);
   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) {
   base::MessageLoop::current()->PostDelayedTask(
       FROM_HERE,
       base::MessageLoop::QuitClosure(),
       base::TimeDelta::FromMilliseconds(timeout_ms));
   base::RunLoop run_loop;
   run_loop.Run();
 }
 
 bool RegisterShellMojoTestUtils(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace content