Changing IdentityManager::Observer and its subclasses to use CoreAccountId
This cl is part of the effort to use CoreAccountId instead of std::string
to denote account_id.
Bug: 959157
Change-Id: I0fd318d8034fb1294336f7534eb672fd1faeb084
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1611996
Reviewed-by: Mihai Sardarescu <[email protected]>
Reviewed-by: Sylvain Defresne <[email protected]>
Reviewed-by: Colin Blundell <[email protected]>
Commit-Queue: Tanmoy Mollik <[email protected]>
Cr-Commit-Position: refs/heads/master@{#661344}
diff --git a/components/gcm_driver/account_tracker.cc b/components/gcm_driver/account_tracker.cc
index f0c0f8d..38788dd 100644
--- a/components/gcm_driver/account_tracker.cc
+++ b/components/gcm_driver/account_tracker.cc
@@ -80,9 +80,9 @@
}
void AccountTracker::OnRefreshTokenRemovedForAccount(
- const std::string& account_id) {
+ const CoreAccountId& account_id) {
TRACE_EVENT1("identity", "AccountTracker::OnRefreshTokenRemovedForAccount",
- "account_id", account_id);
+ "account_id", account_id.id);
DVLOG(1) << "REVOKED " << account_id;
UpdateSignInState(account_id, /*is_signed_in=*/false);
diff --git a/components/gcm_driver/account_tracker.h b/components/gcm_driver/account_tracker.h
index d72926aec..bcfca70 100644
--- a/components/gcm_driver/account_tracker.h
+++ b/components/gcm_driver/account_tracker.h
@@ -83,7 +83,8 @@
const CoreAccountInfo& previous_primary_account_info) override;
void OnRefreshTokenUpdatedForAccount(
const CoreAccountInfo& account_info) override;
- void OnRefreshTokenRemovedForAccount(const std::string& account_id) override;
+ void OnRefreshTokenRemovedForAccount(
+ const CoreAccountId& account_id) override;
void OnUserInfoFetchSuccess(AccountIdFetcher* fetcher,
const std::string& gaia_id);
diff --git a/components/invalidation/impl/profile_identity_provider.cc b/components/invalidation/impl/profile_identity_provider.cc
index 2bda764..ff26ade 100644
--- a/components/invalidation/impl/profile_identity_provider.cc
+++ b/components/invalidation/impl/profile_identity_provider.cc
@@ -116,7 +116,7 @@
}
void ProfileIdentityProvider::OnRefreshTokenRemovedForAccount(
- const std::string& account_id) {
+ const CoreAccountId& account_id) {
ProcessRefreshTokenRemovalForAccount(account_id);
}
diff --git a/components/invalidation/impl/profile_identity_provider.h b/components/invalidation/impl/profile_identity_provider.h
index 097034b..3bbfdc7 100644
--- a/components/invalidation/impl/profile_identity_provider.h
+++ b/components/invalidation/impl/profile_identity_provider.h
@@ -34,7 +34,8 @@
// identity::IdentityManager::Observer:
void OnRefreshTokenUpdatedForAccount(
const CoreAccountInfo& account_info) override;
- void OnRefreshTokenRemovedForAccount(const std::string& account_id) override;
+ void OnRefreshTokenRemovedForAccount(
+ const CoreAccountId& account_id) override;
private:
identity::IdentityManager* const identity_manager_;
diff --git a/components/sync/driver/sync_auth_manager.cc b/components/sync/driver/sync_auth_manager.cc
index 82f23e57..66cb8be 100644
--- a/components/sync/driver/sync_auth_manager.cc
+++ b/components/sync/driver/sync_auth_manager.cc
@@ -342,7 +342,7 @@
}
void SyncAuthManager::OnRefreshTokenRemovedForAccount(
- const std::string& account_id) {
+ const CoreAccountId& account_id) {
// If we're syncing to a different account, then this doesn't affect us.
if (account_id != sync_account_.account_info.account_id) {
return;
diff --git a/components/sync/driver/sync_auth_manager.h b/components/sync/driver/sync_auth_manager.h
index 3764af60..684fe15fd 100644
--- a/components/sync/driver/sync_auth_manager.h
+++ b/components/sync/driver/sync_auth_manager.h
@@ -104,7 +104,8 @@
const CoreAccountInfo& previous_primary_account_info) override;
void OnRefreshTokenUpdatedForAccount(
const CoreAccountInfo& account_info) override;
- void OnRefreshTokenRemovedForAccount(const std::string& account_id) override;
+ void OnRefreshTokenRemovedForAccount(
+ const CoreAccountId& account_id) override;
void OnAccountsInCookieUpdated(
const identity::AccountsInCookieJarInfo& accounts_in_cookie_jar_info,
const GoogleServiceAuthError& error) override;
diff --git a/components/sync/driver/sync_session_durations_metrics_recorder.cc b/components/sync/driver/sync_session_durations_metrics_recorder.cc
index d81c2bae..9a96e99 100644
--- a/components/sync/driver/sync_session_durations_metrics_recorder.cc
+++ b/components/sync/driver/sync_session_durations_metrics_recorder.cc
@@ -136,7 +136,7 @@
}
void SyncSessionDurationsMetricsRecorder::OnRefreshTokenRemovedForAccount(
- const std::string& account_id) {
+ const CoreAccountId& account_id) {
DVLOG(1) << __func__;
HandleSyncAndAccountChange();
}
diff --git a/components/sync/driver/sync_session_durations_metrics_recorder.h b/components/sync/driver/sync_session_durations_metrics_recorder.h
index 815a9d3..f4860817 100644
--- a/components/sync/driver/sync_session_durations_metrics_recorder.h
+++ b/components/sync/driver/sync_session_durations_metrics_recorder.h
@@ -40,7 +40,8 @@
// IdentityManager::Observer:
void OnRefreshTokenUpdatedForAccount(
const CoreAccountInfo& account_info) override;
- void OnRefreshTokenRemovedForAccount(const std::string& account_id) override;
+ void OnRefreshTokenRemovedForAccount(
+ const CoreAccountId& account_id) override;
void OnRefreshTokensLoaded() override;
void OnErrorStateOfRefreshTokenUpdatedForAccount(
const CoreAccountInfo& account_info,
