Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4785)

Unified Diff: chrome/browser/signin/oauth2_token_service_delegate_android.cc

Issue 1288183004: jni_generator: Make all object-returning natives return ScopedJavaLocalRef. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add some newlines for readability Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/signin/oauth2_token_service_delegate_android.cc
diff --git a/chrome/browser/signin/oauth2_token_service_delegate_android.cc b/chrome/browser/signin/oauth2_token_service_delegate_android.cc
index 8bd13bcd5224c6f838b5e26aedb4bc5d4474f0aa..04e78c0db5cb70e23ee1815a56fb34b9f391d263 100644
--- a/chrome/browser/signin/oauth2_token_service_delegate_android.cc
+++ b/chrome/browser/signin/oauth2_token_service_delegate_android.cc
@@ -150,7 +150,7 @@ OAuth2TokenServiceDelegateAndroid::~OAuth2TokenServiceDelegateAndroid() {
}
// static
-jobject OAuth2TokenServiceDelegateAndroid::GetForProfile(
+ScopedJavaLocalRef<jobject> OAuth2TokenServiceDelegateAndroid::GetForProfile(
JNIEnv* env,
jclass clazz,
jobject j_profile_android) {
@@ -158,13 +158,13 @@ jobject OAuth2TokenServiceDelegateAndroid::GetForProfile(
ProfileOAuth2TokenService* service =
ProfileOAuth2TokenServiceFactory::GetForProfile(profile);
OAuth2TokenServiceDelegate* delegate = service->GetDelegate();
- return static_cast<OAuth2TokenServiceDelegateAndroid*>(delegate)
- ->java_ref_.obj();
+ return ScopedJavaLocalRef<jobject>(
+ static_cast<OAuth2TokenServiceDelegateAndroid*>(delegate)->java_ref_);
}
-static jobject GetForProfile(JNIEnv* env,
- jclass clazz,
- jobject j_profile_android) {
+static ScopedJavaLocalRef<jobject> GetForProfile(JNIEnv* env,
+ jclass clazz,
+ jobject j_profile_android) {
return OAuth2TokenServiceDelegateAndroid::GetForProfile(env, clazz,
j_profile_android);
}

Powered by Google App Engine
This is Rietveld 408576698