[GCM] Loading the account mappings from store to the driver

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 303 matching lines @@
   device_checkin_info_.last_checkin_accounts = result->last_checkin_accounts;
   // A case where there were previously no accounts reported with checkin is
   // considered to be the same as when the list of accounts is empty. It enables
   // scheduling a periodic checkin for devices with no signed in users
   // immediately after restart, while keeping |accounts_set == false| delays the
   // checkin until the list of accounts is set explicitly.
   if (result->last_checkin_accounts.size() == 0)
     device_checkin_info_.accounts_set = true;
   last_checkin_time_ = result->last_checkin_time;
   gservices_settings_.UpdateFromLoadResult(*result);
+  std::vector<AccountMapping> account_mappings;
+  account_mappings.swap(result->account_mappings);

[jianli, 2014/09/24 21:21:31]

Why can't we pass result->account_mappings to OnReady?

[fgorski, 2014/09/24 22:25:40]

Added comment as discussed.

   InitializeMCSClient(result.Pass());
 
   if (device_checkin_info_.IsValid()) {
     SchedulePeriodicCheckin();
-    OnReady();
+    OnReady(account_mappings);
     return;
   }
 
   state_ = INITIAL_DEVICE_CHECKIN;
   device_checkin_info_.Reset();
   StartCheckin();
 }
 
 void GCMClientImpl::InitializeMCSClient(
     scoped_ptr<GCMStore::LoadResult> result) {
@@ skipping 33 matching lines @@
   device_checkin_info_.android_id = checkin_info.android_id;
   device_checkin_info_.secret = checkin_info.secret;
   // If accounts were not set by now, we can consider them set (to empty list)
   // to make sure periodic checkins get scheduled after initial checkin.
   device_checkin_info_.accounts_set = true;
   gcm_store_->SetDeviceCredentials(
       checkin_info.android_id, checkin_info.secret,
       base::Bind(&GCMClientImpl::SetDeviceCredentialsCallback,
                  weak_ptr_factory_.GetWeakPtr()));
 
-  OnReady();
+  OnReady(std::vector<AccountMapping>());
 }
 
-void GCMClientImpl::OnReady() {
+void GCMClientImpl::OnReady(
+    const std::vector<AccountMapping>& account_mappings) {
   state_ = READY;
   StartMCSLogin();
 
-  delegate_->OnGCMReady();
+  delegate_->OnGCMReady(account_mappings);
 }
 
 void GCMClientImpl::StartMCSLogin() {
   DCHECK_EQ(READY, state_);
   DCHECK(device_checkin_info_.IsValid());
   mcs_client_->Login(device_checkin_info_.android_id,
                      device_checkin_info_.secret);
 }
 
 void GCMClientImpl::ResetState() {
@@ skipping 553 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