[GCM] Adding status to AccountMapping structure

google_apis/gcm/engine/gcm_store_impl.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 "base/basictypes.h"
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/file_util.h"
@@ skipping 144 matching lines @@
                            const UpdateCallback& callback);
   void RemoveUserSerialNumber(const std::string& username,
                               const UpdateCallback& callback);
   void SetLastCheckinInfo(const base::Time& time,
                           const std::set<std::string>& accounts,
                           const UpdateCallback& callback);
   void SetGServicesSettings(
       const std::map<std::string, std::string>& settings,
       const std::string& digest,
       const UpdateCallback& callback);
-  void AddAccountMapping(const AccountInfo& account_info,
+  void AddAccountMapping(const AccountMapping& account_mapping,
                          const UpdateCallback& callback);
   void RemoveAccountMapping(const std::string& account_id,
                             const UpdateCallback& callback);
 
  private:
   friend class base::RefCountedThreadSafe<Backend>;
   ~Backend();
 
   bool LoadDeviceCredentials(uint64* android_id, uint64* security_token);
   bool LoadRegistrations(RegistrationInfoMap* registrations);
   bool LoadIncomingMessages(std::vector<std::string>* incoming_messages);
   bool LoadOutgoingMessages(OutgoingMessageMap* outgoing_messages);
   bool LoadLastCheckinInfo(base::Time* last_checkin_time,
                            std::set<std::string>* accounts);
   bool LoadGServicesSettings(std::map<std::string, std::string>* settings,
                              std::string* digest);
-  bool LoadAccountMappingInfo(AccountInfoMap* account_infos);
+  bool LoadAccountMappingInfo(AccountMappingMap* account_mappings);
 
   const base::FilePath path_;
   scoped_refptr<base::SequencedTaskRunner> foreground_task_runner_;
   scoped_ptr<Encryptor> encryptor_;
 
   scoped_ptr<leveldb::DB> db_;
 };
 
 GCMStoreImpl::Backend::Backend(
     const base::FilePath& path,
@@ skipping 34 matching lines @@
 
   if (!LoadDeviceCredentials(&result->device_android_id,
                              &result->device_security_token) ||
       !LoadRegistrations(&result->registrations) ||
       !LoadIncomingMessages(&result->incoming_messages) ||
       !LoadOutgoingMessages(&result->outgoing_messages) ||
       !LoadLastCheckinInfo(&result->last_checkin_time,
                            &result->last_checkin_accounts) ||
       !LoadGServicesSettings(&result->gservices_settings,
                              &result->gservices_digest) ||
-      !LoadAccountMappingInfo(&result->account_infos)) {
+      !LoadAccountMappingInfo(&result->account_mappings)) {
     result->Reset();
     foreground_task_runner_->PostTask(FROM_HERE,
                                       base::Bind(callback,
                                                  base::Passed(&result)));
     return;
   }
 
   // Only record histograms if GCM had already been set up for this device.
   if (result->device_android_id != 0 && result->device_security_token != 0) {
     int64 file_size = 0;
@@ skipping 319 matching lines @@
   // Write it all in a batch.
   leveldb::WriteOptions write_options;
   write_options.sync = true;
 
   leveldb::Status s = db_->Write(write_options, &write_batch);
   if (!s.ok())
     LOG(ERROR) << "LevelDB GService Settings update failed: " << s.ToString();
   foreground_task_runner_->PostTask(FROM_HERE, base::Bind(callback, s.ok()));
 }
 
-void GCMStoreImpl::Backend::AddAccountMapping(const AccountInfo& account_info,
-                                              const UpdateCallback& callback) {
+void GCMStoreImpl::Backend::AddAccountMapping(
+    const AccountMapping& account_mapping,
+    const UpdateCallback& callback) {
   DVLOG(1) << "Saving account info for account with email: "
-           << account_info.email;
+           << account_mapping.email;
   if (!db_.get()) {
     LOG(ERROR) << "GCMStore db doesn't exist.";
     foreground_task_runner_->PostTask(FROM_HERE, base::Bind(callback, false));
     return;
   }
 
   leveldb::WriteOptions write_options;
   write_options.sync = true;
 
-  std::string data = account_info.SerializeAsString();
-  std::string key = MakeAccountKey(account_info.account_id);
+  std::string data = account_mapping.SerializeAsString();
+  std::string key = MakeAccountKey(account_mapping.account_id);
   const leveldb::Status s =
       db_->Put(write_options, MakeSlice(key), MakeSlice(data));
   if (!s.ok())
     LOG(ERROR) << "LevelDB adding account mapping failed: " << s.ToString();
   foreground_task_runner_->PostTask(FROM_HERE, base::Bind(callback, s.ok()));
 }
 
 void GCMStoreImpl::Backend::RemoveAccountMapping(
     const std::string& account_id,
     const UpdateCallback& callback) {
@@ skipping 181 matching lines @@
              << ", and value: " << value;
   }
 
   // Load the settings digest. It's ok if it is empty.
   db_->Get(read_options, MakeSlice(kGServiceSettingsDigestKey), digest);
 
   return true;
 }
 
 bool GCMStoreImpl::Backend::LoadAccountMappingInfo(
-    AccountInfoMap* account_infos) {
+    AccountMappingMap* account_mappings) {
   leveldb::ReadOptions read_options;
   read_options.verify_checksums = true;
 
   scoped_ptr<leveldb::Iterator> iter(db_->NewIterator(read_options));
   for (iter->Seek(MakeSlice(kAccountKeyStart));
        iter->Valid() && iter->key().ToString() < kAccountKeyEnd;
        iter->Next()) {
-    AccountInfo account_info;
-    account_info.account_id = ParseAccountKey(iter->key().ToString());
-    if (!account_info.ParseFromString(iter->value().ToString())) {
+    AccountMapping account_mapping;
+    account_mapping.account_id = ParseAccountKey(iter->key().ToString());
+    if (!account_mapping.ParseFromString(iter->value().ToString())) {
       DVLOG(1) << "Failed to parse account info with ID: "
-               << account_info.account_id;
+               << account_mapping.account_id;
       return false;
     }
-    DVLOG(1) << "Found account mapping with ID: " << account_info.account_id;
-    (*account_infos)[account_info.account_id] = account_info;
+    DVLOG(1) << "Found account mapping with ID: " << account_mapping.account_id;
+    (*account_mappings)[account_mapping.account_id] = account_mapping;
   }
 
   return true;
 }
 
 GCMStoreImpl::GCMStoreImpl(
     const base::FilePath& path,
     scoped_refptr<base::SequencedTaskRunner> blocking_task_runner,
     scoped_ptr<Encryptor> encryptor)
     : backend_(new Backend(path,
@@ skipping 184 matching lines @@
     const UpdateCallback& callback) {
   blocking_task_runner_->PostTask(
       FROM_HERE,
       base::Bind(&GCMStoreImpl::Backend::SetGServicesSettings,
                  backend_,
                  settings,
                  digest,
                  callback));
 }
 
-void GCMStoreImpl::AddAccountMapping(const AccountInfo& account_info,
+void GCMStoreImpl::AddAccountMapping(const AccountMapping& account_mapping,
                                      const UpdateCallback& callback) {
   blocking_task_runner_->PostTask(
       FROM_HERE,
       base::Bind(&GCMStoreImpl::Backend::AddAccountMapping,
                  backend_,
-                 account_info,
+                 account_mapping,
                  callback));
 }
 
 void GCMStoreImpl::RemoveAccountMapping(const std::string& account_id,
                                         const UpdateCallback& callback) {
   blocking_task_runner_->PostTask(
       FROM_HERE,
       base::Bind(&GCMStoreImpl::Backend::RemoveAccountMapping,
                  backend_,
                  account_id,
@@ skipping 47 matching lines @@
            removed_message_counts.begin();
        iter != removed_message_counts.end(); ++iter) {
     DCHECK_NE(app_message_counts_.count(iter->first), 0U);
     app_message_counts_[iter->first] -= iter->second;
     DCHECK_GE(app_message_counts_[iter->first], 0);
   }
   callback.Run(true);
 }
 
 }  // namespace gcm