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

Unified Diff: net/quic/test_tools/crypto_test_utils_chromium.cc

Issue 1290243007: Shift URLRequestContextStorage over to taking scoped_ptrs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@Paul_BuilderGrab
Patch Set: Sync'd to p347022. Created 5 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 side-by-side diff with in-line comments
Download patch
Index: net/quic/test_tools/crypto_test_utils_chromium.cc
diff --git a/net/quic/test_tools/crypto_test_utils_chromium.cc b/net/quic/test_tools/crypto_test_utils_chromium.cc
index f1d60f069a9a02ee4c37c89946a136dc2aa0e2c3..f6efe49f6510cf8ed819db23f091d7d469453a33 100644
--- a/net/quic/test_tools/crypto_test_utils_chromium.cc
+++ b/net/quic/test_tools/crypto_test_utils_chromium.cc
@@ -23,12 +23,15 @@ namespace {
class TestProofVerifierChromium : public ProofVerifierChromium {
public:
- TestProofVerifierChromium(CertVerifier* cert_verifier,
- TransportSecurityState* transport_security_state,
- const std::string& cert_file)
- : ProofVerifierChromium(cert_verifier, nullptr, transport_security_state),
- cert_verifier_(cert_verifier),
- transport_security_state_(transport_security_state) {
+ TestProofVerifierChromium(
+ scoped_ptr<CertVerifier> cert_verifier,
+ scoped_ptr<TransportSecurityState> transport_security_state,
+ const std::string& cert_file)
+ : ProofVerifierChromium(cert_verifier.get(),
+ nullptr,
+ transport_security_state.get()),
+ cert_verifier_(cert_verifier.Pass()),
+ transport_security_state_(transport_security_state.Pass()) {
// Load and install the root for the validated chain.
scoped_refptr<X509Certificate> root_cert =
ImportCertFromFile(GetTestCertsDirectory(), cert_file);
@@ -114,8 +117,8 @@ ProofSource* CryptoTestUtils::ProofSourceForTesting() {
// static
ProofVerifier* CryptoTestUtils::ProofVerifierForTesting() {
TestProofVerifierChromium* proof_verifier = new TestProofVerifierChromium(
- CertVerifier::CreateDefault(), new TransportSecurityState,
- "quic_root.crt");
+ CertVerifier::CreateDefault(),
+ make_scoped_ptr(new TransportSecurityState), "quic_root.crt");
return proof_verifier;
}

Powered by Google App Engine
This is Rietveld 408576698