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 304 matching lines @@
     return;
   }
 
   DCHECK(!account_id.empty());
   VLOG(1) << "GaiaCookieManagerService::AddAccountToCookie: " << account_id;
   requests_.push_back(GaiaCookieRequest::CreateAddAccountRequest(account_id));
   if (requests_.size() == 1)
     StartFetchingUbertoken();
 }
 
+void GaiaCookieManagerService::AddAccountToCookieWithToken(
+    const std::string& account_id, const std::string& access_token) {

[Roger Tawa OOO till Jul 10th, 2015/05/14 20:51:35]

nit: two lines?

[Mike Lerman, 2015/05/15 20:49:47]

Done.

+  if (!signin_client_->AreSigninCookiesAllowed()) {
+    SignalComplete(account_id,
+        GoogleServiceAuthError(GoogleServiceAuthError::REQUEST_CANCELED));
+    return;
+  }
+
+  DCHECK(!account_id.empty());
+  DCHECK(!access_token.empty());
+  VLOG(1) << "GaiaCookieManagerService::AddAccountToCookie: " << account_id;

[Roger Tawa OOO till Jul 10th, 2015/05/14 20:51:35]

nit: wrong vlog function name.

[Mike Lerman, 2015/05/15 20:49:47]

Done.

+  requests_.push_back(GaiaCookieRequest::CreateAddAccountRequest(account_id));
+  if (requests_.size() == 1)
+    StartFetchingUbertokenWithAccessToken(access_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.
   if (!requests_.empty())
     return false;
@@ skipping 233 matching lines @@
 
 void GaiaCookieManagerService::StartFetchingUbertoken() {
   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());
 }
 
+void GaiaCookieManagerService::StartFetchingUbertokenWithAccessToken(
+    const std::string& access_token) {
+  VLOG(1) << "GaiaCookieManagerService::StartFetching account_id="
+          << requests_.front().account_id();

[Roger Tawa OOO till Jul 10th, 2015/05/14 20:51:35]

nit: wrong vlog function name.

[Mike Lerman, 2015/05/15 20:49:47]

Done.

+  DCHECK(!access_token.empty());
+  uber_token_fetcher_.reset(
+      new UbertokenFetcher(token_service_, this, source_,
+                           signin_client_->GetURLRequestContext()));
+  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 52 matching lines @@
       case GaiaCookieRequestType::LOG_OUT:
         StartLogOutUrlFetch();
         break;
       case GaiaCookieRequestType::LIST_ACCOUNTS:
         uber_token_fetcher_.reset();
         StartFetchingListAccounts();
         break;
     };
   }
 }