Fix issues with token refresh in AccountReconcilor

chrome/browser/signin/google_auto_login_helper.cc

 // Copyright 2013 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/signin/google_auto_login_helper.h"
 
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "google_apis/gaia/gaia_auth_fetcher.h"
 #include "google_apis/gaia/gaia_constants.h"
 
 GoogleAutoLoginHelper::GoogleAutoLoginHelper(Profile* profile)
     : profile_(profile) {}
 
 GoogleAutoLoginHelper::~GoogleAutoLoginHelper() {}
 
 void GoogleAutoLoginHelper::LogIn() {
   uber_token_fetcher_.reset(new UbertokenFetcher(profile_, this));
   uber_token_fetcher_->StartFetchingToken();
 }
 
 void GoogleAutoLoginHelper::LogIn(const std::string& account_id) {
-  uber_token_fetcher_.reset(new UbertokenFetcher(profile_, this));
-  uber_token_fetcher_->StartFetchingToken(account_id);
+  if (uber_token_fetcher_.get()) {
+    accounts_.push_back(account_id);
+  } else {
+    uber_token_fetcher_.reset(new UbertokenFetcher(profile_, this));
+    uber_token_fetcher_->StartFetchingToken(account_id);
+  }
 }
 
 void GoogleAutoLoginHelper::OnUbertokenSuccess(const std::string& uber_token) {
   gaia_auth_fetcher_.reset(new GaiaAuthFetcher(
       this, GaiaConstants::kChromeSource, profile_->GetRequestContext()));
   gaia_auth_fetcher_->StartMergeSession(uber_token);
 }
 
 void GoogleAutoLoginHelper::OnUbertokenFailure(
     const GoogleServiceAuthError& error) {
   VLOG(1) << "Failed to retrieve ubertoken, error: " << error.ToString();
   base::MessageLoop::current()->DeleteSoon(FROM_HERE, this);
 }
 
 void GoogleAutoLoginHelper::OnMergeSessionSuccess(const std::string& data) {
   DVLOG(1) << "MergeSession successful." << data;
-  base::MessageLoop::current()->DeleteSoon(FROM_HERE, this);
+  if (accounts_.empty()) {
+    base::MessageLoop::current()->DeleteSoon(FROM_HERE, this);
+  } else {
+    uber_token_fetcher_.reset(new UbertokenFetcher(profile_, this));
+    uber_token_fetcher_->StartFetchingToken(accounts_.front());
+    accounts_.pop_front();
+  }
 }
 
 void GoogleAutoLoginHelper::OnMergeSessionFailure(
     const GoogleServiceAuthError& error) {
   VLOG(1) << "Failed MergeSession request, error: " << error.ToString();
   base::MessageLoop::current()->DeleteSoon(FROM_HERE, this);

[Roger Tawa OOO till Jul 10th, 2013/11/21 16:02:32]

If the |accounts_| list is not empty, should it keep going?  Would this depend
on the kind of error returned?  If we do decide to abort the whole thing, should
the list be cleared out?  Same for error at line 40 above.

[acleung1, 2013/11/26 09:28:31]

Not completely sure. I think continuing makes more sense. Let say you have 4
accounts and one of them fail to get auth token for various reason, you should
probably still see 3 on gmail.

I added a TODO instead.

 }