Let Ubertoken Fetch be primed with an access token.

chrome/browser/chromeos/login/signin/oauth2_login_verifier.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 "chrome/browser/chromeos/login/signin/oauth2_login_verifier.h"
 
 #include <vector>
 
 #include "base/logging.h"
 #include "content/public/browser/browser_thread.h"
@@ skipping 34 matching lines @@
 
   std::vector<std::pair<std::string, bool> > accounts;
   if (cookie_manager_service_->ListAccounts(&accounts)) {
     OnGaiaAccountsInCookieUpdated(
         accounts, GoogleServiceAuthError(GoogleServiceAuthError::NONE));
   }
 }
 
 void OAuth2LoginVerifier::VerifyProfileTokens(Profile* profile) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
-
-  // TODO(xiyuan,mlerman): Use |access_token_| to cut down one round trip.
-  // See http://crbug.com/483596
-  cookie_manager_service_->AddAccountToCookie(primary_account_id_);
+  if (access_token_.empty()) {
+    cookie_manager_service_->AddAccountToCookie(primary_account_id_);
+  } else {
+    cookie_manager_service_->AddAccountToCookieWithToken(primary_account_id_,
+                                                         access_token_);
+  }
 }
 
 void OAuth2LoginVerifier::OnAddAccountToCookieCompleted(
     const std::string& account_id,
     const GoogleServiceAuthError& error) {
   if (account_id != primary_account_id_)
     return;
 
   if (error.state() == GoogleServiceAuthError::State::NONE) {
     VLOG(1) << "MergeSession successful.";
@@ skipping 14 matching lines @@
     delegate_->OnListAccountsSuccess(accounts);
     return;
   }
 
   LOG(WARNING) << "Failed to get list of session accounts, "
                << " error: " << error.state();
   delegate_->OnListAccountsFailure(IsConnectionOrServiceError(error));
 }
 
 }  // namespace chromeos