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

Side by Side Diff: chrome/browser/chromeos/policy/policy_cert_verifier_browsertest.cc

Issue 1994353002: Update CertVerifier::Verify to use RequestParams instead (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@request_params
Patch Set: Rebased Created 4 years, 7 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "chrome/browser/chromeos/policy/policy_cert_verifier.h" 5 #include "chrome/browser/chromeos/policy/policy_cert_verifier.h"
6 6
7 #include <memory> 7 #include <memory>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 // BrowserThread::CurrentlyOn checks fail. 65 // BrowserThread::CurrentlyOn checks fail.
66 cert_verifier_.reset(); 66 cert_verifier_.reset();
67 } 67 }
68 68
69 protected: 69 protected:
70 int VerifyTestServerCert( 70 int VerifyTestServerCert(
71 const net::TestCompletionCallback& test_callback, 71 const net::TestCompletionCallback& test_callback,
72 net::CertVerifyResult* verify_result, 72 net::CertVerifyResult* verify_result,
73 std::unique_ptr<net::CertVerifier::Request>* request) { 73 std::unique_ptr<net::CertVerifier::Request>* request) {
74 return cert_verifier_->Verify( 74 return cert_verifier_->Verify(
75 test_server_cert_.get(), "127.0.0.1", std::string(), 0, NULL, 75 net::CertVerifier::RequestParams(test_server_cert_.get(), "127.0.0.1",
76 verify_result, test_callback.callback(), request, net::BoundNetLog()); 76 0, std::string(), CertificateList()),
77 nullptr, verify_result, test_callback.callback(), request,
78 net::BoundNetLog());
77 } 79 }
78 80
79 bool SupportsAdditionalTrustAnchors() { 81 bool SupportsAdditionalTrustAnchors() {
80 scoped_refptr<net::CertVerifyProc> proc = 82 scoped_refptr<net::CertVerifyProc> proc =
81 net::CertVerifyProc::CreateDefault(); 83 net::CertVerifyProc::CreateDefault();
82 return proc->SupportsAdditionalTrustAnchors(); 84 return proc->SupportsAdditionalTrustAnchors();
83 } 85 }
84 86
85 // Returns whether |cert_verifier| signalled usage of one of the additional 87 // Returns whether |cert_verifier| signalled usage of one of the additional
86 // trust anchors (i.e. of |test_ca_cert_|) for the first time or since the 88 // trust anchors (i.e. of |test_ca_cert_|) for the first time or since the
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
225 int error = VerifyTestServerCert(callback, &verify_result, &request); 227 int error = VerifyTestServerCert(callback, &verify_result, &request);
226 // Note: this hits the cached result from the first Verify() in this test. 228 // Note: this hits the cached result from the first Verify() in this test.
227 EXPECT_EQ(net::ERR_CERT_AUTHORITY_INVALID, error); 229 EXPECT_EQ(net::ERR_CERT_AUTHORITY_INVALID, error);
228 } 230 }
229 // The additional trust anchors were reset, thus |cert_verifier_| should not 231 // The additional trust anchors were reset, thus |cert_verifier_| should not
230 // signal it's usage anymore. 232 // signal it's usage anymore.
231 EXPECT_FALSE(WasTrustAnchorUsedAndReset()); 233 EXPECT_FALSE(WasTrustAnchorUsedAndReset());
232 } 234 }
233 235
234 } // namespace policy 236 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698