Remove associated keying material when unregistering from GCM

components/gcm_driver/crypto/gcm_key_store.h

 // Copyright 2015 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 COMPONENTS_GCM_DRIVER_CRYPTO_GCM_KEY_STORE_H_
 #define COMPONENTS_GCM_DRIVER_CRYPTO_GCM_KEY_STORE_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 22 matching lines @@
 // Messaging. It provides the ability to create and store a key-pair for a given
 // app id, as well as retrieving and deleting key-pairs.
 //
 // This class is backed by a proto database and might end up doing file I/O on
 // a background task runner. For this reason, all public APIs take a callback
 // rather than returning the result. Do not rely on the timing of the callbacks.
 class GCMKeyStore {
  public:
   using KeysCallback = base::Callback<void(const KeyPair& pair,
                                            const std::string& auth_secret)>;
-  using DeleteCallback = base::Callback<void(bool success)>;
 
   GCMKeyStore(
       const base::FilePath& key_store_path,
       const scoped_refptr<base::SequencedTaskRunner>& blocking_task_runner);
   ~GCMKeyStore();
 
   // Retrieves the public/private key-pair associated with |app_id|, and
   // invokes |callback| when they are available, or when an error occurred.
   void GetKeys(const std::string& app_id, const KeysCallback& callback);
 
   // Creates a new public/private key-pair for |app_id|, and invokes
   // |callback| when they are available, or when an error occurred.
   void CreateKeys(const std::string& app_id, const KeysCallback& callback);
 
-  // Deletes the keys associated with |app_id|, and invokes |callback| when
-  // the deletion has finished, or when an error occurred.
-  void DeleteKeys(const std::string& app_id, const DeleteCallback& callback);
+  // Removes the keys associated with |app_id|, and invokes |callback| when
+  // the operation has finished.
+  void RemoveKeys(const std::string& app_id, const base::Closure& callback);
 
  private:
   // Initializes the database if necessary, and runs |done_closure| when done.
   void LazyInitialize(const base::Closure& done_closure);
 
   void DidInitialize(bool success);
   void DidLoadKeys(bool success,
                    scoped_ptr<std::vector<EncryptionData>> entries);
 
   void DidStoreKeys(const std::string& app_id,
                     const KeyPair& pair,
                     const std::string& auth_secret,
                     const KeysCallback& callback,
                     bool success);
 
-  void DidDeleteKeys(const std::string& app_id,
-                     const DeleteCallback& callback,
+  void DidRemoveKeys(const std::string& app_id,
+                     const base::Closure& callback,
                      bool success);
 
   // Private implementations of the API that will be executed when the database
   // has either been successfully loaded, or failed to load.
 
   void GetKeysAfterInitialize(const std::string& app_id,
                               const KeysCallback& callback);
   void CreateKeysAfterInitialize(const std::string& app_id,
                                  const KeysCallback& callback);
-  void DeleteKeysAfterInitialize(const std::string& app_id,
-                                 const DeleteCallback& callback);
+  void RemoveKeysAfterInitialize(const std::string& app_id,
+                                 const base::Closure& callback);
 
   // Path in which the key store database will be saved.
   base::FilePath key_store_path_;
 
   // Blocking task runner which the database will do I/O operations on.
   scoped_refptr<base::SequencedTaskRunner> blocking_task_runner_;
 
   // Instance of the ProtoDatabase backing the key store.
   scoped_ptr<leveldb_proto::ProtoDatabase<EncryptionData>> database_;
 
@@ skipping 12 matching lines @@
   std::map<std::string, std::string> auth_secrets_;
 
   base::WeakPtrFactory<GCMKeyStore> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(GCMKeyStore);
 };
 
 }  // namespace gcm
 
 #endif  // COMPONENTS_GCM_DRIVER_CRYPTO_GCM_KEY_STORE_H_