Don't use Mojo to get access tokens in identity_get_auth_token_function.cc

identity_get_auth_token_function.cc uses a mix of C++ and Mojo code.
This CL ports GetAccessToken() to C++.

Bug: 913853
Change-Id: I71ffbc6944dff0a886d57a4d8b10cb0fa334390b
Reviewed-on: https://chromium-review.googlesource.com/c/1458300
Commit-Queue: Henrique Ferreiro <hferreiro@igalia.com>
Reviewed-by: Colin Blundell <blundell@chromium.org>
Reviewed-by: David Roger <droger@chromium.org>
Cr-Commit-Position: refs/heads/master@{#635492}

chrome/browser/extensions/api/identity/identity_get_auth_token_function.cc

@@ -710,6 +710,7 @@ void IdentityGetAuthTokenFunction::OnGetTokenFailure(
   device_access_token_request_.reset();
   OnGetAccessTokenComplete(base::nullopt, base::Time(), error);
 }
+#endif
 
 void IdentityGetAuthTokenFunction::OnAccessTokenFetchCompleted(
     GoogleServiceAuthError error,
@@ -723,7 +724,6 @@ void IdentityGetAuthTokenFunction::OnAccessTokenFetchCompleted(
     OnGetAccessTokenComplete(base::nullopt, base::Time(), error);
   }
 }
-#endif
 
 void IdentityGetAuthTokenFunction::OnIdentityAPIShutdown() {
   gaia_web_auth_flow_.reset();
@@ -766,6 +766,7 @@ bool IdentityGetAuthTokenFunction::IsOriginWhitelistedInPublicSession() {
 #endif
 
 void IdentityGetAuthTokenFunction::StartTokenKeyAccountAccessTokenRequest() {
+  auto* identity_manager = IdentityManagerFactory::GetForProfile(GetProfile());
 #if defined(OS_CHROMEOS)
   if (chrome::IsRunningInForcedAppMode()) {
     std::string app_client_id;
@@ -774,25 +775,27 @@ void IdentityGetAuthTokenFunction::StartTokenKeyAccountAccessTokenRequest() {
             GetAppModeChromeClientOAuthInfo(&app_client_id,
                                             &app_client_secret)) {
       token_key_account_access_token_fetcher_ =
-          IdentityManagerFactory::GetForProfile(GetProfile())
-              ->CreateAccessTokenFetcherForClient(
-                  token_key_.account_id, app_client_id, app_client_secret,
-                  kExtensionsIdentityAPIOAuthConsumerName,
-                  OAuth2TokenService::ScopeSet(),
-                  base::BindOnce(&IdentityGetAuthTokenFunction::
-                                     OnAccessTokenFetchCompleted,
-                                 base::Unretained(this)),
-                  identity::AccessTokenFetcher::Mode::kImmediate);
+          identity_manager->CreateAccessTokenFetcherForClient(
+              token_key_.account_id, app_client_id, app_client_secret,
+              kExtensionsIdentityAPIOAuthConsumerName,
+              OAuth2TokenService::ScopeSet(),
+              base::BindOnce(
+                  &IdentityGetAuthTokenFunction::OnAccessTokenFetchCompleted,
+                  base::Unretained(this)),
+              identity::AccessTokenFetcher::Mode::kImmediate);
       return;
     }
   }
 #endif
 
-  GetMojoIdentityManager()->GetAccessToken(
-      token_key_.account_id, ::identity::ScopeSet(),
-      kExtensionsIdentityAPIOAuthConsumerName,
-      base::BindOnce(&IdentityGetAuthTokenFunction::OnGetAccessTokenComplete,
-                     base::Unretained(this)));
+  token_key_account_access_token_fetcher_ =
+      identity_manager->CreateAccessTokenFetcherForAccount(
+          token_key_.account_id, kExtensionsIdentityAPIOAuthConsumerName,
+          ::identity::ScopeSet(),
+          base::BindOnce(
+              &IdentityGetAuthTokenFunction::OnAccessTokenFetchCompleted,
+              base::Unretained(this)),
+          identity::AccessTokenFetcher::Mode::kImmediate);
 }
 
 void IdentityGetAuthTokenFunction::StartGaiaRequest(

chrome/browser/extensions/api/identity/identity_get_auth_token_function.h

@@ -89,12 +89,12 @@ class IdentityGetAuthTokenFunction : public ChromeAsyncExtensionFunction,
       const OAuth2AccessTokenConsumer::TokenResponse& token_response) override;
   void OnGetTokenFailure(const OAuth2TokenService::Request* request,
                          const GoogleServiceAuthError& error) override;
+#endif
 
   void OnAccessTokenFetchCompleted(GoogleServiceAuthError error,
                                    identity::AccessTokenInfo access_token_info);
-#endif
 
-  // Invoked on completion of IdentityManager::GetAccessToken().
+  // Invoked on completion of the access token fetcher.
   // Exposed for testing.
   void OnGetAccessTokenComplete(const base::Optional<std::string>& access_token,
                                 base::Time expiration_time,