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

remoting/client/jni/chromoting_jni_runtime.cc

Index: remoting/client/jni/chromoting_jni_runtime.cc
diff --git a/remoting/client/jni/chromoting_jni_runtime.cc b/remoting/client/jni/chromoting_jni_runtime.cc
index 88572e801b93e361c3647fb57ecf1ba3156ff202..cb7dbb0e9865cb0fc78b5aa885c39e19bfcecdaa 100644
--- a/remoting/client/jni/chromoting_jni_runtime.cc
+++ b/remoting/client/jni/chromoting_jni_runtime.cc
@@ -53,20 +53,21 @@
   remoting::ChromotingJniRuntime::GetInstance();
 }
 
-static ScopedJavaLocalRef<jstring> GetApiKey(JNIEnv* env, jclass clazz) {
-  return ConvertUTF8ToJavaString(env, google_apis::GetAPIKey().c_str());
-}
-
-static ScopedJavaLocalRef<jstring> GetClientId(JNIEnv* env, jclass clazz) {
+static jstring GetApiKey(JNIEnv* env, jclass clazz) {
   return ConvertUTF8ToJavaString(
-      env,
-      google_apis::GetOAuth2ClientID(google_apis::CLIENT_REMOTING).c_str());
-}
-
-static ScopedJavaLocalRef<jstring> GetClientSecret(JNIEnv* env, jclass clazz) {
+      env, google_apis::GetAPIKey().c_str()).Release();
+}
+
+static jstring GetClientId(JNIEnv* env, jclass clazz) {
   return ConvertUTF8ToJavaString(
-      env,
-      google_apis::GetOAuth2ClientSecret(google_apis::CLIENT_REMOTING).c_str());
+      env, google_apis::GetOAuth2ClientID(
+          google_apis::CLIENT_REMOTING).c_str()).Release();
+}
+
+static jstring GetClientSecret(JNIEnv* env, jclass clazz) {
+  return ConvertUTF8ToJavaString(
+      env, google_apis::GetOAuth2ClientSecret(
+          google_apis::CLIENT_REMOTING).c_str()).Release();
 }
 
 static void Connect(JNIEnv* env,