Let Ubertoken Fetch be primed with an access token.

components/signin/core/browser/gaia_cookie_manager_service.h

 // 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.
 
 #ifndef COMPONENTS_SIGNIN_CORE_BROWSER_GAIA_COOKIE_MANAGER_SERVICE_H
 #define COMPONENTS_SIGNIN_CORE_BROWSER_GAIA_COOKIE_MANAGER_SERVICE_H
 
 #include <deque>
 
 #include "base/observer_list.h"
@@ skipping 142 matching lines @@
 
   GaiaCookieManagerService(OAuth2TokenService* token_service,
                            const std::string& source,
                            SigninClient* signin_client);
   ~GaiaCookieManagerService() override;
 
   void Init();
   void Shutdown() override;
 
   void AddAccountToCookie(const std::string& account_id);
+  void AddAccountToCookieWithToken(const std::string& account_id,
+                                   const std::string& access_token);
 
   // Returns if the listed accounts are up to date or not (ignore the out
   // parameter if return is false). The parameter will be assigned the current
   // cached accounts. If the accounts are not up to date, a ListAccounts fetch
   // is sent GAIA and Observer::OnGaiaAccountsInCookieUpdated will be called.
   bool ListAccounts(std::vector<std::pair<std::string,bool> >* accounts);
 
   // Add or remove observers of this helper.
   void AddObserver(Observer* observer);
   void RemoveObserver(Observer* observer);
@@ skipping 36 matching lines @@
   void OnUbertokenFailure(const GoogleServiceAuthError& error) override;
 
   // Overridden from GaiaAuthConsumer.
   void OnMergeSessionSuccess(const std::string& data) override;
   void OnMergeSessionFailure(const GoogleServiceAuthError& error) override;
   void OnListAccountsSuccess(const std::string& data) override;
   void OnListAccountsFailure(const GoogleServiceAuthError& error) override;
 
   // Starts the proess of fetching the uber token and performing a merge session
   // for the next account.  Virtual so that it can be overriden in tests.
-  virtual void StartFetchingUbertoken();
+  virtual void StartFetchingUbertoken(const std::string& access_token);

[Andrew T Wilson (Slow), 2015/05/11 10:06:21]

This seems like a clunky API, to have this method do something special if
access_token is empty. Consider breaking the functionality out into two separate
routines, or else at least documenting that you do something special if
access_token.empty() == true.

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

Broken out into two methods.

 
   // Virtual for testing purposes.
   virtual void StartFetchingMergeSession();
 
   // Virtual for testing purpose.
   virtual void StartLogOutUrlFetch();
 
   // Virtual for testing purposes.
   virtual void StartFetchingListAccounts();
 
@@ skipping 38 matching lines @@
 
   std::vector<std::pair<std::string, bool> > listed_accounts_;
 
   bool list_accounts_fetched_once_;
   scoped_ptr<net::URLFetcher> logout_url_request_;
 
   DISALLOW_COPY_AND_ASSIGN(GaiaCookieManagerService);
 };
 
 #endif  // COMPONENTS_SIGNIN_CORE_BROWSER_GAIA_COOKIE_MANAGER_SERVICE_H