Index: chrome/browser/profiles/profile_android.cc |
diff --git a/chrome/browser/profiles/profile_android.cc b/chrome/browser/profiles/profile_android.cc |
index 79369d7ca4dacb9bca27b4a418f46d7ab810e21f..5bda90ab31e4e42f2c55502df60b711154ac2c1a 100644 |
--- a/chrome/browser/profiles/profile_android.cc |
+++ b/chrome/browser/profiles/profile_android.cc |
@@ -48,20 +48,21 @@ bool ProfileAndroid::RegisterProfileAndroid(JNIEnv* env) { |
} |
// static |
-jobject ProfileAndroid::GetLastUsedProfile(JNIEnv* env, jclass clazz) { |
+ScopedJavaLocalRef<jobject> ProfileAndroid::GetLastUsedProfile(JNIEnv* env, |
+ jclass clazz) { |
Profile* profile = ProfileManager::GetLastUsedProfile(); |
if (profile == NULL) { |
NOTREACHED() << "Profile not found."; |
- return NULL; |
+ return ScopedJavaLocalRef<jobject>(); |
} |
ProfileAndroid* profile_android = ProfileAndroid::FromProfile(profile); |
if (profile_android == NULL) { |
NOTREACHED() << "ProfileAndroid not found."; |
- return NULL; |
+ return ScopedJavaLocalRef<jobject>(); |
} |
- return profile_android->obj_.obj(); |
+ return ScopedJavaLocalRef<jobject>(profile_android->obj_); |
} |
void ProfileAndroid::DestroyWhenAppropriate(JNIEnv* env, jobject obj) { |
@@ -95,7 +96,7 @@ jboolean ProfileAndroid::IsOffTheRecord(JNIEnv* env, jobject obj) { |
} |
// static |
-jobject GetLastUsedProfile(JNIEnv* env, jclass clazz) { |
+ScopedJavaLocalRef<jobject> GetLastUsedProfile(JNIEnv* env, jclass clazz) { |
return ProfileAndroid::GetLastUsedProfile(env, clazz); |
} |