Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(335)

Side by Side Diff: net/quic/chromium/crypto_test_utils_chromium.cc

Issue 2259823002: Re-write many calls to WrapUnique() with MakeUnique() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <memory> 5 #include <memory>
6 #include <utility> 6 #include <utility>
7 7
8 #include "base/callback_helpers.h" 8 #include "base/callback_helpers.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 net::CertVerifyResult verify_result; 100 net::CertVerifyResult verify_result;
101 verify_result.verified_cert = 101 verify_result.verified_cert =
102 ImportCertFromFile(GetTestCertsDirectory(), "quic_test.example.com.crt"); 102 ImportCertFromFile(GetTestCertsDirectory(), "quic_test.example.com.crt");
103 cert_verifier->AddResultForCertAndHost(verify_result.verified_cert.get(), 103 cert_verifier->AddResultForCertAndHost(verify_result.verified_cert.get(),
104 "test.example.com", verify_result, OK); 104 "test.example.com", verify_result, OK);
105 verify_result.verified_cert = ImportCertFromFile( 105 verify_result.verified_cert = ImportCertFromFile(
106 GetTestCertsDirectory(), "quic_test_ecc.example.com.crt"); 106 GetTestCertsDirectory(), "quic_test_ecc.example.com.crt");
107 cert_verifier->AddResultForCertAndHost(verify_result.verified_cert.get(), 107 cert_verifier->AddResultForCertAndHost(verify_result.verified_cert.get(),
108 "test.example.com", verify_result, OK); 108 "test.example.com", verify_result, OK);
109 if (use_real_proof_verifier) { 109 if (use_real_proof_verifier) {
110 return base::WrapUnique(new TestProofVerifierChromium( 110 return base::MakeUnique<TestProofVerifierChromium>(
111 std::move(cert_verifier), base::WrapUnique(new TransportSecurityState), 111 std::move(cert_verifier), base::WrapUnique(new TransportSecurityState),
112 base::WrapUnique(new MultiLogCTVerifier), 112 base::WrapUnique(new MultiLogCTVerifier),
113 base::WrapUnique(new CTPolicyEnforcer), "quic_root.crt")); 113 base::WrapUnique(new CTPolicyEnforcer), "quic_root.crt");
114 } 114 }
115 return base::WrapUnique(new TestProofVerifierChromium( 115 return base::MakeUnique<TestProofVerifierChromium>(
116 std::move(cert_verifier), base::WrapUnique(new TransportSecurityState), 116 std::move(cert_verifier), base::WrapUnique(new TransportSecurityState),
117 base::WrapUnique(new MultiLogCTVerifier), 117 base::WrapUnique(new MultiLogCTVerifier),
118 base::WrapUnique(new CTPolicyEnforcer), "quic_root.crt")); 118 base::WrapUnique(new CTPolicyEnforcer), "quic_root.crt");
119 } 119 }
120 120
121 // static 121 // static
122 std::unique_ptr<ProofVerifier> CryptoTestUtils::ProofVerifierForTesting() { 122 std::unique_ptr<ProofVerifier> CryptoTestUtils::ProofVerifierForTesting() {
123 return ProofVerifierForTestingInternal(/*use_real_proof_verifier=*/false); 123 return ProofVerifierForTestingInternal(/*use_real_proof_verifier=*/false);
124 } 124 }
125 125
126 // static 126 // static
127 std::unique_ptr<ProofVerifier> CryptoTestUtils::RealProofVerifierForTesting() { 127 std::unique_ptr<ProofVerifier> CryptoTestUtils::RealProofVerifierForTesting() {
128 return ProofVerifierForTestingInternal(/*use_real_proof_verifier=*/true); 128 return ProofVerifierForTestingInternal(/*use_real_proof_verifier=*/true);
129 } 129 }
130 130
131 // static 131 // static
132 ProofVerifyContext* CryptoTestUtils::ProofVerifyContextForTesting() { 132 ProofVerifyContext* CryptoTestUtils::ProofVerifyContextForTesting() {
133 return new ProofVerifyContextChromium(/*cert_verify_flags=*/0, BoundNetLog()); 133 return new ProofVerifyContextChromium(/*cert_verify_flags=*/0, BoundNetLog());
134 } 134 }
135 135
136 } // namespace test 136 } // namespace test
137 137
138 } // namespace net 138 } // namespace net
OLDNEW
« no previous file with comments | « net/quic/chromium/bidirectional_stream_quic_impl_unittest.cc ('k') | net/quic/chromium/quic_chromium_client_session.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698