Index: chrome/browser/signin/android_profile_oauth2_token_service.cc |
diff --git a/chrome/browser/signin/android_profile_oauth2_token_service.cc b/chrome/browser/signin/android_profile_oauth2_token_service.cc |
index 673ee58438132d3320dca9e327e1761105c151d1..8ff244dc8ff0535c1834688cef76954e00246b08 100644 |
--- a/chrome/browser/signin/android_profile_oauth2_token_service.cc |
+++ b/chrome/browser/signin/android_profile_oauth2_token_service.cc |
@@ -134,7 +134,7 @@ std::string AndroidAccessTokenFetcher::CombineScopes( |
bool AndroidProfileOAuth2TokenService::is_testing_profile_ = false; |
AndroidProfileOAuth2TokenService::AndroidProfileOAuth2TokenService() { |
- VLOG(1) << "AndroidProfileOAuth2TokenService::ctor"; |
+ DVLOG(1) << "AndroidProfileOAuth2TokenService::ctor"; |
JNIEnv* env = AttachCurrentThread(); |
base::android::ScopedJavaLocalRef<jobject> local_java_ref = |
Java_OAuth2TokenService_create(env, reinterpret_cast<intptr_t>(this)); |
@@ -160,7 +160,7 @@ static jobject GetForProfile(JNIEnv* env, |
} |
void AndroidProfileOAuth2TokenService::Initialize(SigninClient* client) { |
- VLOG(1) << "AndroidProfileOAuth2TokenService::Initialize"; |
+ DVLOG(1) << "AndroidProfileOAuth2TokenService::Initialize"; |
ProfileOAuth2TokenService::Initialize(client); |
if (!is_testing_profile_) { |
@@ -246,7 +246,7 @@ void AndroidProfileOAuth2TokenService::ValidateAccounts( |
jobject obj, |
jstring j_current_acc, |
jboolean j_force_notifications) { |
- VLOG(1) << "AndroidProfileOAuth2TokenService::ValidateAccounts from java"; |
+ DVLOG(1) << "AndroidProfileOAuth2TokenService::ValidateAccounts from java"; |
std::string signed_in_account = ConvertJavaStringToUTF8(env, j_current_acc); |
if (!signed_in_account.empty()) |
signed_in_account = gaia::CanonicalizeEmail(signed_in_account); |
@@ -267,11 +267,11 @@ void AndroidProfileOAuth2TokenService::ValidateAccounts( |
for (size_t i = 0; i < prev_ids.size(); ++i) |
ValidateAccountId(prev_ids[i]); |
- VLOG(1) << "AndroidProfileOAuth2TokenService::ValidateAccounts:" |
- << " sigined_in_account=" << signed_in_account |
- << " prev_ids=" << prev_ids.size() |
- << " curr_ids=" << curr_ids.size() |
- << " force=" << (force_notifications ? "true" : "false"); |
+ DVLOG(1) << "AndroidProfileOAuth2TokenService::ValidateAccounts:" |
+ << " sigined_in_account=" << signed_in_account |
+ << " prev_ids=" << prev_ids.size() |
+ << " curr_ids=" << curr_ids.size() |
+ << " force=" << (force_notifications ? "true" : "false"); |
if (!ValidateAccounts(signed_in_account, prev_ids, curr_ids, refreshed_ids, |
revoked_ids, force_notifications)) { |
@@ -317,8 +317,8 @@ bool AndroidProfileOAuth2TokenService::ValidateAccounts( |
if (std::find(curr_account_ids.begin(), |
curr_account_ids.end(), |
*it) == curr_account_ids.end()) { |
- VLOG(1) << "AndroidProfileOAuth2TokenService::ValidateAccounts:" |
- << "revoked=" << *it; |
+ DVLOG(1) << "AndroidProfileOAuth2TokenService::ValidateAccounts:" |
+ << "revoked=" << *it; |
revoked_ids.push_back(*it); |
} |
} |
@@ -327,8 +327,8 @@ bool AndroidProfileOAuth2TokenService::ValidateAccounts( |
std::find(prev_account_ids.begin(), prev_account_ids.end(), |
signed_in_account) == prev_account_ids.end()) { |
// Always fire the primary signed in account first. |
- VLOG(1) << "AndroidProfileOAuth2TokenService::ValidateAccounts:" |
- << "refreshed=" << signed_in_account; |
+ DVLOG(1) << "AndroidProfileOAuth2TokenService::ValidateAccounts:" |
+ << "refreshed=" << signed_in_account; |
refreshed_ids.push_back(signed_in_account); |
} |
@@ -339,8 +339,8 @@ bool AndroidProfileOAuth2TokenService::ValidateAccounts( |
std::find(prev_account_ids.begin(), |
prev_account_ids.end(), |
*it) == prev_account_ids.end()) { |
- VLOG(1) << "AndroidProfileOAuth2TokenService::ValidateAccounts:" |
- << "refreshed=" << *it; |
+ DVLOG(1) << "AndroidProfileOAuth2TokenService::ValidateAccounts:" |
+ << "refreshed=" << *it; |
refreshed_ids.push_back(*it); |
} |
} |
@@ -351,16 +351,16 @@ bool AndroidProfileOAuth2TokenService::ValidateAccounts( |
// system together with all other accounts. |
if (std::find(prev_account_ids.begin(), prev_account_ids.end(), |
signed_in_account) != prev_account_ids.end()) { |
- VLOG(1) << "AndroidProfileOAuth2TokenService::ValidateAccounts:" |
- << "revoked=" << signed_in_account; |
+ DVLOG(1) << "AndroidProfileOAuth2TokenService::ValidateAccounts:" |
+ << "revoked=" << signed_in_account; |
revoked_ids.push_back(signed_in_account); |
} |
for (std::vector<std::string>::const_iterator it = prev_account_ids.begin(); |
it != prev_account_ids.end(); it++) { |
if (*it == signed_in_account) |
continue; |
- VLOG(1) << "AndroidProfileOAuth2TokenService::ValidateAccounts:" |
- << "revoked=" << *it; |
+ DVLOG(1) << "AndroidProfileOAuth2TokenService::ValidateAccounts:" |
+ << "revoked=" << *it; |
revoked_ids.push_back(*it); |
} |
return false; |
@@ -377,8 +377,8 @@ void AndroidProfileOAuth2TokenService::FireRefreshTokenAvailableFromJava( |
void AndroidProfileOAuth2TokenService::FireRefreshTokenAvailable( |
const std::string& account_id) { |
- VLOG(1) << "AndroidProfileOAuth2TokenService::FireRefreshTokenAvailable id=" |
- << account_id; |
+ DVLOG(1) << "AndroidProfileOAuth2TokenService::FireRefreshTokenAvailable id=" |
+ << account_id; |
// Notify native observers. |
OAuth2TokenService::FireRefreshTokenAvailable(account_id); |
@@ -400,8 +400,8 @@ void AndroidProfileOAuth2TokenService::FireRefreshTokenRevokedFromJava( |
void AndroidProfileOAuth2TokenService::FireRefreshTokenRevoked( |
const std::string& account_id) { |
- VLOG(1) << "AndroidProfileOAuth2TokenService::FireRefreshTokenRevoked id=" |
- << account_id; |
+ DVLOG(1) << "AndroidProfileOAuth2TokenService::FireRefreshTokenRevoked id=" |
+ << account_id; |
// Notify native observers. |
OAuth2TokenService::FireRefreshTokenRevoked(account_id); |
@@ -420,7 +420,7 @@ void AndroidProfileOAuth2TokenService::FireRefreshTokensLoadedFromJava( |
} |
void AndroidProfileOAuth2TokenService::FireRefreshTokensLoaded() { |
- VLOG(1) << "AndroidProfileOAuth2TokenService::FireRefreshTokensLoaded"; |
+ DVLOG(1) << "AndroidProfileOAuth2TokenService::FireRefreshTokensLoaded"; |
// Notify native observers. |
OAuth2TokenService::FireRefreshTokensLoaded(); |
// Notify Java observers. |
@@ -430,7 +430,7 @@ void AndroidProfileOAuth2TokenService::FireRefreshTokensLoaded() { |
} |
void AndroidProfileOAuth2TokenService::RevokeAllCredentials() { |
- VLOG(1) << "AndroidProfileOAuth2TokenService::RevokeAllCredentials"; |
+ DVLOG(1) << "AndroidProfileOAuth2TokenService::RevokeAllCredentials"; |
ScopedBatchChange batch(this); |
std::vector<std::string> accounts = GetAccounts(); |
for (std::vector<std::string>::iterator it = accounts.begin(); |