[GCM] Passing GCMClient::AccountTokenInfo list to GCMDriver

components/gcm_driver/gcm_driver_desktop.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_driver_desktop.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/files/file_path.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/sequenced_task_runner.h"
 #include "base/threading/sequenced_worker_pool.h"
+#include "components/gcm_driver/gcm_account_mapper.h"
 #include "components/gcm_driver/gcm_app_handler.h"
 #include "components/gcm_driver/gcm_channel_status_syncer.h"
 #include "components/gcm_driver/gcm_client_factory.h"
 #include "components/gcm_driver/gcm_delayed_task_controller.h"
 #include "components/gcm_driver/system_encryptor.h"
 #include "google_apis/gcm/engine/account_mapping.h"
 #include "net/base/ip_endpoint.h"
 #include "net/url_request/url_request_context_getter.h"
 
 namespace gcm {
@@ skipping 581 matching lines @@
 void GCMDriverDesktop::RemoveAccountMapping(const std::string& account_id) {
   DCHECK(ui_thread_->RunsTasksOnCurrentThread());
 
   io_thread_->PostTask(
       FROM_HERE,
       base::Bind(&GCMDriverDesktop::IOWorker::RemoveAccountMapping,
                  base::Unretained(io_worker_.get()),
                  account_id));
 }
 
-void GCMDriverDesktop::SetAccountsForCheckin(
-    const std::map<std::string, std::string>& account_tokens) {
+void GCMDriverDesktop::SetAccountTokens(
+    const std::vector<GCMClient::AccountTokenInfo>& account_tokens) {
   DCHECK(ui_thread_->RunsTasksOnCurrentThread());
+  std::map<std::string, std::string> account_token_map;

[jianli, 2014/09/25 20:26:45]

I think we should also pass std::vector to IO thread and then to GCMClient that
will decide if it needs to convert from std::vector to std::map.

[fgorski, 2014/09/26 22:51:42]

Done.

+  for (std::vector<GCMClient::AccountTokenInfo>::const_iterator iter =
+           account_tokens.begin();
+       iter != account_tokens.end();
+       ++iter) {
+    account_token_map[iter->email] = iter->access_token;
+  }
 
   io_thread_->PostTask(
       FROM_HERE,
       base::Bind(&GCMDriverDesktop::IOWorker::SetAccountsForCheckin,
                  base::Unretained(io_worker_.get()),
-                 account_tokens));
+                 account_token_map));
 }
 
 GCMClient::Result GCMDriverDesktop::EnsureStarted() {
   DCHECK(ui_thread_->RunsTasksOnCurrentThread());
 
   if (gcm_started_)
     return GCMClient::SUCCESS;
 
   if (!gcm_enabled_)
     return GCMClient::GCM_DISABLED;
@@ skipping 121 matching lines @@
 
   // Normally request_gcm_statistics_callback_ would not be null.
   if (!request_gcm_statistics_callback_.is_null())
     request_gcm_statistics_callback_.Run(stats);
   else
     LOG(WARNING) << "request_gcm_statistics_callback_ is NULL.";
 }
 
 }  // namespace gcm