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

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 fe761ce6a4b41f27996672116bfe28d892202c6f..64683ed86c1bdf862483dae5a47380b72c02de07 100644
--- a/google_apis/gcm/engine/gcm_store_impl.cc
+++ b/google_apis/gcm/engine/gcm_store_impl.cc
@@ -179,7 +179,7 @@ class GCMStoreImpl::Backend
                            std::set<std::string>* accounts);
   bool LoadGServicesSettings(std::map<std::string, std::string>* settings,
                              std::string* digest);
-  bool LoadAccountMappingInfo(AccountMappingMap* account_mappings);
+  bool LoadAccountMappingInfo(AccountMappings* account_mappings);
 
   const base::FilePath path_;
   scoped_refptr<base::SequencedTaskRunner> foreground_task_runner_;
@@ -792,7 +792,7 @@ bool GCMStoreImpl::Backend::LoadGServicesSettings(
 }
 
 bool GCMStoreImpl::Backend::LoadAccountMappingInfo(
-    AccountMappingMap* account_mappings) {
+    AccountMappings* account_mappings) {
   leveldb::ReadOptions read_options;
   read_options.verify_checksums = true;
 
@@ -808,7 +808,7 @@ bool GCMStoreImpl::Backend::LoadAccountMappingInfo(
       return false;
     }
     DVLOG(1) << "Found account mapping with ID: " << account_mapping.account_id;
-    (*account_mappings)[account_mapping.account_id] = account_mapping;
+    account_mappings->push_back(account_mapping);
   }
 
   return true;