Let Ubertoken Fetch be primed with an access token.

google_apis/gaia/ubertoken_fetcher.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 GOOGLE_APIS_GAIA_UBERTOKEN_FETCHER_H_
 #define GOOGLE_APIS_GAIA_UBERTOKEN_FETCHER_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "base/timer/timer.h"
 #include "google_apis/gaia/gaia_auth_consumer.h"
@@ skipping 32 matching lines @@
   static const int kMaxRetries;
 
   UbertokenFetcher(OAuth2TokenService* token_service,
                    UbertokenConsumer* consumer,
                    const std::string& source,
                    net::URLRequestContextGetter* request_context);
   ~UbertokenFetcher() override;
 
   // Start fetching the token for |account_id|.
   virtual void StartFetchingToken(const std::string& account_id);
+  virtual void StartFetchingTokenWithAccessToken(const std::string& account_id,

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

This does special stuff if access_token.empty() == true. I think this is a poor
API choice, so I'd either change the caller so they call StartFetchingToken()
instead, or else document this behavior.

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

Changed, per your other comment, so that this no longer has special behaviour if
access_token.empty(). We just DCHECK(!empty()).

+      const std::string& access_token);
 
   // Overriden from GaiaAuthConsumer
   void OnUberAuthTokenSuccess(const std::string& token) override;
   void OnUberAuthTokenFailure(const GoogleServiceAuthError& error) override;
 
   // Overriden from OAuth2TokenService::Consumer:
   void OnGetTokenSuccess(const OAuth2TokenService::Request* request,
                          const std::string& access_token,
                          const base::Time& expiration_time) override;
   void OnGetTokenFailure(const OAuth2TokenService::Request* request,
@@ skipping 15 matching lines @@
   std::string account_id_;
   std::string access_token_;
   int retry_number_;
   base::OneShotTimer<UbertokenFetcher> retry_timer_;
   bool second_access_token_request_;
 
   DISALLOW_COPY_AND_ASSIGN(UbertokenFetcher);
 };
 
 #endif  // GOOGLE_APIS_GAIA_UBERTOKEN_FETCHER_H_