Index: net/cert/multi_log_ct_verifier_unittest.cc |
diff --git a/net/cert/multi_log_ct_verifier_unittest.cc b/net/cert/multi_log_ct_verifier_unittest.cc |
index c2ae25e307351abbd0ab65adce40619b50780faa..3fc0665990ff0e2eb2307db280d85de42c946db1 100644 |
--- a/net/cert/multi_log_ct_verifier_unittest.cc |
+++ b/net/cert/multi_log_ct_verifier_unittest.cc |
@@ -45,9 +45,8 @@ class MultiLogCTVerifierTest : public ::testing::Test { |
verifier_.reset(new MultiLogCTVerifier()); |
verifier_->AddLog(log.Pass()); |
std::string der_test_cert(ct::GetDerEncodedX509Cert()); |
- chain_ = X509Certificate::CreateFromBytes( |
- der_test_cert.data(), |
- der_test_cert.length()); |
+ chain_ = X509Certificate::CreateFromBytes(der_test_cert.data(), |
+ der_test_cert.length()); |
ASSERT_TRUE(chain_); |
embedded_sct_chain_ = |
@@ -58,17 +57,15 @@ class MultiLogCTVerifierTest : public ::testing::Test { |
} |
bool CheckForSingleVerifiedSCTInResult(const ct::CTVerifyResult& result) { |
- return (result.verified_scts.size() == 1U) && |
- result.invalid_scts.empty() && |
- result.unknown_logs_scts.empty() && |
- result.verified_scts[0]->log_description == kLogDescription; |
+ return (result.verified_scts.size() == 1U) && result.invalid_scts.empty() && |
+ result.unknown_logs_scts.empty() && |
+ result.verified_scts[0]->log_description == kLogDescription; |
} |
- bool CheckForSCTOrigin( |
- const ct::CTVerifyResult& result, |
- ct::SignedCertificateTimestamp::Origin origin) { |
+ bool CheckForSCTOrigin(const ct::CTVerifyResult& result, |
+ ct::SignedCertificateTimestamp::Origin origin) { |
return (result.verified_scts.size() > 0) && |
- (result.verified_scts[0]->origin == origin); |
+ (result.verified_scts[0]->origin == origin); |
} |
bool CheckForEmbeddedSCTInNetLog(CapturingNetLog& net_log) { |
@@ -150,7 +147,7 @@ class MultiLogCTVerifierTest : public ::testing::Test { |
ct::CTVerifyResult result; |
CapturingNetLog net_log; |
BoundNetLog bound_net_log = |
- BoundNetLog::Make(&net_log, NetLog::SOURCE_CONNECT_JOB); |
+ BoundNetLog::Make(&net_log, NetLog::SOURCE_CONNECT_JOB); |
return (VerifySinglePrecertificateChain(chain, bound_net_log, &result) && |
CheckForSingleVerifiedSCTInResult(result) && |
CheckForSCTOrigin(result, |
@@ -212,8 +209,7 @@ TEST_F(MultiLogCTVerifierTest, VerifiesEmbeddedSCTWithIntermediate) { |
ASSERT_TRUE(CheckPrecertificateVerification(chain)); |
} |
-TEST_F(MultiLogCTVerifierTest, |
- VerifiesEmbeddedSCTWithIntermediateAndPreCA) { |
+TEST_F(MultiLogCTVerifierTest, VerifiesEmbeddedSCTWithIntermediateAndPreCA) { |
scoped_refptr<X509Certificate> chain(CreateCertificateChainFromFile( |
GetTestCertsDirectory(), |
"ct-test-embedded-with-intermediate-preca-chain.pem", |
@@ -222,8 +218,7 @@ TEST_F(MultiLogCTVerifierTest, |
ASSERT_TRUE(CheckPrecertificateVerification(chain)); |
} |
-TEST_F(MultiLogCTVerifierTest, |
- VerifiesSCTOverX509Cert) { |
+TEST_F(MultiLogCTVerifierTest, VerifiesSCTOverX509Cert) { |
std::string sct(ct::GetTestSignedCertificateTimestamp()); |
std::string sct_list; |
@@ -231,15 +226,14 @@ TEST_F(MultiLogCTVerifierTest, |
ct::CTVerifyResult result; |
EXPECT_EQ(OK, |
- verifier_->Verify(chain_, std::string(), sct_list, &result, |
- BoundNetLog())); |
+ verifier_->Verify( |
+ chain_, std::string(), sct_list, &result, BoundNetLog())); |
ASSERT_TRUE(CheckForSingleVerifiedSCTInResult(result)); |
ASSERT_TRUE(CheckForSCTOrigin( |
result, ct::SignedCertificateTimestamp::SCT_FROM_TLS_EXTENSION)); |
} |
-TEST_F(MultiLogCTVerifierTest, |
- IdentifiesSCTFromUnknownLog) { |
+TEST_F(MultiLogCTVerifierTest, IdentifiesSCTFromUnknownLog) { |
std::string sct_list = GetSCTListWithInvalidSCT(); |
ct::CTVerifyResult result; |
@@ -266,8 +260,8 @@ TEST_F(MultiLogCTVerifierTest, CountsInvalidSCTsInStatusHistogram) { |
"Net.CertificateTransparency.SCTStatus", ct::SCT_STATUS_LOG_UNKNOWN); |
EXPECT_NE(OK, |
- verifier_->Verify(chain_, std::string(), sct_list, &result, |
- BoundNetLog())); |
+ verifier_->Verify( |
+ chain_, std::string(), sct_list, &result, BoundNetLog())); |
ASSERT_EQ(num_valid_scts, NumValidSCTsInStatusHistogram()); |
ASSERT_EQ(num_invalid_scts + 1, |