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 4982b2649237b6db16370bab1f4ad70bf9946680..36d8b0b066622bdfabd643c1f98b770783d943ce 100644 |
--- a/chrome/browser/signin/oauth2_token_service_delegate_android.cc |
+++ b/chrome/browser/signin/oauth2_token_service_delegate_android.cc |
@@ -4,7 +4,6 @@ |
#include "chrome/browser/signin/oauth2_token_service_delegate_android.h" |
-#include "base/android/context_utils.h" |
#include "base/android/jni_android.h" |
#include "base/android/jni_array.h" |
#include "base/android/jni_string.h" |
@@ -95,7 +94,7 @@ void AndroidAccessTokenFetcher::Start(const std::string& client_id, |
// Call into Java to get a new token. |
Java_OAuth2TokenService_getOAuth2AuthToken( |
- env, base::android::GetApplicationContext(), j_username, j_scope, |
+ env, j_username, j_scope, |
reinterpret_cast<intptr_t>(heap_callback.release())); |
} |
@@ -152,9 +151,7 @@ OAuth2TokenServiceDelegateAndroid::OAuth2TokenServiceDelegateAndroid( |
DCHECK(account_tracker_service_); |
JNIEnv* env = AttachCurrentThread(); |
base::android::ScopedJavaLocalRef<jobject> local_java_ref = |
- Java_OAuth2TokenService_create(env, |
- base::android::GetApplicationContext(), |
- reinterpret_cast<intptr_t>(this)); |
+ Java_OAuth2TokenService_create(env, reinterpret_cast<intptr_t>(this)); |
java_ref_.Reset(env, local_java_ref.obj()); |
if (account_tracker_service_->GetMigrationState() == |
@@ -169,14 +166,12 @@ OAuth2TokenServiceDelegateAndroid::OAuth2TokenServiceDelegateAndroid( |
} |
ScopedJavaLocalRef<jobjectArray> java_accounts( |
base::android::ToJavaArrayOfStrings(env, accounts_id)); |
- Java_OAuth2TokenService_saveStoredAccounts( |
- env, base::android::GetApplicationContext(), java_accounts); |
+ Java_OAuth2TokenService_saveStoredAccounts(env, java_accounts); |
} |
if (!is_testing_profile_) { |
- Java_OAuth2TokenService_validateAccounts( |
- AttachCurrentThread(), java_ref_, |
- base::android::GetApplicationContext(), JNI_TRUE); |
+ Java_OAuth2TokenService_validateAccounts(AttachCurrentThread(), java_ref_, |
+ JNI_TRUE); |
} |
} |
@@ -213,8 +208,7 @@ bool OAuth2TokenServiceDelegateAndroid::RefreshTokenIsAvailable( |
ScopedJavaLocalRef<jstring> j_account_id = |
ConvertUTF8ToJavaString(env, account_name); |
jboolean refresh_token_is_available = |
- Java_OAuth2TokenService_hasOAuth2RefreshToken( |
- env, base::android::GetApplicationContext(), j_account_id); |
+ Java_OAuth2TokenService_hasOAuth2RefreshToken(env, j_account_id); |
return refresh_token_is_available == JNI_TRUE; |
} |
@@ -243,8 +237,7 @@ std::vector<std::string> OAuth2TokenServiceDelegateAndroid::GetAccounts() { |
std::vector<std::string> accounts; |
JNIEnv* env = AttachCurrentThread(); |
ScopedJavaLocalRef<jobjectArray> j_accounts = |
- Java_OAuth2TokenService_getAccounts( |
- env, base::android::GetApplicationContext()); |
+ Java_OAuth2TokenService_getAccounts(env); |
// TODO(fgorski): We may decide to filter out some of the accounts. |
base::android::AppendJavaStringArrayToStringVector(env, j_accounts.obj(), |
&accounts); |
@@ -256,8 +249,7 @@ OAuth2TokenServiceDelegateAndroid::GetSystemAccountNames() { |
std::vector<std::string> account_names; |
JNIEnv* env = AttachCurrentThread(); |
ScopedJavaLocalRef<jobjectArray> j_accounts = |
- Java_OAuth2TokenService_getSystemAccountNames( |
- env, base::android::GetApplicationContext()); |
+ Java_OAuth2TokenService_getSystemAccountNames(env); |
base::android::AppendJavaStringArrayToStringVector(env, j_accounts.obj(), |
&account_names); |
return account_names; |
@@ -284,8 +276,7 @@ void OAuth2TokenServiceDelegateAndroid::InvalidateAccessToken( |
JNIEnv* env = AttachCurrentThread(); |
ScopedJavaLocalRef<jstring> j_access_token = |
ConvertUTF8ToJavaString(env, access_token); |
- Java_OAuth2TokenService_invalidateOAuth2AuthToken( |
- env, base::android::GetApplicationContext(), j_access_token); |
+ Java_OAuth2TokenService_invalidateOAuth2AuthToken(env, j_access_token); |
} |
void OAuth2TokenServiceDelegateAndroid::ValidateAccounts( |
@@ -346,8 +337,7 @@ void OAuth2TokenServiceDelegateAndroid::ValidateAccounts( |
// Save the current accounts in the token service before calling |
// FireRefreshToken* methods. |
- Java_OAuth2TokenService_saveStoredAccounts( |
- env, base::android::GetApplicationContext(), java_accounts); |
+ Java_OAuth2TokenService_saveStoredAccounts(env, java_accounts); |
for (const std::string& refreshed_id : refreshed_ids) |
FireRefreshTokenAvailable(refreshed_id); |
@@ -512,8 +502,7 @@ void OAuth2TokenServiceDelegateAndroid::RevokeAllCredentials() { |
JNIEnv* env = AttachCurrentThread(); |
ScopedJavaLocalRef<jobjectArray> java_accounts( |
base::android::ToJavaArrayOfStrings(env, std::vector<std::string>())); |
- Java_OAuth2TokenService_saveStoredAccounts( |
- env, base::android::GetApplicationContext(), java_accounts); |
+ Java_OAuth2TokenService_saveStoredAccounts(env, java_accounts); |
for (const std::string& account : accounts_to_revoke) |
FireRefreshTokenRevoked(account); |