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

remoting/client/jni/chromoting_jni_runtime.cc

 // Copyright 2013 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 "remoting/client/jni/chromoting_jni_runtime.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/android/library_loader/library_loader_hooks.h"
@@ skipping 35 matching lines @@
   // The google_apis functions check the command-line arguments to make sure no
   // runtime API keys have been specified by the environment. Unfortunately, we
   // neither launch Chromium nor have a command line, so we need to prevent
   // them from DCHECKing out when they go looking.
   base::CommandLine::Init(0, nullptr);
 
   // Create the singleton now so that the Chromoting threads will be set up.
   remoting::ChromotingJniRuntime::GetInstance();
 }
 
-static ScopedJavaLocalRef<jstring> GetApiKey(JNIEnv* env, jclass clazz) {
-  return ConvertUTF8ToJavaString(env, google_apis::GetAPIKey().c_str());
+static jstring GetApiKey(JNIEnv* env, jclass clazz) {
+  return ConvertUTF8ToJavaString(
+      env, google_apis::GetAPIKey().c_str()).Release();
 }
 
-static ScopedJavaLocalRef<jstring> GetClientId(JNIEnv* env, jclass clazz) {
+static jstring GetClientId(JNIEnv* env, jclass clazz) {
   return ConvertUTF8ToJavaString(
-      env,
-      google_apis::GetOAuth2ClientID(google_apis::CLIENT_REMOTING).c_str());
+      env, google_apis::GetOAuth2ClientID(
+          google_apis::CLIENT_REMOTING).c_str()).Release();
 }
 
-static ScopedJavaLocalRef<jstring> GetClientSecret(JNIEnv* env, jclass clazz) {
+static jstring GetClientSecret(JNIEnv* env, jclass clazz) {
   return ConvertUTF8ToJavaString(
-      env,
-      google_apis::GetOAuth2ClientSecret(google_apis::CLIENT_REMOTING).c_str());
+      env, google_apis::GetOAuth2ClientSecret(
+          google_apis::CLIENT_REMOTING).c_str()).Release();
 }
 
 static void Connect(JNIEnv* env,
                     jclass clazz,
                     jstring username,
                     jstring authToken,
                     jstring hostJid,
                     jstring hostId,
                     jstring hostPubkey,
                     jstring pairId,
@@ skipping 283 matching lines @@
 
   JNIEnv* env = base::android::AttachCurrentThread();
   Java_JniInterface_redrawGraphicsInternal(env);
 }
 
 void ChromotingJniRuntime::DetachFromVmAndSignal(base::WaitableEvent* waiter) {
   base::android::DetachFromVM();
   waiter->Signal();
 }
 }  // namespace remoting