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

google_apis/gcm/engine/gcm_store_impl_unittest.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 <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 91 matching lines @@
   scoped_ptr<GCMStore> gcm_store(BuildGCMStore());
   GCMStore::LoadResult load_result;
   gcm_store->Load(base::Bind(
       &GCMStoreImplTest::LoadCallback, base::Unretained(this), &load_result));
   PumpLoop();
 
   EXPECT_EQ(0U, load_result.device_android_id);
   EXPECT_EQ(0U, load_result.device_security_token);
   EXPECT_TRUE(load_result.incoming_messages.empty());
   EXPECT_TRUE(load_result.outgoing_messages.empty());
-  EXPECT_EQ(1LL, load_result.next_serial_number);
-  EXPECT_TRUE(load_result.user_serial_numbers.empty());
+  EXPECT_EQ(1LL, load_result.serial_number_mappings.next_serial_number);
+  EXPECT_TRUE(load_result.serial_number_mappings.user_serial_numbers.empty());
 }
 
 TEST_F(GCMStoreImplTest, DeviceCredentials) {
   scoped_ptr<GCMStore> gcm_store(BuildGCMStore());
   GCMStore::LoadResult load_result;
   gcm_store->Load(base::Bind(
       &GCMStoreImplTest::LoadCallback, base::Unretained(this), &load_result));
   PumpLoop();
 
   gcm_store->SetDeviceCredentials(
@@ skipping 183 matching lines @@
   gcm_store->SetNextSerialNumber(
       kNextSerialNumber,
       base::Bind(&GCMStoreImplTest::UpdateCallback, base::Unretained(this)));
   PumpLoop();
 
   gcm_store = BuildGCMStore().Pass();
   gcm_store->Load(base::Bind(
       &GCMStoreImplTest::LoadCallback, base::Unretained(this), &load_result));
   PumpLoop();
 
-  EXPECT_EQ(kNextSerialNumber, load_result.next_serial_number);
+  EXPECT_EQ(kNextSerialNumber,
+            load_result.serial_number_mappings.next_serial_number);
 }
 
 // Verify that user serial number mappings are persisted properly.
 TEST_F(GCMStoreImplTest, UserSerialNumberMappings) {
   scoped_ptr<GCMStore> gcm_store(BuildGCMStore());
   GCMStore::LoadResult load_result;
   gcm_store->Load(base::Bind(
       &GCMStoreImplTest::LoadCallback, base::Unretained(this), &load_result));
   PumpLoop();
 
@@ skipping 10 matching lines @@
       username2,
       serial_number2,
       base::Bind(&GCMStoreImplTest::UpdateCallback, base::Unretained(this)));
   PumpLoop();
 
   gcm_store = BuildGCMStore().Pass();
   gcm_store->Load(base::Bind(
       &GCMStoreImplTest::LoadCallback, base::Unretained(this), &load_result));
   PumpLoop();
 
-  ASSERT_EQ(2u, load_result.user_serial_numbers.size());
-  ASSERT_NE(load_result.user_serial_numbers.end(),
-            load_result.user_serial_numbers.find(username1));
-  EXPECT_EQ(serial_number1, load_result.user_serial_numbers[username1]);
-  ASSERT_NE(load_result.user_serial_numbers.end(),
-            load_result.user_serial_numbers.find(username2));
-  EXPECT_EQ(serial_number2, load_result.user_serial_numbers[username2]);
+  ASSERT_EQ(2u, load_result.serial_number_mappings.user_serial_numbers.size());
+  ASSERT_NE(
+      load_result.serial_number_mappings.user_serial_numbers.end(),
+      load_result.serial_number_mappings.user_serial_numbers.find(username1));
+  EXPECT_EQ(serial_number1,
+            load_result.serial_number_mappings.user_serial_numbers[username1]);
+  ASSERT_NE(
+      load_result.serial_number_mappings.user_serial_numbers.end(),
+      load_result.serial_number_mappings.user_serial_numbers.find(username2));
+  EXPECT_EQ(serial_number2,
+            load_result.serial_number_mappings.user_serial_numbers[username2]);
 }
 
 // Test that per-app message limits are enforced, persisted across restarts,
 // and updated as messages are removed.
 TEST_F(GCMStoreImplTest, PerAppMessageLimits) {
   scoped_ptr<GCMStore> gcm_store(BuildGCMStore());
   GCMStore::LoadResult load_result;
   gcm_store->Load(base::Bind(&GCMStoreImplTest::LoadCallback,
                              base::Unretained(this),
                              &load_result));
@@ skipping 92 matching lines @@
                     MCSMessage(message),
                     base::Bind(&GCMStoreImplTest::UpdateCallback,
                                base::Unretained(this))));
     PumpLoop();
   }
 }
 
 }  // namespace
 
 }  // namespace gcm