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

chrome/browser/android/preferences/pref_service_bridge.cc

Index: chrome/browser/android/preferences/pref_service_bridge.cc
diff --git a/chrome/browser/android/preferences/pref_service_bridge.cc b/chrome/browser/android/preferences/pref_service_bridge.cc
index 531fe4666d77cac89cfa39318b866ad366b744f0..b588807557086212325016ccfbad6ff83615eefb 100644
--- a/chrome/browser/android/preferences/pref_service_bridge.cc
+++ b/chrome/browser/android/preferences/pref_service_bridge.cc
@@ -571,10 +571,10 @@
   GetPrefService()->SetBoolean(prefs::kEnableDoNotTrack, allow);
 }
 
-static ScopedJavaLocalRef<jstring> GetSyncLastAccountName(JNIEnv* env,
-                                                          jobject obj) {
+static jstring GetSyncLastAccountName(JNIEnv* env, jobject obj) {
   return ConvertUTF8ToJavaString(
-      env, GetPrefService()->GetString(prefs::kGoogleServicesLastUsername));
+      env, GetPrefService()->GetString(prefs::kGoogleServicesLastUsername))
+      .Release();
 }
 
 static void SetTranslateEnabled(JNIEnv* env, jobject obj, jboolean enabled) {
@@ -702,10 +702,10 @@
   GetPrefService()->SetBoolean(prefs::kSearchSuggestEnabled, enabled);
 }
 
-static ScopedJavaLocalRef<jstring> GetContextualSearchPreference(JNIEnv* env,
-                                                                 jobject obj) {
+static jstring GetContextualSearchPreference(JNIEnv* env, jobject obj) {
   return ConvertUTF8ToJavaString(
-      env, GetPrefService()->GetString(prefs::kContextualSearchEnabled));
+      env, GetPrefService()->GetString(prefs::kContextualSearchEnabled)).
+          Release();
 }
 
 static jboolean GetContextualSearchPreferenceIsManaged(JNIEnv* env,
@@ -771,8 +771,7 @@
 
 // Sends all information about the different versions to Java.
 // From browser_about_handler.cc
-static ScopedJavaLocalRef<jobject> GetAboutVersionStrings(JNIEnv* env,
-                                                          jobject obj) {
+static jobject GetAboutVersionStrings(JNIEnv* env, jobject obj) {
   std::string os_version = version_info::GetOSType();
   os_version += " " + AndroidAboutAppInfo::GetOsInfo();
 
@@ -782,53 +781,53 @@
   application.append(" ");
   application.append(version_info::GetVersionNumber());
 
+  // OK to release, returning to Java.
   return Java_PrefServiceBridge_createAboutVersionStrings(
-      env, ConvertUTF8ToJavaString(env, application).obj(),
-      ConvertUTF8ToJavaString(env, os_version).obj());
-}
-
-static ScopedJavaLocalRef<jstring> GetSupervisedUserCustodianName(JNIEnv* env,
-                                                                  jobject obj) {
+      env,
+      ConvertUTF8ToJavaString(env, application).obj(),
+      ConvertUTF8ToJavaString(env, os_version).obj()).Release();
+}
+
+static jstring GetSupervisedUserCustodianName(JNIEnv* env, jobject obj) {
   return ConvertUTF8ToJavaString(
-      env, GetPrefService()->GetString(prefs::kSupervisedUserCustodianName));
-}
-
-static ScopedJavaLocalRef<jstring> GetSupervisedUserCustodianEmail(
-    JNIEnv* env,
-    jobject obj) {
+      env, GetPrefService()->GetString(prefs::kSupervisedUserCustodianName))
+      .Release();
+}
+
+static jstring GetSupervisedUserCustodianEmail(JNIEnv* env, jobject obj) {
   return ConvertUTF8ToJavaString(
-      env, GetPrefService()->GetString(prefs::kSupervisedUserCustodianEmail));
-}
-
-static ScopedJavaLocalRef<jstring> GetSupervisedUserCustodianProfileImageURL(
-    JNIEnv* env,
-    jobject obj) {
-  return ConvertUTF8ToJavaString(
-      env, GetPrefService()->GetString(
-               prefs::kSupervisedUserCustodianProfileImageURL));
-}
-
-static ScopedJavaLocalRef<jstring> GetSupervisedUserSecondCustodianName(
-    JNIEnv* env,
-    jobject obj) {
+      env, GetPrefService()->GetString(prefs::kSupervisedUserCustodianEmail))
+      .Release();
+}
+
+static jstring GetSupervisedUserCustodianProfileImageURL(JNIEnv* env,
+                                                         jobject obj) {
   return ConvertUTF8ToJavaString(
       env,
-      GetPrefService()->GetString(prefs::kSupervisedUserSecondCustodianName));
-}
-
-static ScopedJavaLocalRef<jstring> GetSupervisedUserSecondCustodianEmail(
-    JNIEnv* env,
-    jobject obj) {
+      GetPrefService()->GetString(
+          prefs::kSupervisedUserCustodianProfileImageURL)).Release();
+}
+
+static jstring GetSupervisedUserSecondCustodianName(JNIEnv* env, jobject obj) {
   return ConvertUTF8ToJavaString(
       env,
-      GetPrefService()->GetString(prefs::kSupervisedUserSecondCustodianEmail));
-}
-
-static ScopedJavaLocalRef<jstring>
-GetSupervisedUserSecondCustodianProfileImageURL(JNIEnv* env, jobject obj) {
+      GetPrefService()->GetString(prefs::kSupervisedUserSecondCustodianName))
+      .Release();
+}
+
+static jstring GetSupervisedUserSecondCustodianEmail(JNIEnv* env, jobject obj) {
   return ConvertUTF8ToJavaString(
-      env, GetPrefService()->GetString(
-               prefs::kSupervisedUserSecondCustodianProfileImageURL));
+      env,
+      GetPrefService()->GetString(prefs::kSupervisedUserSecondCustodianEmail))
+      .Release();
+}
+
+static jstring GetSupervisedUserSecondCustodianProfileImageURL(JNIEnv* env,
+                                                               jobject obj) {
+  return ConvertUTF8ToJavaString(
+      env,
+      GetPrefService()->GetString(
+          prefs::kSupervisedUserSecondCustodianProfileImageURL)).Release();
 }
 
 // static