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

chrome/browser/android/preferences/autofill/autofill_profile_bridge.cc

Index: chrome/browser/android/preferences/autofill/autofill_profile_bridge.cc
diff --git a/chrome/browser/android/preferences/autofill/autofill_profile_bridge.cc b/chrome/browser/android/preferences/autofill/autofill_profile_bridge.cc
index dcf2a135595f7d4f54be83ed9894a0cdacd17780..42903337cb004536fe7b811b3d9c51380e1eeeb0 100644
--- a/chrome/browser/android/preferences/autofill/autofill_profile_bridge.cc
+++ b/chrome/browser/android/preferences/autofill/autofill_profile_bridge.cc
@@ -46,12 +46,12 @@
 
 } // namespace
 
-static ScopedJavaLocalRef<jstring> GetDefaultCountryCode(JNIEnv* env,
-                                                         jclass clazz) {
+static jstring GetDefaultCountryCode(JNIEnv* env,
+                                    jclass clazz) {
   std::string default_country_code =
       autofill::AutofillCountry::CountryCodeForLocale(
           g_browser_process->GetApplicationLocale());
-  return ConvertUTF8ToJavaString(env, default_country_code);
+  return ConvertUTF8ToJavaString(env, default_country_code).Release();
 }
 
 static void GetSupportedCountries(JNIEnv* env,
@@ -81,13 +81,12 @@
       j_country_name_list);
 }
 
-static ScopedJavaLocalRef<jstring> GetAddressUiComponents(
-    JNIEnv* env,
-    jclass clazz,
-    jstring j_country_code,
-    jstring j_language_code,
-    jobject j_id_list,
-    jobject j_name_list) {
+static jstring GetAddressUiComponents(JNIEnv* env,
+                                   jclass clazz,
+                                   jstring j_country_code,
+                                   jstring j_language_code,
+                                   jobject j_id_list,
+                                   jobject j_name_list) {
   std::string best_language_tag;
   std::vector<int> component_ids;
   std::vector<std::string> component_labels;
@@ -152,7 +151,7 @@
                                                    env, component_labels).obj(),
                                                j_name_list);
 
-  return ConvertUTF8ToJavaString(env, best_language_tag);
+  return ConvertUTF8ToJavaString(env, best_language_tag).Release();
 }
 
 // static