Let Ubertoken Fetch be primed with an access token.

components/signin/core/browser/gaia_cookie_manager_service.h

Index: components/signin/core/browser/gaia_cookie_manager_service.h
diff --git a/components/signin/core/browser/gaia_cookie_manager_service.h b/components/signin/core/browser/gaia_cookie_manager_service.h
index d5b6c51fcfd9e7bd0275b348500cbf99003b77ef..6f9b60e046d458835a18ffa90041298b2e1b9a25 100644
--- a/components/signin/core/browser/gaia_cookie_manager_service.h
+++ b/components/signin/core/browser/gaia_cookie_manager_service.h
@@ -160,6 +160,8 @@ class GaiaCookieManagerService : public KeyedService,
   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
@@ -216,7 +218,7 @@ class GaiaCookieManagerService : public KeyedService,
 
   // 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();