[GCM] Passing GCMClient::AccountTokenInfo list to GCMDriver

components/gcm_driver/gcm_client_impl.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 "components/gcm_driver/gcm_client_impl.h"
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 389 matching lines @@
   DCHECK(device_checkin_info_.IsValid());
   mcs_client_->Login(device_checkin_info_.android_id,
                      device_checkin_info_.secret);
 }
 
 void GCMClientImpl::ResetState() {
   state_ = UNINITIALIZED;
   // TODO(fgorski): reset all of the necessart objects and start over.
 }
 
-void GCMClientImpl::SetAccountsForCheckin(
-    const std::map<std::string, std::string>& account_tokens) {
+void GCMClientImpl::SetAccountTokens(
+    const std::vector<AccountTokenInfo>& account_tokens) {
+  device_checkin_info_.account_tokens.clear();
+  for (std::vector<AccountTokenInfo>::const_iterator iter =
+           account_tokens.begin();
+       iter != account_tokens.end();
+       ++iter) {
+    device_checkin_info_.account_tokens[iter->email] = iter->access_token;
+  }
+
   bool accounts_set_before = device_checkin_info_.accounts_set;
-  device_checkin_info_.account_tokens = account_tokens;
   device_checkin_info_.accounts_set = true;
 
   DVLOG(1) << "Set account called with: " << account_tokens.size()
            << " accounts.";
 
   if (state_ != READY && state_ != INITIAL_DEVICE_CHECKIN)
     return;
 
   bool account_removed = false;
   for (std::set<std::string>::iterator iter =
            device_checkin_info_.last_checkin_accounts.begin();
        iter != device_checkin_info_.last_checkin_accounts.end();
        ++iter) {
-    if (account_tokens.find(*iter) == account_tokens.end())
+    if (device_checkin_info_.account_tokens.find(*iter) ==
+            device_checkin_info_.account_tokens.end()) {
       account_removed = true;
+    }
   }
 
   // Checkin will be forced when any of the accounts was removed during the
   // current Chrome session or if there has been an account removed between the
   // restarts of Chrome. If there is a checkin in progress, it will be canceled.
   // We only force checkin when user signs out. When there is a new account
   // signed in, the periodic checkin will take care of adding the association in
   // reasonable time.
   if (account_removed) {
     DVLOG(1) << "Detected that account has been removed. Forcing checkin.";
@@ skipping 520 matching lines @@
 
   recorder_.RecordIncomingSendError(
       data_message_stanza.category(),
       data_message_stanza.to(),
       data_message_stanza.id());
   delegate_->OnMessageSendError(data_message_stanza.category(),
                                 send_error_details);
 }
 
 }  // namespace gcm