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

chrome/browser/android/preferences/pref_service_bridge.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 "chrome/browser/android/preferences/pref_service_bridge.h"
 
 #include <jni.h>
 
 #include "base/android/build_info.h"
 #include "base/android/jni_android.h"
@@ skipping 553 matching lines @@
 }
 
 static jboolean CanPredictNetworkActions(JNIEnv* env, jobject obj) {
   return chrome_browser_net::CanPrefetchAndPrerenderUI(GetPrefService());
 }
 
 static void SetDoNotTrackEnabled(JNIEnv* env, jobject obj, jboolean allow) {
   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) {
   GetPrefService()->SetBoolean(prefs::kEnableTranslate, enabled);
 }
 
 static void SetAutoDetectEncodingEnabled(JNIEnv* env, jobject obj,
                                          jboolean enabled) {
   content::RecordAction(base::UserMetricsAction("AutoDetectChange"));
   GetPrefService()->SetBoolean(prefs::kWebKitUsesUniversalDetector, enabled);
@@ skipping 107 matching lines @@
       CONTENT_SETTINGS_TYPE_POPUPS,
       "",
       static_cast<ContentSetting>(setting));
 }
 
 static void SetSearchSuggestEnabled(JNIEnv* env, jobject obj,
                                     jboolean enabled) {
   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,
                                                        jobject obj) {
   return GetPrefService()->IsManagedPreference(prefs::kContextualSearchEnabled);
 }
 
 static void SetContextualSearchPreference(JNIEnv* env, jobject obj,
                                           jstring pref) {
   GetPrefService()->SetString(prefs::kContextualSearchEnabled,
@@ skipping 45 matching lines @@
   std::string accept_languages(l10n_util::GetStringUTF8(IDS_ACCEPT_LANGUAGES));
   std::string locale_string(ConvertJavaStringToUTF8(env, default_locale));
 
   PrefServiceBridge::PrependToAcceptLanguagesIfNecessary(locale_string,
                                                          &accept_languages);
   GetPrefService()->SetString(prefs::kAcceptLanguages, accept_languages);
 }
 
 // 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();
 
   base::android::BuildInfo* android_build_info =
         base::android::BuildInfo::GetInstance();
   std::string application(android_build_info->package_label());
   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());
+      env,
+      ConvertUTF8ToJavaString(env, application).obj(),
+      ConvertUTF8ToJavaString(env, os_version).obj()).Release();
 }
 
-static ScopedJavaLocalRef<jstring> GetSupervisedUserCustodianName(JNIEnv* env,
-                                                                  jobject obj) {
+static jstring GetSupervisedUserCustodianName(JNIEnv* env, jobject obj) {
   return ConvertUTF8ToJavaString(
-      env, GetPrefService()->GetString(prefs::kSupervisedUserCustodianName));
+      env, GetPrefService()->GetString(prefs::kSupervisedUserCustodianName))
+      .Release();
 }
 
-static ScopedJavaLocalRef<jstring> GetSupervisedUserCustodianEmail(
-    JNIEnv* env,
-    jobject obj) {
+static jstring GetSupervisedUserCustodianEmail(JNIEnv* env, jobject obj) {
   return ConvertUTF8ToJavaString(
-      env, GetPrefService()->GetString(prefs::kSupervisedUserCustodianEmail));
+      env, GetPrefService()->GetString(prefs::kSupervisedUserCustodianEmail))
+      .Release();
 }
 
-static ScopedJavaLocalRef<jstring> GetSupervisedUserCustodianProfileImageURL(
-    JNIEnv* env,
-    jobject obj) {
+static jstring GetSupervisedUserCustodianProfileImageURL(JNIEnv* env,
+                                                         jobject obj) {
   return ConvertUTF8ToJavaString(
-      env, GetPrefService()->GetString(
-               prefs::kSupervisedUserCustodianProfileImageURL));
+      env,
+      GetPrefService()->GetString(
+          prefs::kSupervisedUserCustodianProfileImageURL)).Release();
 }
 
-static ScopedJavaLocalRef<jstring> GetSupervisedUserSecondCustodianName(
-    JNIEnv* env,
-    jobject obj) {
+static jstring GetSupervisedUserSecondCustodianName(JNIEnv* env, jobject obj) {
   return ConvertUTF8ToJavaString(
       env,
-      GetPrefService()->GetString(prefs::kSupervisedUserSecondCustodianName));
+      GetPrefService()->GetString(prefs::kSupervisedUserSecondCustodianName))
+      .Release();
 }
 
-static ScopedJavaLocalRef<jstring> GetSupervisedUserSecondCustodianEmail(
-    JNIEnv* env,
-    jobject obj) {
+static jstring GetSupervisedUserSecondCustodianEmail(JNIEnv* env, jobject obj) {
   return ConvertUTF8ToJavaString(
       env,
-      GetPrefService()->GetString(prefs::kSupervisedUserSecondCustodianEmail));
+      GetPrefService()->GetString(prefs::kSupervisedUserSecondCustodianEmail))
+      .Release();
 }
 
-static ScopedJavaLocalRef<jstring>
-GetSupervisedUserSecondCustodianProfileImageURL(JNIEnv* env, jobject obj) {
+static jstring GetSupervisedUserSecondCustodianProfileImageURL(JNIEnv* env,
+                                                               jobject obj) {
   return ConvertUTF8ToJavaString(
-      env, GetPrefService()->GetString(
-               prefs::kSupervisedUserSecondCustodianProfileImageURL));
+      env,
+      GetPrefService()->GetString(
+          prefs::kSupervisedUserSecondCustodianProfileImageURL)).Release();
 }
 
 // static
 bool PrefServiceBridge::RegisterPrefServiceBridge(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 // static
 void PrefServiceBridge::PrependToAcceptLanguagesIfNecessary(
     const std::string& locale,
@@ skipping 35 matching lines @@
     ContentSettingsType content_type) {
   JNIEnv* env = AttachCurrentThread();
   base::android::ScopedJavaLocalRef<jstring> android_permission =
       Java_PrefServiceBridge_getAndroidPermissionForContentSetting(
           env, content_type);
   if (android_permission.is_null())
     return std::string();
 
   return ConvertJavaStringToUTF8(android_permission);
 }