[GCM] Passing GCMClient::AccountTokenInfo list to GCMDriver

chrome/browser/services/gcm/gcm_account_tracker.h

 // 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.
 
 #ifndef CHROME_BROWSER_SERVICES_GCM_GCM_ACCOUNT_TRACKER_H_
 #define CHROME_BROWSER_SERVICES_GCM_GCM_ACCOUNT_TRACKER_H_
 
 #include <map>
 #include <string>
 
 #include "base/memory/scoped_vector.h"
+#include "components/gcm_driver/gcm_client.h"
 #include "google_apis/gaia/account_tracker.h"
 #include "google_apis/gaia/oauth2_token_service.h"
 
 namespace gcm {
 
 // Class for reporting back which accounts are signed into. It is only meant to
 // be used when the user is signed into sync.
 class GCMAccountTracker : public gaia::AccountTracker::Observer,
                           public OAuth2TokenService::Consumer {
  public:
@@ skipping 20 matching lines @@
     ~AccountInfo();
 
     // Email address of the tracked account.
     std::string email;
     // OAuth2 access token, when |state| is TOKEN_PRESENT.
     std::string access_token;
     // Status of the token fetching.
     AccountState state;
   };
 
-  // Callback for the GetAccountsForCheckin call. |account_tokens| maps email
-  // addresses to OAuth2 access tokens.
-  typedef base::Callback<void(const std::map<std::string, std::string>&
+  // Callback for the GetAccountsForCheckin call. |account_tokens|: list of
+  // email addresses, account ids and OAuth2 access tokens.
+  typedef base::Callback<void(const std::vector<GCMClient::AccountTokenInfo>&
                                   account_tokens)> UpdateAccountsCallback;
 
   // Creates an instance of GCMAccountTracker. |account_tracker| is used to
   // deliver information about the account, while |callback| will be called
   // once all of the accounts have been fetched a necessary OAuth2 token, as
   // many times as the list of accounts is stable, meaning that all accounts
   // are known and there is no related activity in progress for them, like
   // fetching OAuth2 tokens.
   GCMAccountTracker(scoped_ptr<gaia::AccountTracker> account_tracker,
                     const UpdateAccountsCallback& callback);
@@ skipping 59 matching lines @@
   bool shutdown_called_;
 
   ScopedVector<OAuth2TokenService::Request> pending_token_requests_;
 
   DISALLOW_COPY_AND_ASSIGN(GCMAccountTracker);
 };
 
 }  // namespace gcm
 
 #endif  // CHROME_BROWSER_SERVICES_GCM_GCM_ACCOUNT_TRACKER_H_