Change IdentityManager API to take in account ID

We've made the decision that IdentityManager APIs that query account
information should take in account IDs, with those that *return*
information continuing to return full AccountInfo structs. This CL
changes the one remaining API that takes in an AccountInfo
(RemoveAccessTokenFromCache()) to take in the account ID instead.

Bug: 796544
Change-Id: I1d6894fa40045fa54956f777723e1e2d3383098d
Reviewed-on: https://chromium-review.googlesource.com/1110224
Commit-Queue: Colin Blundell <blundell@chromium.org>
Reviewed-by: Sylvain Defresne <sdefresne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#569642}

components/autofill/core/browser/payments/payments_client.cc

@@ -701,7 +701,7 @@ void PaymentsClient::StartTokenFetch(bool invalidate_old) {
   if (invalidate_old) {
     DCHECK(!access_token_.empty());
     identity_manager_->RemoveAccessTokenFromCache(
-        identity_manager_->GetPrimaryAccountInfo(), payments_scopes,
+        identity_manager_->GetPrimaryAccountInfo().account_id, payments_scopes,
         access_token_);
   }
   access_token_.clear();

components/browser_sync/sync_auth_manager.cc

@@ -278,8 +278,8 @@ void SyncAuthManager::RequestAccessToken() {
   // Invalidate previous token, otherwise token service will return the same
   // token again.
   if (!access_token_.empty()) {
-    identity_manager_->RemoveAccessTokenFromCache(GetAuthenticatedAccountInfo(),
-                                                  oauth2_scopes, access_token_);
+    identity_manager_->RemoveAccessTokenFromCache(
+        GetAuthenticatedAccountInfo().account_id, oauth2_scopes, access_token_);
 
     access_token_.clear();
     credentials_changed_callback_.Run();

components/history/core/browser/web_history_service.cc

@@ -199,7 +199,7 @@ class RequestImpl : public WebHistoryService::Request {
       OAuth2TokenService::ScopeSet oauth_scopes;
       oauth_scopes.insert(kHistoryOAuthScope);
       identity_manager_->RemoveAccessTokenFromCache(
-          identity_manager_->GetPrimaryAccountInfo(), oauth_scopes,
+          identity_manager_->GetPrimaryAccountInfo().account_id, oauth_scopes,
           access_token_);
 
       access_token_.clear();

services/identity/public/cpp/identity_manager.cc

@@ -106,7 +106,7 @@ IdentityManager::CreateAccessTokenFetcherForPrimaryAccount(
 }
 
 void IdentityManager::RemoveAccessTokenFromCache(
-    const AccountInfo& account_info,
+    const std::string& account_id,
     const OAuth2TokenService::ScopeSet& scopes,
     const std::string& access_token) {
   // TODO(843510): Consider making the request to ProfileOAuth2TokenService
@@ -115,8 +115,7 @@ void IdentityManager::RemoveAccessTokenFromCache(
   // ProfileOAuth2TokenService::RequestAccessToken() to be made asynchronously
   // as well (to maintain ordering in the case where a client removes an access
   // token from the cache and then immediately requests an access token).
-  token_service_->InvalidateAccessToken(account_info.account_id, scopes,
-                                        access_token);
+  token_service_->InvalidateAccessToken(account_id, scopes, access_token);
 }
 
 void IdentityManager::AddObserver(Observer* observer) {

services/identity/public/cpp/identity_manager.h

@@ -139,7 +139,7 @@ class IdentityManager : public SigninManagerBase::Observer,
   // given information, removes that entry; in this case, the next access token
   // request for |account_id| and |scopes| will fetch a new token from the
   // network. Otherwise, is a no-op.
-  void RemoveAccessTokenFromCache(const AccountInfo& account_info,
+  void RemoveAccessTokenFromCache(const std::string& account_id,
                                   const OAuth2TokenService::ScopeSet& scopes,
                                   const std::string& access_token);
 

services/identity/public/cpp/identity_manager_unittest.cc

@@ -491,11 +491,7 @@ TEST_F(IdentityManagerTest, RemoveAccessTokenFromCache) {
   token_service()->set_on_access_token_invalidated_info(
       account_id, scopes, access_token, run_loop.QuitClosure());
 
-  AccountInfo account_info;
-  account_info.account_id = account_id;
-  account_info.gaia = kTestGaiaId;
-  account_info.email = kTestEmail;
-  identity_manager()->RemoveAccessTokenFromCache(account_info, scopes,
+  identity_manager()->RemoveAccessTokenFromCache(account_id, scopes,
                                                  access_token);
 
   run_loop.Run();