| Index: net/test/cert_test_util.cc
|
| diff --git a/net/test/cert_test_util.cc b/net/test/cert_test_util.cc
|
| index 3ccfa65a5adfa9bf7fee5f75641184c529f8edc7..76f30c8e9cd2187513ebfdd26afa7a0f6cf59909 100644
|
| --- a/net/test/cert_test_util.cc
|
| +++ b/net/test/cert_test_util.cc
|
| @@ -13,25 +13,23 @@
|
|
|
| namespace net {
|
|
|
| -CertificateList CreateCertificateListFromFile(
|
| - const base::FilePath& certs_dir,
|
| - const std::string& cert_file,
|
| - int format) {
|
| +CertificateList CreateCertificateListFromFile(const base::FilePath& certs_dir,
|
| + const std::string& cert_file,
|
| + int format) {
|
| base::FilePath cert_path = certs_dir.AppendASCII(cert_file);
|
| std::string cert_data;
|
| if (!base::ReadFileToString(cert_path, &cert_data))
|
| return CertificateList();
|
| - return X509Certificate::CreateCertificateListFromBytes(cert_data.data(),
|
| - cert_data.size(),
|
| - format);
|
| + return X509Certificate::CreateCertificateListFromBytes(
|
| + cert_data.data(), cert_data.size(), format);
|
| }
|
|
|
| scoped_refptr<X509Certificate> CreateCertificateChainFromFile(
|
| const base::FilePath& certs_dir,
|
| const std::string& cert_file,
|
| int format) {
|
| - CertificateList certs = CreateCertificateListFromFile(
|
| - certs_dir, cert_file, format);
|
| + CertificateList certs =
|
| + CreateCertificateListFromFile(certs_dir, cert_file, format);
|
| if (certs.empty())
|
| return NULL;
|
|
|
| @@ -40,7 +38,7 @@ scoped_refptr<X509Certificate> CreateCertificateChainFromFile(
|
| intermediates.push_back(certs[i]->os_cert_handle());
|
|
|
| scoped_refptr<X509Certificate> result(X509Certificate::CreateFromHandle(
|
| - certs[0]->os_cert_handle(), intermediates));
|
| + certs[0]->os_cert_handle(), intermediates));
|
| return result;
|
| }
|
|
|
| @@ -63,8 +61,7 @@ scoped_refptr<X509Certificate> ImportCertFromFile(
|
| ScopedTestEVPolicy::ScopedTestEVPolicy(EVRootCAMetadata* ev_root_ca_metadata,
|
| const SHA1HashValue& fingerprint,
|
| const char* policy)
|
| - : fingerprint_(fingerprint),
|
| - ev_root_ca_metadata_(ev_root_ca_metadata) {
|
| + : fingerprint_(fingerprint), ev_root_ca_metadata_(ev_root_ca_metadata) {
|
| EXPECT_TRUE(ev_root_ca_metadata->AddEVCA(fingerprint, policy));
|
| }
|
|
|
|
|