| Index: net/ssl/openssl_client_key_store_unittest.cc
|
| diff --git a/net/ssl/openssl_client_key_store_unittest.cc b/net/ssl/openssl_client_key_store_unittest.cc
|
| index 70d2d7a8cb3c6255b67c8e924b3951b1efebd607..dbb25735f720627e69db658d488377853874a42a 100644
|
| --- a/net/ssl/openssl_client_key_store_unittest.cc
|
| +++ b/net/ssl/openssl_client_key_store_unittest.cc
|
| @@ -24,9 +24,7 @@ int EVP_PKEY_get_refcount(EVP_PKEY* pkey) {
|
| // each test.
|
| class OpenSSLClientKeyStoreTest : public ::testing::Test {
|
| public:
|
| - OpenSSLClientKeyStoreTest()
|
| - : store_(OpenSSLClientKeyStore::GetInstance()) {
|
| - }
|
| + OpenSSLClientKeyStoreTest() : store_(OpenSSLClientKeyStore::GetInstance()) {}
|
|
|
| virtual ~OpenSSLClientKeyStoreTest() {
|
| if (store_)
|
| @@ -53,8 +51,7 @@ TEST_F(OpenSSLClientKeyStoreTest, Flush) {
|
| ScopedEVP_PKEY priv_key(EVP_PKEY_new());
|
| ASSERT_TRUE(priv_key.get());
|
|
|
| - ASSERT_TRUE(store_->RecordClientCertPrivateKey(cert_1.get(),
|
| - priv_key.get()));
|
| + ASSERT_TRUE(store_->RecordClientCertPrivateKey(cert_1.get(), priv_key.get()));
|
|
|
| store_->Flush();
|
|
|
| @@ -99,14 +96,12 @@ TEST_F(OpenSSLClientKeyStoreTest, RecordAndFetchPrivateKey) {
|
| ASSERT_EQ(1, EVP_PKEY_get_refcount(priv_key.get()));
|
|
|
| // Add the key a first time, this should increment its reference count.
|
| - ASSERT_TRUE(store_->RecordClientCertPrivateKey(cert_1.get(),
|
| - priv_key.get()));
|
| + ASSERT_TRUE(store_->RecordClientCertPrivateKey(cert_1.get(), priv_key.get()));
|
| ASSERT_EQ(2, EVP_PKEY_get_refcount(priv_key.get()));
|
|
|
| // Two successive calls with the same certificate / private key shall
|
| // also succeed, but the key's reference count should not be incremented.
|
| - ASSERT_TRUE(store_->RecordClientCertPrivateKey(cert_1.get(),
|
| - priv_key.get()));
|
| + ASSERT_TRUE(store_->RecordClientCertPrivateKey(cert_1.get(), priv_key.get()));
|
| ASSERT_EQ(2, EVP_PKEY_get_refcount(priv_key.get()));
|
|
|
| // Retrieve the private key. This should increment the private key's
|
| @@ -144,21 +139,19 @@ TEST_F(OpenSSLClientKeyStoreTest, RecordAndFetchTwoPrivateKeys) {
|
|
|
| // Add the key a first time, this shall succeed, and increment the
|
| // reference count.
|
| - EXPECT_TRUE(store_->RecordClientCertPrivateKey(cert_1.get(),
|
| - priv_key1.get()));
|
| - EXPECT_TRUE(store_->RecordClientCertPrivateKey(cert_2.get(),
|
| - priv_key2.get()));
|
| + EXPECT_TRUE(
|
| + store_->RecordClientCertPrivateKey(cert_1.get(), priv_key1.get()));
|
| + EXPECT_TRUE(
|
| + store_->RecordClientCertPrivateKey(cert_2.get(), priv_key2.get()));
|
| EXPECT_EQ(2, EVP_PKEY_get_refcount(priv_key1.get()));
|
| EXPECT_EQ(2, EVP_PKEY_get_refcount(priv_key2.get()));
|
|
|
| // Retrieve the private key now. This shall succeed and increment
|
| // the private key's reference count.
|
| ScopedEVP_PKEY fetch_key1;
|
| - ASSERT_TRUE(store_->FetchClientCertPrivateKey(cert_1.get(),
|
| - &fetch_key1));
|
| + ASSERT_TRUE(store_->FetchClientCertPrivateKey(cert_1.get(), &fetch_key1));
|
| ScopedEVP_PKEY fetch_key2;
|
| - ASSERT_TRUE(store_->FetchClientCertPrivateKey(cert_2.get(),
|
| - &fetch_key2));
|
| + ASSERT_TRUE(store_->FetchClientCertPrivateKey(cert_2.get(), &fetch_key2));
|
| EXPECT_TRUE(fetch_key1.get());
|
| EXPECT_TRUE(fetch_key2.get());
|
|
|
|
|