| Index: net/http/transport_security_persister_unittest.cc
|
| diff --git a/net/http/transport_security_persister_unittest.cc b/net/http/transport_security_persister_unittest.cc
|
| index c7a8dc51cb18f949c4fd1a141882c04a4c596e34..3edea7f0643308a04d48e6ee010dd50dace70ba8 100644
|
| --- a/net/http/transport_security_persister_unittest.cc
|
| +++ b/net/http/transport_security_persister_unittest.cc
|
| @@ -20,8 +20,7 @@ using net::TransportSecurityState;
|
|
|
| class TransportSecurityPersisterTest : public testing::Test {
|
| public:
|
| - TransportSecurityPersisterTest() {
|
| - }
|
| + TransportSecurityPersisterTest() {}
|
|
|
| virtual ~TransportSecurityPersisterTest() {
|
| base::MessageLoopForIO::current()->RunUntilIdle();
|
| @@ -76,8 +75,8 @@ TEST_F(TransportSecurityPersisterTest, SerializeData2) {
|
| EXPECT_TRUE(state_.GetDomainState("foo.bar.yahoo.com", true, &domain_state));
|
| EXPECT_EQ(domain_state.upgrade_mode,
|
| TransportSecurityState::DomainState::MODE_FORCE_HTTPS);
|
| - EXPECT_TRUE(state_.GetDomainState("foo.bar.baz.yahoo.com", true,
|
| - &domain_state));
|
| + EXPECT_TRUE(
|
| + state_.GetDomainState("foo.bar.baz.yahoo.com", true, &domain_state));
|
| EXPECT_EQ(domain_state.upgrade_mode,
|
| TransportSecurityState::DomainState::MODE_FORCE_HTTPS);
|
| EXPECT_FALSE(state_.GetDomainState("com", true, &domain_state));
|
| @@ -89,26 +88,24 @@ TEST_F(TransportSecurityPersisterTest, SerializeData3) {
|
| memset(fp1.data(), 0, fp1.size());
|
| net::HashValue fp2(net::HASH_VALUE_SHA1);
|
| memset(fp2.data(), 1, fp2.size());
|
| - base::Time expiry =
|
| - base::Time::Now() + base::TimeDelta::FromSeconds(1000);
|
| + base::Time expiry = base::Time::Now() + base::TimeDelta::FromSeconds(1000);
|
| net::HashValueVector dynamic_spki_hashes;
|
| dynamic_spki_hashes.push_back(fp1);
|
| dynamic_spki_hashes.push_back(fp2);
|
| bool include_subdomains = false;
|
| state_.AddHSTS("www.example.com", expiry, include_subdomains);
|
| - state_.AddHPKP("www.example.com", expiry, include_subdomains,
|
| - dynamic_spki_hashes);
|
| + state_.AddHPKP(
|
| + "www.example.com", expiry, include_subdomains, dynamic_spki_hashes);
|
|
|
| // Add another entry.
|
| memset(fp1.data(), 2, fp1.size());
|
| memset(fp2.data(), 3, fp2.size());
|
| - expiry =
|
| - base::Time::Now() + base::TimeDelta::FromSeconds(3000);
|
| + expiry = base::Time::Now() + base::TimeDelta::FromSeconds(3000);
|
| dynamic_spki_hashes.push_back(fp1);
|
| dynamic_spki_hashes.push_back(fp2);
|
| state_.AddHSTS("www.example.net", expiry, include_subdomains);
|
| - state_.AddHPKP("www.example.net", expiry, include_subdomains,
|
| - dynamic_spki_hashes);
|
| + state_.AddHPKP(
|
| + "www.example.net", expiry, include_subdomains, dynamic_spki_hashes);
|
|
|
| // Save a copy of everything.
|
| std::map<std::string, TransportSecurityState::DomainState> saved;
|
| @@ -187,7 +184,9 @@ TEST_F(TransportSecurityPersisterTest, PublicKeyHashes) {
|
| const base::Time expiry = current_time + base::TimeDelta::FromSeconds(1000);
|
| bool include_subdomains = false;
|
| state_.AddHSTS(kTestDomain, expiry, include_subdomains);
|
| - state_.AddHPKP(kTestDomain, expiry, include_subdomains,
|
| + state_.AddHPKP(kTestDomain,
|
| + expiry,
|
| + include_subdomains,
|
| domain_state.dynamic_spki_hashes);
|
| std::string ser;
|
| EXPECT_TRUE(persister_->SerializeData(&ser));
|
| @@ -196,6 +195,8 @@ TEST_F(TransportSecurityPersisterTest, PublicKeyHashes) {
|
| EXPECT_TRUE(state_.GetDomainState(kTestDomain, false, &domain_state));
|
| EXPECT_EQ(1u, domain_state.dynamic_spki_hashes.size());
|
| EXPECT_EQ(sha1.tag, domain_state.dynamic_spki_hashes[0].tag);
|
| - EXPECT_EQ(0, memcmp(domain_state.dynamic_spki_hashes[0].data(), sha1.data(),
|
| - sha1.size()));
|
| + EXPECT_EQ(0,
|
| + memcmp(domain_state.dynamic_spki_hashes[0].data(),
|
| + sha1.data(),
|
| + sha1.size()));
|
| }
|
|
|