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

chrome/browser/autofill/android/personal_data_manager_android.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 "chrome/browser/autofill/android/personal_data_manager_android.h"
 
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/command_line.h"
 #include "base/format_macros.h"
@@ skipping 318 matching lines @@
   return GetPrefs()->GetBoolean(autofill::prefs::kAutofillWalletImportEnabled);
 }
 
 // Enables or disables the Wallet import feature.
 static void SetWalletImportEnabled(JNIEnv* env, jclass clazz, jboolean enable) {
   GetPrefs()->SetBoolean(autofill::prefs::kAutofillWalletImportEnabled, enable);
 }
 
 // Returns an ISO 3166-1-alpha-2 country code for a |jcountry_name| using
 // the application locale, or an empty string.
-static ScopedJavaLocalRef<jstring> ToCountryCode(JNIEnv* env,
-                                                 jclass clazz,
-                                                 jstring jcountry_name) {
+static jstring ToCountryCode(JNIEnv* env, jclass clazz, jstring jcountry_name) {
   return ConvertUTF8ToJavaString(
-      env, AutofillCountry::GetCountryCode(
-               base::android::ConvertJavaStringToUTF16(env, jcountry_name),
-               g_browser_process->GetApplicationLocale()));
+      env,
+      AutofillCountry::GetCountryCode(
+          base::android::ConvertJavaStringToUTF16(env, jcountry_name),
+          g_browser_process->GetApplicationLocale())).Release();
 }
 
 static jlong Init(JNIEnv* env, jobject obj) {
   PersonalDataManagerAndroid* personal_data_manager_android =
       new PersonalDataManagerAndroid(env, obj);
   return reinterpret_cast<intptr_t>(personal_data_manager_android);
 }
 
 }  // namespace autofill