[GCM] Adding status to AccountMapping structure

google_apis/gcm/engine/gcm_store.h

 // 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.
 
 #ifndef GOOGLE_APIS_GCM_ENGINE_GCM_STORE_H_
 #define GOOGLE_APIS_GCM_ENGINE_GCM_STORE_H_
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
 
 #include <google/protobuf/message_lite.h>
 
 #include "base/basictypes.h"
 #include "base/callback_forward.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
 #include "google_apis/gcm/base/gcm_export.h"
-#include "google_apis/gcm/engine/account_info.h"
+#include "google_apis/gcm/engine/account_mapping.h"
 #include "google_apis/gcm/engine/registration_info.h"
 
 namespace gcm {
 
 class MCSMessage;
 
 // A GCM data store interface. GCM Store will handle persistence portion of RMQ,
 // as well as store device and user checkin information.
 class GCM_EXPORT GCMStore {
  public:
   // Map of message id to message data for outgoing messages.
   typedef std::map<std::string, linked_ptr<google::protobuf::MessageLite> >
       OutgoingMessageMap;
 
   // Map of account id to account info for account mappings.
-  typedef std::map<std::string, AccountInfo> AccountInfoMap;
+  typedef std::map<std::string, AccountMapping> AccountMappingMap;
 
   // Container for Load(..) results.
   struct GCM_EXPORT LoadResult {
     LoadResult();
     ~LoadResult();
 
     void Reset();
 
     bool success;
     uint64 device_android_id;
     uint64 device_security_token;
     RegistrationInfoMap registrations;
     std::vector<std::string> incoming_messages;
     OutgoingMessageMap outgoing_messages;
     std::map<std::string, std::string> gservices_settings;
     std::string gservices_digest;
     base::Time last_checkin_time;
     std::set<std::string> last_checkin_accounts;
-    AccountInfoMap account_infos;
+    AccountMappingMap account_mappings;
   };
 
   typedef std::vector<std::string> PersistentIdList;
   typedef base::Callback<void(scoped_ptr<LoadResult> result)> LoadCallback;
   typedef base::Callback<void(bool success)> UpdateCallback;
 
   GCMStore();
   virtual ~GCMStore();
 
   // Load the data from persistent store and pass the initial state back to
@@ skipping 48 matching lines @@
 
   // G-service settings handling.
   // Persists |settings| and |settings_digest|. It completely replaces the
   // existing data.
   virtual void SetGServicesSettings(
       const std::map<std::string, std::string>& settings,
       const std::string& settings_digest,
       const UpdateCallback& callback) = 0;
 
   // Sets the account information related to device to account mapping.
-  virtual void AddAccountMapping(const AccountInfo& account_info,
+  virtual void AddAccountMapping(const AccountMapping& account_mapping,
                                  const UpdateCallback& callback) = 0;
   virtual void RemoveAccountMapping(const std::string& account_id,
                                     const UpdateCallback& callback) = 0;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(GCMStore);
 };
 
 }  // namespace gcm
 
 #endif  // GOOGLE_APIS_GCM_ENGINE_GCM_STORE_H_