ProfileSyncService: Get access tokens via IdentityManager

instead of talking to ProfileOAuth2TokenService directly.

Bug: 825190
Change-Id: I80f1e52857f3fd8effbb6351a22e5bd86062d326
Reviewed-on: https://chromium-review.googlesource.com/1028150
Commit-Queue: Marc Treib <treib@chromium.org>
Reviewed-by: Colin Blundell <blundell@chromium.org>
Cr-Commit-Position: refs/heads/master@{#556422}

components/browser_sync/profile_sync_service.cc

@@ -1961,10 +1961,10 @@ void ProfileSyncService::RequestAccessToken() {
 
   // Invalidate previous token, otherwise token service will return the same
   // token again.
-  const std::string& account_id = signin_->GetAccountIdToUse();
   if (!access_token_.empty()) {
-    oauth2_token_service_->InvalidateAccessToken(account_id, oauth2_scopes,
-                                                 access_token_);
+    signin_->GetIdentityManager()->RemoveAccessTokenFromCache(
+        signin_->GetIdentityManager()->GetPrimaryAccountInfo(), oauth2_scopes,
+        access_token_);
   }
 
   access_token_.clear();
@@ -1973,9 +1973,8 @@ void ProfileSyncService::RequestAccessToken() {
   token_status_.token_receive_time = base::Time();
   token_status_.next_token_request_time = base::Time();
   ongoing_access_token_fetch_ =
-      std::make_unique<identity::PrimaryAccountAccessTokenFetcher>(
-          kSyncOAuthConsumerName, signin_->GetSigninManager(),
-          oauth2_token_service_, oauth2_scopes,
+      signin_->GetIdentityManager()->CreateAccessTokenFetcherForPrimaryAccount(
+          kSyncOAuthConsumerName, oauth2_scopes,
           base::BindOnce(&ProfileSyncService::AccessTokenFetched,
                          base::Unretained(this)),
           identity::PrimaryAccountAccessTokenFetcher::Mode::kImmediate);