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 291 matching lines @@
       base::Bind(&GaiaCookieManagerService::OnCookieChanged,
                  base::Unretained(this)));
 }
 
 void GaiaCookieManagerService::Shutdown() {
   cookie_changed_subscription_.reset();
 }
 
 void GaiaCookieManagerService::AddAccountToCookie(
     const std::string& account_id) {
+  AddAccountToCookieWithToken(account_id, std::string());
+}
+
+void GaiaCookieManagerService::AddAccountToCookieWithToken(
+    const std::string& account_id, const std::string& oauth2_token) {

[Roger Tawa OOO till Jul 10th, 2015/05/07 18:44:50]

oauth2_token is not very clear.  Is this an access token or a refresh token?  
Let's rename this arg to |access_token|.

[Mike Lerman, 2015/05/12 20:51:44]

Done.

   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)
-    StartFetchingUbertoken();
+  if (requests_.size() == 1) {
+    StartFetchingUbertoken(oauth2_token);
+  }
 }
 
 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.
@@ skipping 226 matching lines @@
         FROM_HERE, fetcher_backoff_.GetTimeUntilRelease(), this,
         &GaiaCookieManagerService::StartFetchingListAccounts);
     return;
   }
 
   FOR_EACH_OBSERVER(Observer, observer_list_,
       OnGaiaAccountsInCookieUpdated(listed_accounts_, error));
   HandleNextRequest();
 }
 
-void GaiaCookieManagerService::StartFetchingUbertoken() {
+void GaiaCookieManagerService::StartFetchingUbertoken(
+    const std::string& access_token) {
   VLOG(1) << "GaiaCookieManagerService::StartFetching 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_->OnGetTokenSuccess(nullptr, access_token, base::Time());

[Roger Tawa OOO till Jul 10th, 2015/05/07 18:44:50]

Would be better to add access_token arg to StartFethingToken().  As this it
exposes the internal implementation of UbertokenFetcher.

[Mike Lerman, 2015/05/12 20:51:44]

Done.

 }
 
 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 42 matching lines @@
   }
 
   gaia_auth_fetcher_.reset();
   fetcher_retries_ = 0;
   if (requests_.empty()) {
     VLOG(1) << "GaiaCookieManagerService::HandleNextRequest: no more";
     uber_token_fetcher_.reset();
   } else {
     switch (requests_.front().request_type()) {
       case GaiaCookieRequestType::ADD_ACCOUNT:
-        StartFetchingUbertoken();
+        StartFetchingUbertoken(std::string());
         break;
       case GaiaCookieRequestType::LOG_OUT:
         StartLogOutUrlFetch();
         break;
       case GaiaCookieRequestType::LIST_ACCOUNTS:
         uber_token_fetcher_.reset();
         StartFetchingListAccounts();
         break;
     };
   }
 }