| Index: net/ssl/server_bound_cert_service_unittest.cc
|
| diff --git a/net/ssl/server_bound_cert_service_unittest.cc b/net/ssl/server_bound_cert_service_unittest.cc
|
| index 2be073bb16c3b930dda083c631a3116970eab6b8..c64cd723b63aa4eb7a5ca54a7a43b65ab5428b61 100644
|
| --- a/net/ssl/server_bound_cert_service_unittest.cc
|
| +++ b/net/ssl/server_bound_cert_service_unittest.cc
|
| @@ -119,10 +119,9 @@ MockServerBoundCertStoreWithAsyncGet::CallGetServerBoundCertCallbackWithResult(
|
| class ServerBoundCertServiceTest : public testing::Test {
|
| public:
|
| ServerBoundCertServiceTest()
|
| - : service_(new ServerBoundCertService(
|
| - new DefaultServerBoundCertStore(NULL),
|
| - base::MessageLoopProxy::current())) {
|
| - }
|
| + : service_(
|
| + new ServerBoundCertService(new DefaultServerBoundCertStore(NULL),
|
| + base::MessageLoopProxy::current())) {}
|
|
|
| protected:
|
| scoped_ptr<ServerBoundCertService> service_;
|
| @@ -141,10 +140,8 @@ TEST_F(ServerBoundCertServiceTest, GetDomainForHost) {
|
| ServerBoundCertService::GetDomainForHost("appspot.com"));
|
| EXPECT_EQ("google.com",
|
| ServerBoundCertService::GetDomainForHost("www.mail.google.com"));
|
| - EXPECT_EQ("goto",
|
| - ServerBoundCertService::GetDomainForHost("goto"));
|
| - EXPECT_EQ("127.0.0.1",
|
| - ServerBoundCertService::GetDomainForHost("127.0.0.1"));
|
| + EXPECT_EQ("goto", ServerBoundCertService::GetDomainForHost("goto"));
|
| + EXPECT_EQ("127.0.0.1", ServerBoundCertService::GetDomainForHost("127.0.0.1"));
|
| }
|
|
|
| TEST_F(ServerBoundCertServiceTest, GetCacheMiss) {
|
| @@ -175,9 +172,11 @@ TEST_F(ServerBoundCertServiceTest, CacheHit) {
|
| // Asynchronous completion.
|
| std::string private_key_info1, der_cert1;
|
| EXPECT_EQ(0, service_->cert_count());
|
| - error = service_->GetOrCreateDomainBoundCert(
|
| - host, &private_key_info1, &der_cert1,
|
| - callback.callback(), &request_handle);
|
| + error = service_->GetOrCreateDomainBoundCert(host,
|
| + &private_key_info1,
|
| + &der_cert1,
|
| + callback.callback(),
|
| + &request_handle);
|
| EXPECT_EQ(ERR_IO_PENDING, error);
|
| EXPECT_TRUE(request_handle.is_active());
|
| error = callback.WaitForResult();
|
| @@ -189,9 +188,11 @@ TEST_F(ServerBoundCertServiceTest, CacheHit) {
|
|
|
| // Synchronous completion.
|
| std::string private_key_info2, der_cert2;
|
| - error = service_->GetOrCreateDomainBoundCert(
|
| - host, &private_key_info2, &der_cert2,
|
| - callback.callback(), &request_handle);
|
| + error = service_->GetOrCreateDomainBoundCert(host,
|
| + &private_key_info2,
|
| + &der_cert2,
|
| + callback.callback(),
|
| + &request_handle);
|
| EXPECT_FALSE(request_handle.is_active());
|
| EXPECT_EQ(OK, error);
|
| EXPECT_EQ(1, service_->cert_count());
|
| @@ -200,9 +201,11 @@ TEST_F(ServerBoundCertServiceTest, CacheHit) {
|
|
|
| // Synchronous get.
|
| std::string private_key_info3, der_cert3;
|
| - error = service_->GetDomainBoundCert(
|
| - host, &private_key_info3, &der_cert3, callback.callback(),
|
| - &request_handle);
|
| + error = service_->GetDomainBoundCert(host,
|
| + &private_key_info3,
|
| + &der_cert3,
|
| + callback.callback(),
|
| + &request_handle);
|
| EXPECT_FALSE(request_handle.is_active());
|
| EXPECT_EQ(OK, error);
|
| EXPECT_EQ(1, service_->cert_count());
|
| @@ -222,9 +225,11 @@ TEST_F(ServerBoundCertServiceTest, StoreCerts) {
|
| std::string host1("encrypted.google.com");
|
| std::string private_key_info1, der_cert1;
|
| EXPECT_EQ(0, service_->cert_count());
|
| - error = service_->GetOrCreateDomainBoundCert(
|
| - host1, &private_key_info1, &der_cert1,
|
| - callback.callback(), &request_handle);
|
| + error = service_->GetOrCreateDomainBoundCert(host1,
|
| + &private_key_info1,
|
| + &der_cert1,
|
| + callback.callback(),
|
| + &request_handle);
|
| EXPECT_EQ(ERR_IO_PENDING, error);
|
| EXPECT_TRUE(request_handle.is_active());
|
| error = callback.WaitForResult();
|
| @@ -233,9 +238,11 @@ TEST_F(ServerBoundCertServiceTest, StoreCerts) {
|
|
|
| std::string host2("www.verisign.com");
|
| std::string private_key_info2, der_cert2;
|
| - error = service_->GetOrCreateDomainBoundCert(
|
| - host2, &private_key_info2, &der_cert2,
|
| - callback.callback(), &request_handle);
|
| + error = service_->GetOrCreateDomainBoundCert(host2,
|
| + &private_key_info2,
|
| + &der_cert2,
|
| + callback.callback(),
|
| + &request_handle);
|
| EXPECT_EQ(ERR_IO_PENDING, error);
|
| EXPECT_TRUE(request_handle.is_active());
|
| error = callback.WaitForResult();
|
| @@ -244,9 +251,11 @@ TEST_F(ServerBoundCertServiceTest, StoreCerts) {
|
|
|
| std::string host3("www.twitter.com");
|
| std::string private_key_info3, der_cert3;
|
| - error = service_->GetOrCreateDomainBoundCert(
|
| - host3, &private_key_info3, &der_cert3,
|
| - callback.callback(), &request_handle);
|
| + error = service_->GetOrCreateDomainBoundCert(host3,
|
| + &private_key_info3,
|
| + &der_cert3,
|
| + callback.callback(),
|
| + &request_handle);
|
| EXPECT_EQ(ERR_IO_PENDING, error);
|
| EXPECT_TRUE(request_handle.is_active());
|
| error = callback.WaitForResult();
|
| @@ -274,15 +283,19 @@ TEST_F(ServerBoundCertServiceTest, InflightJoin) {
|
| TestCompletionCallback callback2;
|
| ServerBoundCertService::RequestHandle request_handle2;
|
|
|
| - error = service_->GetOrCreateDomainBoundCert(
|
| - host, &private_key_info1, &der_cert1,
|
| - callback1.callback(), &request_handle1);
|
| + error = service_->GetOrCreateDomainBoundCert(host,
|
| + &private_key_info1,
|
| + &der_cert1,
|
| + callback1.callback(),
|
| + &request_handle1);
|
| EXPECT_EQ(ERR_IO_PENDING, error);
|
| EXPECT_TRUE(request_handle1.is_active());
|
| // Should join with the original request.
|
| - error = service_->GetOrCreateDomainBoundCert(
|
| - host, &private_key_info2, &der_cert2,
|
| - callback2.callback(), &request_handle2);
|
| + error = service_->GetOrCreateDomainBoundCert(host,
|
| + &private_key_info2,
|
| + &der_cert2,
|
| + callback2.callback(),
|
| + &request_handle2);
|
| EXPECT_EQ(ERR_IO_PENDING, error);
|
| EXPECT_TRUE(request_handle2.is_active());
|
|
|
| @@ -311,15 +324,19 @@ TEST_F(ServerBoundCertServiceTest, InflightJoinGetOrCreateAndGet) {
|
| TestCompletionCallback callback2;
|
| ServerBoundCertService::RequestHandle request_handle2;
|
|
|
| - error = service_->GetOrCreateDomainBoundCert(
|
| - host, &private_key_info1, &der_cert1,
|
| - callback1.callback(), &request_handle1);
|
| + error = service_->GetOrCreateDomainBoundCert(host,
|
| + &private_key_info1,
|
| + &der_cert1,
|
| + callback1.callback(),
|
| + &request_handle1);
|
| EXPECT_EQ(ERR_IO_PENDING, error);
|
| EXPECT_TRUE(request_handle1.is_active());
|
| // Should join with the original request.
|
| - error = service_->GetDomainBoundCert(
|
| - host, &private_key_info2, &der_cert2, callback2.callback(),
|
| - &request_handle2);
|
| + error = service_->GetDomainBoundCert(host,
|
| + &private_key_info2,
|
| + &der_cert2,
|
| + callback2.callback(),
|
| + &request_handle2);
|
| EXPECT_EQ(ERR_IO_PENDING, error);
|
| EXPECT_TRUE(request_handle2.is_active());
|
|
|
| @@ -343,8 +360,7 @@ TEST_F(ServerBoundCertServiceTest, ExtractValuesFromBytesEC) {
|
| ServerBoundCertService::RequestHandle request_handle;
|
|
|
| error = service_->GetOrCreateDomainBoundCert(
|
| - host, &private_key_info, &der_cert, callback.callback(),
|
| - &request_handle);
|
| + host, &private_key_info, &der_cert, callback.callback(), &request_handle);
|
| EXPECT_EQ(ERR_IO_PENDING, error);
|
| EXPECT_TRUE(request_handle.is_active());
|
| error = callback.WaitForResult();
|
| @@ -352,9 +368,8 @@ TEST_F(ServerBoundCertServiceTest, ExtractValuesFromBytesEC) {
|
|
|
| base::StringPiece spki_piece;
|
| ASSERT_TRUE(asn1::ExtractSPKIFromDERCert(der_cert, &spki_piece));
|
| - std::vector<uint8> spki(
|
| - spki_piece.data(),
|
| - spki_piece.data() + spki_piece.size());
|
| + std::vector<uint8> spki(spki_piece.data(),
|
| + spki_piece.data() + spki_piece.size());
|
|
|
| // Check that we can retrieve the key from the bytes.
|
| std::vector<uint8> key_vec(private_key_info.begin(), private_key_info.end());
|
| @@ -544,11 +559,8 @@ TEST_F(ServerBoundCertServiceTest, SimultaneousCreation) {
|
| TEST_F(ServerBoundCertServiceTest, Expiration) {
|
| ServerBoundCertStore* store = service_->GetCertStore();
|
| base::Time now = base::Time::Now();
|
| - store->SetServerBoundCert("good",
|
| - now,
|
| - now + base::TimeDelta::FromDays(1),
|
| - "a",
|
| - "b");
|
| + store->SetServerBoundCert(
|
| + "good", now, now + base::TimeDelta::FromDays(1), "a", "b");
|
| store->SetServerBoundCert("expired",
|
| now - base::TimeDelta::FromDays(2),
|
| now - base::TimeDelta::FromDays(1),
|
| @@ -562,9 +574,11 @@ TEST_F(ServerBoundCertServiceTest, Expiration) {
|
|
|
| // Cert is valid - synchronous completion.
|
| std::string private_key_info1, der_cert1;
|
| - error = service_->GetOrCreateDomainBoundCert(
|
| - "good", &private_key_info1, &der_cert1,
|
| - callback.callback(), &request_handle);
|
| + error = service_->GetOrCreateDomainBoundCert("good",
|
| + &private_key_info1,
|
| + &der_cert1,
|
| + callback.callback(),
|
| + &request_handle);
|
| EXPECT_EQ(OK, error);
|
| EXPECT_FALSE(request_handle.is_active());
|
| EXPECT_EQ(2, service_->cert_count());
|
| @@ -573,9 +587,11 @@ TEST_F(ServerBoundCertServiceTest, Expiration) {
|
|
|
| // Expired cert is valid as well - synchronous completion.
|
| std::string private_key_info2, der_cert2;
|
| - error = service_->GetOrCreateDomainBoundCert(
|
| - "expired", &private_key_info2, &der_cert2,
|
| - callback.callback(), &request_handle);
|
| + error = service_->GetOrCreateDomainBoundCert("expired",
|
| + &private_key_info2,
|
| + &der_cert2,
|
| + callback.callback(),
|
| + &request_handle);
|
| EXPECT_EQ(OK, error);
|
| EXPECT_FALSE(request_handle.is_active());
|
| EXPECT_EQ(2, service_->cert_count());
|
|
|