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

google_apis/gcm/engine/gcm_store_impl.cc

Index: google_apis/gcm/engine/gcm_store_impl.cc
diff --git a/google_apis/gcm/engine/gcm_store_impl.cc b/google_apis/gcm/engine/gcm_store_impl.cc
index c82c5df2b3ad3bb768ecbba52a6d2150776a2f0b..fcf6e9039a87eba6963957955f706b6ed0ebc4cf 100644
--- a/google_apis/gcm/engine/gcm_store_impl.cc
+++ b/google_apis/gcm/engine/gcm_store_impl.cc
@@ -166,8 +166,10 @@ void GCMStoreImpl::Backend::Load(const LoadCallback& callback) {
                              &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();
@@ -189,10 +191,11 @@ void GCMStoreImpl::Backend::Load(const LoadCallback& callback) {
                          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()