Making OAuth2TokenService multi-login aware, updating callers, minor fixes

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

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/api/identity/experimental_identity_api.h"
 
 #include <set>
 #include <string>
 #include <vector>
 
@@ skipping 217 matching lines @@
 void ExperimentalIdentityGetAuthTokenFunction::StartLoginAccessTokenRequest() {
   ProfileOAuth2TokenService* service =
       ProfileOAuth2TokenServiceFactory::GetForProfile(profile());
 #if defined(OS_CHROMEOS)
   if (chrome::IsRunningInForcedAppMode()) {
     std::string app_client_id;
     std::string app_client_secret;
     if (chromeos::UserManager::Get()->GetAppModeChromeClientOAuthInfo(
            &app_client_id, &app_client_secret)) {
       login_token_request_ =
-          service->StartRequestForClient(app_client_id,
+          service->StartRequestForClient(service->GetPrimaryAccountId(),
+                                         app_client_id,
                                          app_client_secret,
                                          OAuth2TokenService::ScopeSet(),
                                          this);
       return;
     }
   }
 #endif
-  login_token_request_ = service->StartRequest(OAuth2TokenService::ScopeSet(),
-                                               this);
+  login_token_request_ = service->StartRequest(
+      service->GetPrimaryAccountId(), OAuth2TokenService::ScopeSet(), this);
 }
 
 void ExperimentalIdentityGetAuthTokenFunction::StartGaiaRequest(
     const std::string& login_access_token) {
   DCHECK(!login_access_token.empty());
   mint_token_flow_.reset(CreateMintTokenFlow(login_access_token));
   mint_token_flow_->Start();
 }
 
 void ExperimentalIdentityGetAuthTokenFunction::ShowLoginPopup() {
@@ skipping 23 matching lines @@
           OAuth2MintTokenFlow::Parameters(
               login_access_token,
               GetExtension()->id(),
               oauth2_info.client_id,
               oauth2_info.scopes,
               gaia_mint_token_mode_));
   return mint_token_flow;
 }
 
 bool ExperimentalIdentityGetAuthTokenFunction::HasLoginToken() const {
-  return ProfileOAuth2TokenServiceFactory::GetForProfile(profile())->
-      RefreshTokenIsAvailable();
+  ProfileOAuth2TokenService* token_service =
+      ProfileOAuth2TokenServiceFactory::GetForProfile(profile());
+  return token_service->RefreshTokenIsAvailable(
+      token_service->GetPrimaryAccountId());
 }
 
 ExperimentalIdentityLaunchWebAuthFlowFunction::
     ExperimentalIdentityLaunchWebAuthFlowFunction() {}
 
 ExperimentalIdentityLaunchWebAuthFlowFunction::
     ~ExperimentalIdentityLaunchWebAuthFlowFunction() {
   if (auth_flow_)
     auth_flow_.release()->DetachDelegateAndDelete();
 }
@@ skipping 87 matching lines @@
   }
 }
 
 void ExperimentalIdentityLaunchWebAuthFlowFunction::
     InitFinalRedirectURLPrefixesForTest(const std::string& extension_id) {
   final_prefixes_.clear();
   InitFinalRedirectURLPrefixes(extension_id);
 }
 
 }  // namespace extensions