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

android_webview/native/aw_contents_statics.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 "android_webview/native/aw_contents_statics.h"
 
 #include "android_webview/browser/aw_browser_context.h"
 #include "android_webview/browser/net/aw_url_request_context_getter.h"
 #include "android_webview/common/aw_version_info_values.h"
 #include "base/android/jni_string.h"
@@ skipping 59 matching lines @@
                                      aw_url_request_context_getter,
                                      ConvertJavaStringToUTF8(env, key)));
 }
 
 // static
 void SetDataReductionProxyEnabled(JNIEnv* env, jclass, jboolean enabled) {
   AwBrowserContext::SetDataReductionProxyEnabled(enabled);
 }
 
 // static
-ScopedJavaLocalRef<jstring> GetUnreachableWebDataUrl(JNIEnv* env, jclass) {
+jstring GetUnreachableWebDataUrl(JNIEnv* env, jclass) {
   return base::android::ConvertUTF8ToJavaString(
-      env, content::kUnreachableWebDataURL);
+             env, content::kUnreachableWebDataURL).Release();
 }
 
 // static
 void SetRecordFullDocument(JNIEnv* env, jclass, jboolean record_full_document) {
   content::SynchronousCompositor::SetRecordFullDocument(record_full_document);
 }
 
 // static
 void SetLegacyCacheRemovalDelayForTest(JNIEnv*, jclass, jlong delay_ms) {
   AwBrowserContext::SetLegacyCacheRemovalDelayForTest(delay_ms);
 }
 
 // static
-ScopedJavaLocalRef<jstring> GetProductVersion(JNIEnv* env, jclass) {
-  return base::android::ConvertUTF8ToJavaString(env, PRODUCT_VERSION);
+jstring GetProductVersion(JNIEnv* env, jclass) {
+  return base::android::ConvertUTF8ToJavaString(env, PRODUCT_VERSION).Release();
 }
 
 bool RegisterAwContentsStatics(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace android_webview