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

components/cronet/android/chromium_url_request.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 "components/cronet/android/chromium_url_request.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/macros.h"
 #include "components/cronet/android/url_request_adapter.h"
@@ skipping 266 matching lines @@
       return REQUEST_ERROR_CONNECTION_TIMED_OUT;
 
     case net::ERR_NAME_NOT_RESOLVED:
       return REQUEST_ERROR_UNKNOWN_HOST;
     case net::ERR_TOO_MANY_REDIRECTS:
       return REQUEST_ERROR_TOO_MANY_REDIRECTS;
   }
   return REQUEST_ERROR_UNKNOWN;
 }
 
-static ScopedJavaLocalRef<jstring> GetErrorString(JNIEnv* env,
-                                                  jobject jcaller,
-                                                  jlong jurl_request_adapter) {
+static jstring GetErrorString(JNIEnv* env,
+                              jobject jcaller,
+                              jlong jurl_request_adapter) {
   URLRequestAdapter* request_adapter =
       reinterpret_cast<URLRequestAdapter*>(jurl_request_adapter);
   DCHECK(request_adapter);
   int error_code = request_adapter->error_code();
   char buffer[200];
   std::string error_string = net::ErrorToString(error_code);
   snprintf(buffer,
            sizeof(buffer),
            "System error: %s(%d)",
            error_string.c_str(),
            error_code);
-  return ConvertUTF8ToJavaString(env, buffer);
+  return ConvertUTF8ToJavaString(env, buffer).Release();
 }
 
 static jint GetHttpStatusCode(JNIEnv* env,
                               jobject jcaller,
                               jlong jurl_request_adapter) {
   URLRequestAdapter* request_adapter =
       reinterpret_cast<URLRequestAdapter*>(jurl_request_adapter);
   DCHECK(request_adapter);
   return request_adapter->http_status_code();
 }
 
-static ScopedJavaLocalRef<jstring>
-GetHttpStatusText(JNIEnv* env, jobject jcaller, jlong jurl_request_adapter) {
+static jstring GetHttpStatusText(JNIEnv* env,
+                                 jobject jcaller,
+                                 jlong jurl_request_adapter) {
   URLRequestAdapter* request_adapter =
       reinterpret_cast<URLRequestAdapter*>(jurl_request_adapter);
   DCHECK(request_adapter);
-  return ConvertUTF8ToJavaString(env, request_adapter->http_status_text());
+  return ConvertUTF8ToJavaString(env, request_adapter->http_status_text())
+      .Release();
 }
 
-static ScopedJavaLocalRef<jstring> GetContentType(JNIEnv* env,
-                                                  jobject jcaller,
-                                                  jlong jurl_request_adapter) {
+static jstring GetContentType(JNIEnv* env,
+                              jobject jcaller,
+                              jlong jurl_request_adapter) {
   URLRequestAdapter* request_adapter =
       reinterpret_cast<URLRequestAdapter*>(jurl_request_adapter);
   DCHECK(request_adapter);
   std::string type = request_adapter->content_type();
   if (!type.empty()) {
-    return ConvertUTF8ToJavaString(env, type.c_str());
+    return ConvertUTF8ToJavaString(env, type.c_str()).Release();
   } else {
-    return ScopedJavaLocalRef<jstring>();
+    return NULL;
   }
 }
 
 static jlong GetContentLength(JNIEnv* env,
                               jobject jcaller,
                               jlong jurl_request_adapter) {
   URLRequestAdapter* request_adapter =
       reinterpret_cast<URLRequestAdapter*>(jurl_request_adapter);
   DCHECK(request_adapter);
   return request_adapter->content_length();
 }
 
-static ScopedJavaLocalRef<jstring> GetHeader(JNIEnv* env,
-                                             jobject jcaller,
-                                             jlong jurl_request_adapter,
-                                             jstring jheader_name) {
+static jstring GetHeader(JNIEnv* env,
+                         jobject jcaller,
+                         jlong jurl_request_adapter,
+                         jstring jheader_name) {
   URLRequestAdapter* request_adapter =
       reinterpret_cast<URLRequestAdapter*>(jurl_request_adapter);
   DCHECK(request_adapter);
   std::string header_name = ConvertJavaStringToUTF8(env, jheader_name);
   std::string header_value = request_adapter->GetHeader(header_name);
   if (!header_value.empty())
-    return ConvertUTF8ToJavaString(env, header_value.c_str());
-  return ScopedJavaLocalRef<jstring>();
+    return ConvertUTF8ToJavaString(env, header_value.c_str()).Release();
+  return NULL;
 }
 
 static void GetAllHeaders(JNIEnv* env,
                           jobject jcaller,
                           jlong jurl_request_adapter,
                           jobject jheaders_map) {
   URLRequestAdapter* request_adapter =
       reinterpret_cast<URLRequestAdapter*>(jurl_request_adapter);
   DCHECK(request_adapter);
 
@@ skipping 14 matching lines @@
   }
 
   // Some implementations (notably HttpURLConnection) include a mapping for the
   // null key; in HTTP's case, this maps to the HTTP status line.
   ScopedJavaLocalRef<jstring> status_line =
       ConvertUTF8ToJavaString(env, headers->GetStatusLine());
   Java_ChromiumUrlRequest_onAppendResponseHeader(env, jcaller, jheaders_map,
                                                  NULL, status_line.obj());
 }
 
-static ScopedJavaLocalRef<jstring> GetNegotiatedProtocol(
-    JNIEnv* env,
-    jobject jcaller,
-    jlong jurl_request_adapter) {
+static jstring GetNegotiatedProtocol(JNIEnv* env,
+                                     jobject jcaller,
+                                     jlong jurl_request_adapter) {
   URLRequestAdapter* request_adapter =
       reinterpret_cast<URLRequestAdapter*>(jurl_request_adapter);
   DCHECK(request_adapter);
 
   std::string negotiated_protocol = request_adapter->GetNegotiatedProtocol();
-  return ConvertUTF8ToJavaString(env, negotiated_protocol.c_str());
+  return ConvertUTF8ToJavaString(env, negotiated_protocol.c_str()).Release();
 }
 
 static jboolean GetWasCached(JNIEnv* env,
                              jobject jcaller,
                              jlong jurl_request_adapter) {
   URLRequestAdapter* request_adapter =
       reinterpret_cast<URLRequestAdapter*>(jurl_request_adapter);
   DCHECK(request_adapter);
 
   bool was_cached = request_adapter->GetWasCached();
   return was_cached ? JNI_TRUE : JNI_FALSE;
 }
 
 static void DisableRedirects(JNIEnv* env, jobject jcaller,
                              jlong jrequest_adapter) {
   URLRequestAdapter* request_adapter =
       reinterpret_cast<URLRequestAdapter*>(jrequest_adapter);
   DCHECK(request_adapter);
   request_adapter->DisableRedirects();
 }
 
 }  // namespace cronet