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

google_apis/gcm/engine/gcm_store_impl_unittest.cc

Index: google_apis/gcm/engine/gcm_store_impl_unittest.cc
diff --git a/google_apis/gcm/engine/gcm_store_impl_unittest.cc b/google_apis/gcm/engine/gcm_store_impl_unittest.cc
index 81b5bbfe8290fbe850d6657dd617d26a712aa01a..939ef80c9ec647e8364c85f738040616b2c87c61 100644
--- a/google_apis/gcm/engine/gcm_store_impl_unittest.cc
+++ b/google_apis/gcm/engine/gcm_store_impl_unittest.cc
@@ -558,25 +558,23 @@ TEST_F(GCMStoreImplTest, AccountMapping) {
   PumpLoop();
 
   EXPECT_EQ(2UL, load_result->account_mappings.size());
-  GCMStore::AccountMappingMap::iterator iter =
+  GCMStore::AccountMappings::iterator iter =
       load_result->account_mappings.begin();
-  EXPECT_EQ("account_id_1", iter->first);
-  EXPECT_EQ(account_mapping1.account_id, iter->second.account_id);
-  EXPECT_EQ(account_mapping1.email, iter->second.email);
-  EXPECT_TRUE(iter->second.access_token.empty());
-  EXPECT_EQ(AccountMapping::ADDING, iter->second.status);
+  EXPECT_EQ(account_mapping1.account_id, iter->account_id);
+  EXPECT_EQ(account_mapping1.email, iter->email);
+  EXPECT_TRUE(iter->access_token.empty());
+  EXPECT_EQ(AccountMapping::ADDING, iter->status);
   EXPECT_EQ(account_mapping1.status_change_timestamp,
-            iter->second.status_change_timestamp);
-  EXPECT_EQ(account_mapping1.last_message_id, iter->second.last_message_id);
+            iter->status_change_timestamp);
+  EXPECT_EQ(account_mapping1.last_message_id, iter->last_message_id);
   ++iter;
-  EXPECT_EQ("account_id_2", iter->first);
-  EXPECT_EQ(account_mapping2.account_id, iter->second.account_id);
-  EXPECT_EQ(account_mapping2.email, iter->second.email);
-  EXPECT_TRUE(iter->second.access_token.empty());
-  EXPECT_EQ(AccountMapping::REMOVING, iter->second.status);
+  EXPECT_EQ(account_mapping2.account_id, iter->account_id);
+  EXPECT_EQ(account_mapping2.email, iter->email);
+  EXPECT_TRUE(iter->access_token.empty());
+  EXPECT_EQ(AccountMapping::REMOVING, iter->status);
   EXPECT_EQ(account_mapping2.status_change_timestamp,
-            iter->second.status_change_timestamp);
-  EXPECT_EQ(account_mapping2.last_message_id, iter->second.last_message_id);
+            iter->status_change_timestamp);
+  EXPECT_EQ(account_mapping2.last_message_id, iter->last_message_id);
 
   gcm_store->RemoveAccountMapping(
       account_mapping1.account_id,
@@ -590,14 +588,13 @@ TEST_F(GCMStoreImplTest, AccountMapping) {
 
   EXPECT_EQ(1UL, load_result->account_mappings.size());
   iter = load_result->account_mappings.begin();
-  EXPECT_EQ("account_id_2", iter->first);
-  EXPECT_EQ(account_mapping2.account_id, iter->second.account_id);
-  EXPECT_EQ(account_mapping2.email, iter->second.email);
-  EXPECT_TRUE(iter->second.access_token.empty());
-  EXPECT_EQ(AccountMapping::REMOVING, iter->second.status);
+  EXPECT_EQ(account_mapping2.account_id, iter->account_id);
+  EXPECT_EQ(account_mapping2.email, iter->email);
+  EXPECT_TRUE(iter->access_token.empty());
+  EXPECT_EQ(AccountMapping::REMOVING, iter->status);
   EXPECT_EQ(account_mapping2.status_change_timestamp,
-            iter->second.status_change_timestamp);
-  EXPECT_EQ(account_mapping2.last_message_id, iter->second.last_message_id);
+            iter->status_change_timestamp);
+  EXPECT_EQ(account_mapping2.last_message_id, iter->last_message_id);
 }
 
 // When the database is destroyed, all database updates should fail. At the