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

chrome/browser/profiles/profile_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/profiles/profile_android.h"
 
 #include "base/android/jni_android.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_destroyer.h"
 #include "chrome/browser/profiles/profile_manager.h"
@@ skipping 30 matching lines @@
     return NULL;
   return profile_android->profile_;
 }
 
 // static
 bool ProfileAndroid::RegisterProfileAndroid(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 // static
-ScopedJavaLocalRef<jobject> ProfileAndroid::GetLastUsedProfile(JNIEnv* env,
-                                                               jclass clazz) {
+jobject ProfileAndroid::GetLastUsedProfile(JNIEnv* env, jclass clazz) {
   Profile* profile = ProfileManager::GetLastUsedProfile();
   if (profile == NULL) {
     NOTREACHED() << "Profile not found.";
-    return ScopedJavaLocalRef<jobject>();
+    return NULL;
   }
 
   ProfileAndroid* profile_android = ProfileAndroid::FromProfile(profile);
   if (profile_android == NULL) {
     NOTREACHED() << "ProfileAndroid not found.";
-    return ScopedJavaLocalRef<jobject>();
+    return NULL;
   }
 
-  return ScopedJavaLocalRef<jobject>(profile_android->obj_);
+  return profile_android->obj_.obj();
 }
 
 void ProfileAndroid::DestroyWhenAppropriate(JNIEnv* env, jobject obj) {
   // Don't delete the Profile directly because the corresponding
   // RenderViewHost might not be deleted yet.
   ProfileDestroyer::DestroyProfileWhenAppropriate(profile_);
 }
 
 base::android::ScopedJavaLocalRef<jobject> ProfileAndroid::GetOriginalProfile(
     JNIEnv* env, jobject obj) {
@@ skipping 13 matching lines @@
 
 jboolean ProfileAndroid::HasOffTheRecordProfile(JNIEnv* env, jobject obj) {
   return profile_->HasOffTheRecordProfile();
 }
 
 jboolean ProfileAndroid::IsOffTheRecord(JNIEnv* env, jobject obj) {
   return profile_->IsOffTheRecord();
 }
 
 // static
-ScopedJavaLocalRef<jobject> GetLastUsedProfile(JNIEnv* env, jclass clazz) {
+jobject GetLastUsedProfile(JNIEnv* env, jclass clazz) {
   return ProfileAndroid::GetLastUsedProfile(env, clazz);
 }
 
 ProfileAndroid::ProfileAndroid(Profile* profile)
     : profile_(profile) {
   JNIEnv* env = AttachCurrentThread();
   base::android::ScopedJavaLocalRef<jobject> jprofile =
       Java_Profile_create(env, reinterpret_cast<intptr_t>(this));
   obj_.Reset(env, jprofile.obj());
 }
 
 ProfileAndroid::~ProfileAndroid() {
   Java_Profile_onNativeDestroyed(AttachCurrentThread(), obj_.obj());
 }
 
 base::android::ScopedJavaLocalRef<jobject> ProfileAndroid::GetJavaObject() {
   return base::android::ScopedJavaLocalRef<jobject>(obj_);
 }