Remove associated keying material when unregistering from GCM

components/gcm_driver/crypto/gcm_key_store_unittest.cc

 // 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.
 
 #include "components/gcm_driver/crypto/gcm_key_store.h"
 
 #include "base/bind.h"
+#include "base/bind_helpers.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/thread_task_runner_handle.h"
 #include "components/gcm_driver/crypto/p256_key_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace gcm {
 
 namespace {
@@ skipping 26 matching lines @@
         new GCMKeyStore(scoped_temp_dir_.path(), message_loop_.task_runner()));
   }
 
   // Callback to use with GCMKeyStore::{GetKeys, CreateKeys} calls.
   void GotKeys(KeyPair* pair_out, std::string* auth_secret_out,
                const KeyPair& pair, const std::string& auth_secret) {
     *pair_out = pair;
     *auth_secret_out = auth_secret;
   }
 
-  // Callback to use with GCMKeyStore::DeleteKeys calls.
-  void DeletedKeys(bool* success_out, bool success) {
-    DCHECK(success_out);
-
-    *success_out = success;
-  }
-
  protected:
   GCMKeyStore* gcm_key_store() { return gcm_key_store_.get(); }
 
  private:
   base::MessageLoop message_loop_;
   base::ScopedTempDir scoped_temp_dir_;
 
   scoped_ptr<GCMKeyStore> gcm_key_store_;
 };
 
@@ skipping 71 matching lines @@
                                       base::Unretained(this), &read_pair,
                                       &read_auth_secret));
 
   base::RunLoop().RunUntilIdle();
 
   ASSERT_TRUE(read_pair.IsInitialized());
   EXPECT_TRUE(read_pair.has_type());
   EXPECT_GT(read_auth_secret.size(), 0u);
 }
 
-TEST_F(GCMKeyStoreTest, CreateAndDeleteKeys) {
+TEST_F(GCMKeyStoreTest, CreateAndRemoveKeys) {
   KeyPair pair;
   std::string auth_secret;
   gcm_key_store()->CreateKeys(kFakeAppId,
                               base::Bind(&GCMKeyStoreTest::GotKeys,
                                          base::Unretained(this), &pair,
                                          &auth_secret));
 
   base::RunLoop().RunUntilIdle();
 
   ASSERT_TRUE(pair.IsInitialized());
 
   KeyPair read_pair;
   std::string read_auth_secret;
   gcm_key_store()->GetKeys(kFakeAppId,
                            base::Bind(&GCMKeyStoreTest::GotKeys,
                                       base::Unretained(this), &read_pair,
                                       &read_auth_secret));
 
   base::RunLoop().RunUntilIdle();
 
   ASSERT_TRUE(read_pair.IsInitialized());
   EXPECT_TRUE(read_pair.has_type());
 
-  bool success = false;
-  gcm_key_store()->DeleteKeys(kFakeAppId,
-                              base::Bind(&GCMKeyStoreTest::DeletedKeys,
-                                         base::Unretained(this), &success));
+  gcm_key_store()->RemoveKeys(kFakeAppId, base::Bind(&base::DoNothing));
 
   base::RunLoop().RunUntilIdle();
 
-  ASSERT_TRUE(success);
-
   gcm_key_store()->GetKeys(kFakeAppId,
                            base::Bind(&GCMKeyStoreTest::GotKeys,
                                       base::Unretained(this), &read_pair,
                                       &read_auth_secret));
 
   base::RunLoop().RunUntilIdle();
 
   ASSERT_FALSE(read_pair.IsInitialized());
 }
 
@@ skipping 56 matching lines @@
   // to the asynchronous nature of operations, however, we can't rely on the
   // write to have finished before the read begins.
   base::RunLoop().RunUntilIdle();
 
   EXPECT_TRUE(pair.IsInitialized());
 }
 
 }  // namespace
 
 }  // namespace gcm