Fix issues with token refresh in AccountReconcilor

chrome/browser/signin/account_reconcilor.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 "base/json/json_reader.h"
 #include "base/logging.h"
 #include "base/time/time.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/net/chrome_cookie_notification_details.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 131 matching lines @@
 void AccountReconcilor::OnCookieChanged(ChromeCookieDetails* details) {
   // TODO(acleung): Filter out cookies by looking at the domain.
   // StartReconcileAction();
 }
 
 void AccountReconcilor::OnRefreshTokenAvailable(const std::string& account_id) {
   DVLOG(1) << "AccountReconcilor::OnRefreshTokenAvailable: " << account_id;
   PerformMergeAction(account_id);
 }
 
+void AccountReconcilor::OnRefreshTokenAvailable(
+    const std::deque<std::string>& account_ids) {
+  PerformMergeAction(account_ids);
+}

[Roger Tawa OOO till Jul 10th, 2013/11/08 13:17:31]

I don't think its a good idea to declare a new callback method in the observer. 
This now forces all observers to implement this one too.  Also see comment
below.

+
 void AccountReconcilor::OnRefreshTokenRevoked(const std::string& account_id) {
   DVLOG(1) << "AccountReconcilor::OnRefreshTokenRevoked: " << account_id;
   PerformRemoveAction(account_id);
 }
 
 void AccountReconcilor::OnRefreshTokensLoaded() {}
 
 void AccountReconcilor::PerformMergeAction(const std::string& account_id) {
   // GoogleAutoLoginHelper deletes itself upon success / failure.
   GoogleAutoLoginHelper* helper = new GoogleAutoLoginHelper(profile_);
   helper->LogIn(account_id);
 }
 
+void AccountReconcilor::PerformMergeAction(
+    const std::deque<std::string>& account_ids) {
+  // GoogleAutoLoginHelper deletes itself upon success / failure.
+  GoogleAutoLoginHelper* helper = new GoogleAutoLoginHelper(profile_);
+  helper->LogIn(account_ids);
+}

[Roger Tawa OOO till Jul 10th, 2013/11/08 13:17:31]

If you change the helper so that LogIn(std::string) queues up the merge request
if one is already started, then you don't need the LogIn(std::deque) version.

[acleung1, 2013/11/08 22:21:48]

In that case, wouldn't I need to do a lot more work making the helper thread
safe?

+
 void AccountReconcilor::PerformRemoveAction(const std::string& account_id) {
   // TODO(acleung): Implement this:
 }
 
 void AccountReconcilor::StartReconcileAction() {
   if (!IsProfileConnected())
     return;
 
   // Reset state for validating gaia cookie.
   are_gaia_accounts_set_ = false;
@@ skipping 138 matching lines @@
         have_same_accounts = false;
         break;
       }
     }
   }
 
   if (!are_primaries_equal || !have_same_accounts) {
     // TODO(rogerta): fix things up.
   }
 }