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

chrome/browser/profiles/profile_android.cc

Index: chrome/browser/profiles/profile_android.cc
diff --git a/chrome/browser/profiles/profile_android.cc b/chrome/browser/profiles/profile_android.cc
index 5bda90ab31e4e42f2c55502df60b711154ac2c1a..79369d7ca4dacb9bca27b4a418f46d7ab810e21f 100644
--- a/chrome/browser/profiles/profile_android.cc
+++ b/chrome/browser/profiles/profile_android.cc
@@ -48,21 +48,20 @@
 }
 
 // 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) {
@@ -96,7 +95,7 @@
 }
 
 // static
-ScopedJavaLocalRef<jobject> GetLastUsedProfile(JNIEnv* env, jclass clazz) {
+jobject GetLastUsedProfile(JNIEnv* env, jclass clazz) {
   return ProfileAndroid::GetLastUsedProfile(env, clazz);
 }