[GCM] Passing GCMClient::AccountTokenInfo list to GCMDriver

chrome/browser/services/gcm/gcm_account_tracker.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 "chrome/browser/services/gcm/gcm_account_tracker.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/time/time.h"
@@ skipping 134 matching lines @@
   DCHECK(!callback_.is_null());
   // Wait for gaia::AccountTracker to be done with fetching the user info, as
   // well as all of the pending token requests from GCMAccountTracker to be done
   // before you report the results.
   if (!account_tracker_->IsAllUserInfoFetched() ||
       !pending_token_requests_.empty()) {
     return;
   }
 
   bool account_removed = false;
-  std::map<std::string, std::string> account_tokens;
+  std::vector<GCMClient::AccountTokenInfo> account_tokens;
   for (AccountInfos::iterator iter = account_infos_.begin();
        iter != account_infos_.end();) {
     switch (iter->second.state) {
       case ACCOUNT_REMOVED:
         // We only mark accounts as removed when there was an account that was
         // explicitly signed out.
         account_removed = true;
         // We also stop tracking the account, now that it will be reported as
         // removed.
         account_infos_.erase(iter++);
         break;
 
-      case TOKEN_PRESENT:
-        account_tokens[iter->second.email] = iter->second.access_token;
+      case TOKEN_PRESENT: {
+        GCMClient::AccountTokenInfo token_info;
+        token_info.account_id = iter->first;
+        token_info.email = iter->second.email;
+        token_info.access_token = iter->second.access_token;
+        account_tokens.push_back(token_info);
         ++iter;
         break;
+      }
 
       case GETTING_TOKEN:
         // This should not happen, as we are making a check that there are no
         // pending requests above.
         NOTREACHED();
         ++iter;
         break;
 
       case TOKEN_NEEDED:
         // We failed to fetch an access token for the account, but it has not
@@ skipping 68 matching lines @@
   iter->second.state = ACCOUNT_REMOVED;
   CompleteCollectingTokens();
 }
 
 OAuth2TokenService* GCMAccountTracker::GetTokenService() {
   DCHECK(account_tracker_->identity_provider());
   return account_tracker_->identity_provider()->GetTokenService();
 }
 
 }  // namespace gcm