Let Ubertoken Fetch be primed with an access token.

google_apis/gaia/ubertoken_fetcher.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 "google_apis/gaia/ubertoken_fetcher.h"
 
 #include <vector>
 
 #include "base/logging.h"
 #include "base/rand_util.h"
@@ skipping 25 matching lines @@
 UbertokenFetcher::~UbertokenFetcher() {
 }
 
 void UbertokenFetcher::StartFetchingToken(const std::string& account_id) {
   DCHECK(!account_id.empty());
   account_id_ = account_id;
   second_access_token_request_ = false;
   RequestAccessToken();
 }
 
+void UbertokenFetcher::StartFetchingTokenWithAccessToken(
+    const std::string& account_id, const std::string& access_token) {
+  DCHECK(!account_id.empty());
+  if (access_token.empty())

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

Adding a DCHECK() then handling this case seems bad. Just add your DCHECK() then
fall through with an empty access_token (you'll end up getting an auth error,
but that's OK - the access_token is invalid and there's no reason to treat
access_token == "" any differently than access_token == "foobar_invalid_token"

[Roger Tawa OOO till Jul 10th, 2015/05/11 16:56:16]

This code is DCHECKing one thing and handling another, so seems OK from that
point of view.  However, seems that if the access token is empty, this should
return after call to StartFetchingToken() as Xiyuan suggests.

Alternatively, do as Drew suggests and collapse
StartFetchingTokenWithAccessToken() into StartFetchingToken() and have only one
method that does the right thing depending on if an access token is given or
not.

[Andrew T Wilson (Slow), 2015/05/12 15:08:08]

Ah, you are right, I missed that one was checking account_id and the other was
checking access_token.

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

Changed this method so that it should always have both an access token and an
account_id.

+    StartFetchingToken(account_id);

[xiyuan, 2015/05/11 16:11:58]

Should we return here to let access token fetching finish?

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

I no longer permit access_token.empty(). The caller should call the other method
instead.

+
+  account_id_ = account_id;
+  access_token_ = access_token;
+  ExchangeTokens();
+}
+
 void UbertokenFetcher::OnUberAuthTokenSuccess(const std::string& token) {
   consumer_->OnUbertokenSuccess(token);
 }
 
 void UbertokenFetcher::OnUberAuthTokenFailure(
     const GoogleServiceAuthError& error) {
   // Retry only transient errors.
   bool should_retry =
       error.state() == GoogleServiceAuthError::CONNECTION_FAILED ||
       error.state() == GoogleServiceAuthError::SERVICE_UNAVAILABLE;
@@ skipping 53 matching lines @@
   access_token_request_ =
       token_service_->StartRequest(account_id_, scopes, this);
 }
 
 void UbertokenFetcher::ExchangeTokens() {
   gaia_auth_fetcher_.reset(new GaiaAuthFetcher(this,
                                                source_,
                                                request_context_));
   gaia_auth_fetcher_->StartTokenFetchForUberAuthExchange(access_token_);
 }