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

components/cronet/android/test/native_test_server.cc

Index: components/cronet/android/test/native_test_server.cc
diff --git a/components/cronet/android/test/native_test_server.cc b/components/cronet/android/test/native_test_server.cc
index 756442b618bca4adae9b7d1e921127ffdb24f43d..908ddb07e664414ad607f4425a907b54cad03c69 100644
--- a/components/cronet/android/test/native_test_server.cc
+++ b/components/cronet/android/test/native_test_server.cc
@@ -254,63 +254,59 @@
   g_test_server = NULL;
 }
 
-ScopedJavaLocalRef<jstring> GetEchoBodyURL(JNIEnv* env, jclass jcaller) {
+jstring GetEchoBodyURL(JNIEnv* env, jclass jcaller) {
   DCHECK(g_test_server);
   GURL url = g_test_server->GetURL(kEchoBodyPath);
-  return base::android::ConvertUTF8ToJavaString(env, url.spec());
-}
-
-ScopedJavaLocalRef<jstring> GetEchoHeaderURL(JNIEnv* env,
-                                             jclass jcaller,
-                                             jstring jheader) {
+  return base::android::ConvertUTF8ToJavaString(env, url.spec()).Release();
+}
+
+jstring GetEchoHeaderURL(JNIEnv* env, jclass jcaller, jstring jheader) {
   DCHECK(g_test_server);
   GURL url = g_test_server->GetURL(kEchoHeaderPath);
   GURL::Replacements replacements;
   std::string header = base::android::ConvertJavaStringToUTF8(env, jheader);
   replacements.SetQueryStr(header.c_str());
   url = url.ReplaceComponents(replacements);
-  return base::android::ConvertUTF8ToJavaString(env, url.spec());
-}
-
-ScopedJavaLocalRef<jstring> GetEchoAllHeadersURL(JNIEnv* env, jclass jcaller) {
+  return base::android::ConvertUTF8ToJavaString(env, url.spec()).Release();
+}
+
+jstring GetEchoAllHeadersURL(JNIEnv* env, jclass jcaller) {
   DCHECK(g_test_server);
   GURL url = g_test_server->GetURL(kEchoAllHeadersPath);
-  return base::android::ConvertUTF8ToJavaString(env, url.spec());
-}
-
-ScopedJavaLocalRef<jstring> GetEchoMethodURL(JNIEnv* env, jclass jcaller) {
+  return base::android::ConvertUTF8ToJavaString(env, url.spec()).Release();
+}
+
+jstring GetEchoMethodURL(JNIEnv* env, jclass jcaller) {
   DCHECK(g_test_server);
   GURL url = g_test_server->GetURL(kEchoMethodPath);
-  return base::android::ConvertUTF8ToJavaString(env, url.spec());
-}
-
-ScopedJavaLocalRef<jstring> GetRedirectToEchoBody(JNIEnv* env, jclass jcaller) {
+  return base::android::ConvertUTF8ToJavaString(env, url.spec()).Release();
+}
+
+jstring GetRedirectToEchoBody(JNIEnv* env, jclass jcaller) {
   DCHECK(g_test_server);
   GURL url = g_test_server->GetURL(kRedirectToEchoBodyPath);
-  return base::android::ConvertUTF8ToJavaString(env, url.spec());
-}
-
-ScopedJavaLocalRef<jstring> GetFileURL(JNIEnv* env,
-                                       jclass jcaller,
-                                       jstring jfile_path) {
+  return base::android::ConvertUTF8ToJavaString(env, url.spec()).Release();
+}
+
+jstring GetFileURL(JNIEnv* env, jclass jcaller, jstring jfile_path) {
   DCHECK(g_test_server);
   std::string file = base::android::ConvertJavaStringToUTF8(env, jfile_path);
   GURL url = g_test_server->GetURL(file);
-  return base::android::ConvertUTF8ToJavaString(env, url.spec());
-}
-
-ScopedJavaLocalRef<jstring> GetSdchURL(JNIEnv* env, jclass jcaller) {
+  return base::android::ConvertUTF8ToJavaString(env, url.spec()).Release();
+}
+
+jstring GetSdchURL(JNIEnv* env, jclass jcaller) {
   DCHECK(g_test_server);
   std::string url(base::StringPrintf("http://%s:%d", kFakeSdchDomain,
                                      g_test_server->port()));
-  return base::android::ConvertUTF8ToJavaString(env, url);
-}
-
-ScopedJavaLocalRef<jstring> GetHostPort(JNIEnv* env, jclass jcaller) {
+  return base::android::ConvertUTF8ToJavaString(env, url).Release();
+}
+
+jstring GetHostPort(JNIEnv* env, jclass jcaller) {
   DCHECK(g_test_server);
   std::string host_port =
       net::HostPortPair::FromURL(g_test_server->base_url()).ToString();
-  return base::android::ConvertUTF8ToJavaString(env, host_port);
+  return base::android::ConvertUTF8ToJavaString(env, host_port).Release();
 }
 
 jboolean IsDataReductionProxySupported(JNIEnv* env, jclass jcaller) {