[GCM] Adding a list of accounts present on the client to checkin request

google_apis/gcm/gcm_client_impl.cc

 // Copyright 2013 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 "google_apis/gcm/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 108 matching lines @@
       pending_unregistrations_deleter_(&pending_unregistrations_),
       weak_ptr_factory_(this) {
 }
 
 GCMClientImpl::~GCMClientImpl() {
 }
 
 void GCMClientImpl::Initialize(
     const checkin_proto::ChromeBuildProto& chrome_build_proto,
     const base::FilePath& path,
+    const std::vector<std::string>& account_ids,
     const scoped_refptr<base::SequencedTaskRunner>& blocking_task_runner,
     const scoped_refptr<net::URLRequestContextGetter>&
         url_request_context_getter,
     Delegate* delegate) {
   DCHECK_EQ(UNINITIALIZED, state_);
   DCHECK(url_request_context_getter);
   DCHECK(delegate);
 
   chrome_build_proto_.CopyFrom(chrome_build_proto);
   url_request_context_getter_ = url_request_context_getter;
+  account_ids_ = account_ids;
 
   gcm_store_.reset(new GCMStoreImpl(false, path, blocking_task_runner));
   gcm_store_->Load(base::Bind(&GCMClientImpl::OnLoadCompleted,
                               weak_ptr_factory_.GetWeakPtr()));
 
   delegate_ = delegate;
 
   // |mcs_client_| might already be set for testing at this point. No need to
   // create a |connection_factory_|.
   if (!mcs_client_.get()) {
@@ skipping 75 matching lines @@
                      device_checkin_info_.secret);
 }
 
 void GCMClientImpl::ResetState() {
   state_ = UNINITIALIZED;
   // TODO(fgorski): reset all of the necessart objects and start over.
 }
 
 void GCMClientImpl::StartCheckin(const CheckinInfo& checkin_info) {
   checkin_request_.reset(
-      new CheckinRequest(
-          base::Bind(&GCMClientImpl::OnCheckinCompleted,
-                     weak_ptr_factory_.GetWeakPtr()),
-          kDefaultBackoffPolicy,
-          chrome_build_proto_,
-          checkin_info.android_id,
-          checkin_info.secret,
-          url_request_context_getter_));
+      new CheckinRequest(base::Bind(&GCMClientImpl::OnCheckinCompleted,
+                                    weak_ptr_factory_.GetWeakPtr()),
+                         kDefaultBackoffPolicy,
+                         chrome_build_proto_,
+                         checkin_info.android_id,
+                         checkin_info.secret,
+                         account_ids_,
+                         url_request_context_getter_));
   checkin_request_->Start();
 }
 
 void GCMClientImpl::OnCheckinCompleted(uint64 android_id,
                                        uint64 security_token) {
   checkin_request_.reset();
 
   CheckinInfo checkin_info;
   checkin_info.android_id = android_id;
   checkin_info.secret = security_token;
@@ skipping 235 matching lines @@
   if (iter != incoming_message.data.end())
     message_id = iter->second;
   delegate->OnMessageSendError(app_id, message_id, SERVER_ERROR);
 }
 
 void GCMClientImpl::SetMCSClientForTesting(scoped_ptr<MCSClient> mcs_client) {
   mcs_client_ = mcs_client.Pass();
 }
 
 }  // namespace gcm