Support getting and deleting token for Instance ID.

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 214 matching lines @@
 }
 
 TEST_F(GCMStoreImplTest, Registrations) {
   scoped_ptr<GCMStore> gcm_store(BuildGCMStore());
   scoped_ptr<GCMStore::LoadResult> load_result;
   gcm_store->Load(base::Bind(
       &GCMStoreImplTest::LoadCallback, base::Unretained(this), &load_result));
   PumpLoop();
 
   // Add one registration with one sender.
-  linked_ptr<RegistrationInfo> registration1(new RegistrationInfo);
-  registration1->sender_ids.push_back("sender1");
-  registration1->registration_id = "registration1";
+  std::string registration = "sender1=registration1";
   gcm_store->AddRegistration(
-      "app1",
-      registration1,
+      kAppName,
+      registration,
       base::Bind(&GCMStoreImplTest::UpdateCallback, base::Unretained(this)));
   PumpLoop();
 
   // Add one registration with multiple senders.
-  linked_ptr<RegistrationInfo> registration2(new RegistrationInfo);
-  registration2->sender_ids.push_back("sender2_1");
-  registration2->sender_ids.push_back("sender2_2");
-  registration2->registration_id = "registration2";
+  std::string registration2 = "sender1,sender2=registration2";
   gcm_store->AddRegistration(
-      "app2",
+      kAppName2,
       registration2,
       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->registrations.size());
-  ASSERT_TRUE(load_result->registrations.find("app1") !=
+  ASSERT_TRUE(load_result->registrations.find(kAppName) !=
               load_result->registrations.end());
-  EXPECT_EQ(registration1->registration_id,
-            load_result->registrations["app1"]->registration_id);
-  ASSERT_EQ(1u, load_result->registrations["app1"]->sender_ids.size());
-  EXPECT_EQ(registration1->sender_ids[0],
-            load_result->registrations["app1"]->sender_ids[0]);
-  ASSERT_TRUE(load_result->registrations.find("app2") !=
+  EXPECT_EQ(registration, load_result->registrations[kAppName]);
+  ASSERT_TRUE(load_result->registrations.find(kAppName2) !=
               load_result->registrations.end());
-  EXPECT_EQ(registration2->registration_id,
-            load_result->registrations["app2"]->registration_id);
-  ASSERT_EQ(2u, load_result->registrations["app2"]->sender_ids.size());
-  EXPECT_EQ(registration2->sender_ids[0],
-            load_result->registrations["app2"]->sender_ids[0]);
-  EXPECT_EQ(registration2->sender_ids[1],
-            load_result->registrations["app2"]->sender_ids[1]);
+  EXPECT_EQ(registration2, load_result->registrations[kAppName2]);
 
   gcm_store->RemoveRegistration(
-      "app2",
+      kAppName2,
       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(1u, load_result->registrations.size());
-  ASSERT_TRUE(load_result->registrations.find("app1") !=
+  ASSERT_TRUE(load_result->registrations.find(kAppName) !=
               load_result->registrations.end());
-  EXPECT_EQ(registration1->registration_id,
-            load_result->registrations["app1"]->registration_id);
-  ASSERT_EQ(1u, load_result->registrations["app1"]->sender_ids.size());
-  EXPECT_EQ(registration1->sender_ids[0],
-            load_result->registrations["app1"]->sender_ids[0]);
+  EXPECT_EQ(registration, load_result->registrations[kAppName]);
 }
 
 // Verify saving some incoming messages, reopening the directory, and then
 // removing those incoming messages.
 TEST_F(GCMStoreImplTest, IncomingMessages) {
   scoped_ptr<GCMStore> gcm_store(BuildGCMStore());
   scoped_ptr<GCMStore::LoadResult> load_result;
   gcm_store->Load(base::Bind(
       &GCMStoreImplTest::LoadCallback, base::Unretained(this), &load_result));
   PumpLoop();
@@ skipping 482 matching lines @@
 
   ASSERT_EQ(1u, load_result->instance_id_data.size());
   ASSERT_TRUE(load_result->instance_id_data.find(kAppName2) !=
               load_result->instance_id_data.end());
   EXPECT_EQ(instance_id_data2, load_result->instance_id_data[kAppName2]);
 }
 
 }  // namespace
 
 }  // namespace gcm