Let Ubertoken Fetch be primed with an access token.

components/signin/core/browser/gaia_cookie_manager_service.cc

 // Copyright 2014 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 "components/signin/core/browser/gaia_cookie_manager_service.h"
 
 #include <queue>
 #include <vector>
 
 #include "base/json/json_reader.h"
@@ skipping 289 matching lines @@
       GaiaUrls::GetInstance()->google_url(),
       "APISID",
       base::Bind(&GaiaCookieManagerService::OnCookieChanged,
                  base::Unretained(this)));
 }
 
 void GaiaCookieManagerService::Shutdown() {
   cookie_changed_subscription_.reset();
 }
 
-void GaiaCookieManagerService::AddAccountToCookie(
+
+void GaiaCookieManagerService::AddAccountToCookieInternal(
     const std::string& account_id) {
+  DCHECK(!account_id.empty());
   if (!signin_client_->AreSigninCookiesAllowed()) {
     SignalComplete(account_id,
         GoogleServiceAuthError(GoogleServiceAuthError::REQUEST_CANCELED));
     return;
   }
 
-  DCHECK(!account_id.empty());
-  VLOG(1) << "GaiaCookieManagerService::AddAccountToCookie: " << account_id;
   requests_.push_back(GaiaCookieRequest::CreateAddAccountRequest(account_id));
   if (requests_.size() == 1) {
     signin_client_->DelayNetworkCall(
         base::Bind(&GaiaCookieManagerService::StartFetchingUbertoken,
                    base::Unretained(this)));
   }
 }
 
+void GaiaCookieManagerService::AddAccountToCookie(
+    const std::string& account_id) {
+  VLOG(1) << "GaiaCookieManagerService::AddAccountToCookie: " << account_id;
+  access_token_ = std::string();
+  AddAccountToCookieInternal(account_id);
+}
+
+void GaiaCookieManagerService::AddAccountToCookieWithToken(
+    const std::string& account_id,
+    const std::string& access_token) {
+  VLOG(1) << "GaiaCookieManagerService::AddAccountToCookieWithToken: "
+          << account_id;
+  DCHECK(!access_token.empty());
+  access_token_ = access_token;
+  AddAccountToCookieInternal(account_id);
+}
+
 bool GaiaCookieManagerService::ListAccounts(
     std::vector<std::pair<std::string,bool> >* accounts) {
   DCHECK(accounts);
   accounts->clear();
 
   // There is a fetch currently executing (the results being provided in the
   // parameter don't align with the fetches that have been started), or the list
   // of accounts haven't been fetched even once.
   if (!requests_.empty())
     return false;
@@ skipping 245 matching lines @@
                        base::Unretained(this))));
     return;
   }
 
   FOR_EACH_OBSERVER(Observer, observer_list_,
       OnGaiaAccountsInCookieUpdated(listed_accounts_, error));
   HandleNextRequest();
 }
 
 void GaiaCookieManagerService::StartFetchingUbertoken() {
-  VLOG(1) << "GaiaCookieManagerService::StartFetching account_id="
+  VLOG(1) << "GaiaCookieManagerService::StartFetchingUbertoken account_id="
           << requests_.front().account_id();
   uber_token_fetcher_.reset(
       new UbertokenFetcher(token_service_, this, source_,
                            signin_client_->GetURLRequestContext()));
-  uber_token_fetcher_->StartFetchingToken(requests_.front().account_id());
+  if (access_token_.empty()) {
+    uber_token_fetcher_->StartFetchingToken(requests_.front().account_id());
+  } else {
+    uber_token_fetcher_->StartFetchingTokenWithAccessToken(
+        requests_.front().account_id(), access_token_);
+  }
 }
 
 void GaiaCookieManagerService::StartFetchingMergeSession() {
   DCHECK(!uber_token_.empty());
   gaia_auth_fetcher_.reset(
       new GaiaAuthFetcher(this, source_,
                           signin_client_->GetURLRequestContext()));
 
   gaia_auth_fetcher_->StartMergeSession(uber_token_,
       external_cc_result_fetcher_.GetExternalCcResult());
@@ skipping 43 matching lines @@
   } else {
     // Pop the completed request.
     requests_.pop_front();
   }
 
   gaia_auth_fetcher_.reset();
   fetcher_retries_ = 0;
   if (requests_.empty()) {
     VLOG(1) << "GaiaCookieManagerService::HandleNextRequest: no more";
     uber_token_fetcher_.reset();
+    access_token_ = std::string();
   } else {
     switch (requests_.front().request_type()) {
       case GaiaCookieRequestType::ADD_ACCOUNT:
         signin_client_->DelayNetworkCall(
             base::Bind(&GaiaCookieManagerService::StartFetchingUbertoken,
                        base::Unretained(this)));
         break;
       case GaiaCookieRequestType::LOG_OUT:
         signin_client_->DelayNetworkCall(
             base::Bind(&GaiaCookieManagerService::StartLogOutUrlFetch,
                        base::Unretained(this)));
         break;
       case GaiaCookieRequestType::LIST_ACCOUNTS:
         uber_token_fetcher_.reset();
         signin_client_->DelayNetworkCall(
             base::Bind(&GaiaCookieManagerService::StartFetchingListAccounts,
                        base::Unretained(this)));
         break;
     };
   }
 }