Multiple account support in chrome.identity.getAuthToken

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

 // Copyright (c) 2013 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/gaia_web_auth_flow.h"
 
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "components/signin/core/browser/profile_oauth2_token_service.h"
 #include "components/signin/core/browser/signin_manager.h"
 #include "google_apis/gaia/gaia_urls.h"
 #include "net/base/escape.h"
 
 namespace extensions {
 
 GaiaWebAuthFlow::GaiaWebAuthFlow(Delegate* delegate,
                                  Profile* profile,
+                                 const std::string& account_id,
                                  const std::string& extension_id,
                                  const OAuth2Info& oauth2_info,
                                  const std::string& locale)
-    : delegate_(delegate),
-      profile_(profile) {
+    : delegate_(delegate), profile_(profile), account_id_(account_id) {
   const char kOAuth2RedirectPathFormat[] = "/%s#";
   const char kOAuth2AuthorizeFormat[] =
       "?response_type=token&approval_prompt=force&authuser=0&"
       "client_id=%s&"
       "scope=%s&"
       "origin=chrome-extension://%s/&"
       "redirect_uri=%s:/%s&"
       "hl=%s";
 
   std::vector<std::string> client_id_parts;
@@ skipping 19 matching lines @@
   if (web_flow_)
     web_flow_.release()->DetachDelegateAndDelete();
 }
 
 void GaiaWebAuthFlow::Start() {
   ProfileOAuth2TokenService* token_service =
       ProfileOAuth2TokenServiceFactory::GetForProfile(profile_);
   ubertoken_fetcher_.reset(new UbertokenFetcher(token_service,
                                                 this,
                                                 profile_->GetRequestContext()));
-  SigninManagerBase* signin_manager =
-      SigninManagerFactory::GetForProfile(profile_);
-  ubertoken_fetcher_->StartFetchingToken(
-      signin_manager->GetAuthenticatedAccountId());
+  ubertoken_fetcher_->StartFetchingToken(account_id_);
 }
 
 void GaiaWebAuthFlow::OnUbertokenSuccess(const std::string& token) {
   const char kMergeSessionQueryFormat[] = "?uberauth=%s&"
                                           "continue=%s&"
                                           "source=appsv2";
 
   std::string merge_query = base::StringPrintf(
       kMergeSessionQueryFormat,
       net::EscapeUrlEncodedData(token, true).c_str(),
       net::EscapeUrlEncodedData(auth_url_.spec(), true).c_str());
   GURL merge_url(
       GaiaUrls::GetInstance()->merge_session_url().Resolve(merge_query));
 
   web_flow_ = CreateWebAuthFlow(merge_url);
   web_flow_->Start();
 }
 
 void GaiaWebAuthFlow::OnUbertokenFailure(const GoogleServiceAuthError& error) {
+  DVLOG(1) << "OnUbertokenFailure: " << error.error_message();
   delegate_->OnGaiaFlowFailure(
       GaiaWebAuthFlow::SERVICE_AUTH_ERROR, error, std::string());
 }
 
 void GaiaWebAuthFlow::OnAuthFlowFailure(WebAuthFlow::Failure failure) {
   GaiaWebAuthFlow::Failure gaia_failure;
 
   switch (failure) {
     case WebAuthFlow::WINDOW_CLOSED:
       gaia_failure = GaiaWebAuthFlow::WINDOW_CLOSED;
       break;
     case WebAuthFlow::LOAD_FAILED:
+      DVLOG(1) << "OnAuthFlowFailure LOAD_FAILED";
       gaia_failure = GaiaWebAuthFlow::LOAD_FAILED;
       break;
     default:
       NOTREACHED() << "Unexpected error from web auth flow: " << failure;
       gaia_failure = GaiaWebAuthFlow::LOAD_FAILED;
       break;
   }
 
   delegate_->OnGaiaFlowFailure(
       gaia_failure,
@@ skipping 66 matching lines @@
 }
 
 scoped_ptr<WebAuthFlow> GaiaWebAuthFlow::CreateWebAuthFlow(GURL url) {
   return scoped_ptr<WebAuthFlow>(new WebAuthFlow(this,
                                                  profile_,
                                                  url,
                                                  WebAuthFlow::INTERACTIVE));
 }
 
 }  // namespace extensions