Fix issues with token refresh in AccountReconcilor

chrome/browser/signin/account_reconcilor.cc

Index: chrome/browser/signin/account_reconcilor.cc
diff --git a/chrome/browser/signin/account_reconcilor.cc b/chrome/browser/signin/account_reconcilor.cc
index 9dccc406b46a16a93e12fa6872c1e0e57c68b2ce..5ec6604124b3d11932234f1ec42515012a61e875 100644
--- a/chrome/browser/signin/account_reconcilor.cc
+++ b/chrome/browser/signin/account_reconcilor.cc
@@ -149,6 +149,11 @@ void AccountReconcilor::OnRefreshTokenAvailable(const std::string& 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);
@@ -162,6 +167,13 @@ void AccountReconcilor::PerformMergeAction(const std::string& account_id) {
   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:
 }