Adding a user list (to be consumed by GCM Client Implementation)

google_apis/gcm/engine/gcm_store_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 "google_apis/gcm/engine/gcm_store_impl.h"
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/file_util.h"
@@ skipping 148 matching lines @@
                << status.ToString();
     foreground_task_runner_->PostTask(FROM_HERE, base::Bind(callback, result));
     return;
   }
   db_.reset(db);
 
   if (!LoadDeviceCredentials(&result.device_android_id,
                              &result.device_security_token) ||
       !LoadIncomingMessages(&result.incoming_messages) ||
       !LoadOutgoingMessages(&result.outgoing_messages) ||
-      !LoadNextSerialNumber(&result.next_serial_number) ||
-      !LoadUserSerialNumberMap(&result.user_serial_numbers)) {
+      !LoadNextSerialNumber(
+           &result.serial_number_mappings.next_serial_number) ||
+      !LoadUserSerialNumberMap(
+           &result.serial_number_mappings.user_serial_numbers)) {
     result.device_android_id = 0;
     result.device_security_token = 0;
     result.incoming_messages.clear();
     STLDeleteContainerPairSecondPointers(result.outgoing_messages.begin(),
                                          result.outgoing_messages.end());
     result.outgoing_messages.clear();
     foreground_task_runner_->PostTask(FROM_HERE, base::Bind(callback, result));
     return;
   }
 
   // Only record histograms if GCM had already been set up for this device.
   if (result.device_android_id != 0 && result.device_security_token != 0) {
     int64 file_size = 0;
     if (base::GetFileSize(path_, &file_size)) {
       UMA_HISTOGRAM_COUNTS("GCM.StoreSizeKB",
                            static_cast<int>(file_size / 1024));
     }
     UMA_HISTOGRAM_COUNTS("GCM.RestoredOutgoingMessages",
                          result.outgoing_messages.size());
     UMA_HISTOGRAM_COUNTS("GCM.RestoredIncomingMessages",
                          result.incoming_messages.size());
-    UMA_HISTOGRAM_COUNTS("GCM.NumUsers", result.user_serial_numbers.size());
+    UMA_HISTOGRAM_COUNTS(
+        "GCM.NumUsers",
+        result.serial_number_mappings.user_serial_numbers.size());
   }
 
-
   DVLOG(1) << "Succeeded in loading " << result.incoming_messages.size()
            << " unacknowledged incoming messages and "
            << result.outgoing_messages.size()
            << " unacknowledged outgoing messages.";
   result.success = true;
   foreground_task_runner_->PostTask(FROM_HERE, base::Bind(callback, result));
   return;
 }
 
 void GCMStoreImpl::Backend::Destroy(const UpdateCallback& callback) {
@@ skipping 583 matching lines @@
            removed_message_counts.begin();
        iter != removed_message_counts.end(); ++iter) {
     DCHECK_NE(app_message_counts_.count(iter->first), 0U);
     app_message_counts_[iter->first] -= iter->second;
     DCHECK_GE(app_message_counts_[iter->first], 0);
   }
   callback.Run(true);
 }
 
 }  // namespace gcm