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

chrome/browser/android/profiles/profile_downloader_android.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/profiles/profile_downloader_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile_android.h"
@@ skipping 102 matching lines @@
   // such as during first run when we can still get tokens and want to fetch
   // the profile name and picture to display.
   bool is_pre_signin_;
 
   DISALLOW_COPY_AND_ASSIGN(AccountInfoRetriever);
 };
 
 }  // namespace
 
 // static
-ScopedJavaLocalRef<jstring> GetCachedFullNameForPrimaryAccount(
-    JNIEnv* env,
-    jclass clazz,
-    jobject jprofile) {
+jstring GetCachedFullNameForPrimaryAccount(JNIEnv* env,
+                                           jclass clazz,
+                                           jobject jprofile) {
   Profile* profile = ProfileAndroid::FromProfileAndroid(jprofile);
   ProfileInfoInterface& info =
       g_browser_process->profile_manager()->GetProfileInfoCache();
   const size_t index = info.GetIndexOfProfileWithPath(profile->GetPath());
 
   base::string16 name;
   if (index != std::string::npos)
     name = info.GetGAIANameOfProfileAtIndex(index);
 
-  return base::android::ConvertUTF16ToJavaString(env, name);
+  return base::android::ConvertUTF16ToJavaString(env, name).Release();
 }
 
 // static
-ScopedJavaLocalRef<jstring> GetCachedGivenNameForPrimaryAccount(
-    JNIEnv* env,
-    jclass clazz,
-    jobject jprofile) {
+jstring GetCachedGivenNameForPrimaryAccount(JNIEnv* env,
+                                            jclass clazz,
+                                            jobject jprofile) {
   Profile* profile = ProfileAndroid::FromProfileAndroid(jprofile);
   ProfileInfoInterface& info =
       g_browser_process->profile_manager()->GetProfileInfoCache();
   const size_t index = info.GetIndexOfProfileWithPath(profile->GetPath());
 
   base::string16 name;
   if (index != std::string::npos)
     name = info.GetGAIAGivenNameOfProfileAtIndex(index);
 
-  return base::android::ConvertUTF16ToJavaString(env, name);
+  return base::android::ConvertUTF16ToJavaString(env, name).Release();
 }
 
 // static
-ScopedJavaLocalRef<jobject> GetCachedAvatarForPrimaryAccount(JNIEnv* env,
-                                                             jclass clazz,
-                                                             jobject jprofile) {
+jobject GetCachedAvatarForPrimaryAccount(JNIEnv* env,
+                                         jclass clazz,
+                                         jobject jprofile) {
   Profile* profile = ProfileAndroid::FromProfileAndroid(jprofile);
   ProfileInfoInterface& info =
       g_browser_process->profile_manager()->GetProfileInfoCache();
   const size_t index = info.GetIndexOfProfileWithPath(profile->GetPath());
 
   ScopedJavaLocalRef<jobject> jbitmap;
   if (index != std::string::npos) {
     gfx::Image avatar_image = info.GetAvatarIconOfProfileAtIndex(index);
     if (!avatar_image.IsEmpty() &&
         avatar_image.Width() > profiles::kAvatarIconWidth &&
         avatar_image.Height() > profiles::kAvatarIconHeight &&
         avatar_image.AsImageSkia().bitmap()) {
       jbitmap = gfx::ConvertToJavaBitmap(avatar_image.AsImageSkia().bitmap());
     }
   }
 
-  return jbitmap;
+  return jbitmap.Release();
 }
 
 // static
 void StartFetchingAccountInfoFor(
     JNIEnv* env,
     jclass clazz,
     jobject jprofile,
     jstring jemail,
     jint image_side_pixels,
     jboolean is_pre_signin) {
   Profile* profile = ProfileAndroid::FromProfileAndroid(jprofile);
   const std::string email =
       base::android::ConvertJavaStringToUTF8(env, jemail);
   // TODO(rogerta): the java code will need to pass in the gaia-id
   // of the account instead of the email when chrome uses gaia-id as key.
   DCHECK_EQ(AccountTrackerService::MIGRATION_NOT_STARTED,
             AccountTrackerServiceFactory::GetForProfile(profile)->
                 GetMigrationState());
   AccountInfoRetriever* retriever =
       new AccountInfoRetriever(
           profile, gaia::CanonicalizeEmail(gaia::SanitizeEmail(email)), email,
           image_side_pixels, is_pre_signin);
   retriever->Start();
 }
 
 // static
 bool RegisterProfileDownloader(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }