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

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

Issue 2351513002: net: rename BoundNetLog to NetLogWithSource (Closed)
Patch Set: one more fix, content bound_net_log_ 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 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 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 protected: 68 protected:
69 int VerifyTestServerCert( 69 int VerifyTestServerCert(
70 const net::TestCompletionCallback& test_callback, 70 const net::TestCompletionCallback& test_callback,
71 net::CertVerifyResult* verify_result, 71 net::CertVerifyResult* verify_result,
72 std::unique_ptr<net::CertVerifier::Request>* request) { 72 std::unique_ptr<net::CertVerifier::Request>* request) {
73 return cert_verifier_->Verify(net::CertVerifier::RequestParams( 73 return cert_verifier_->Verify(net::CertVerifier::RequestParams(
74 test_server_cert_.get(), "127.0.0.1", 0, 74 test_server_cert_.get(), "127.0.0.1", 0,
75 std::string(), net::CertificateList()), 75 std::string(), net::CertificateList()),
76 nullptr, verify_result, 76 nullptr, verify_result,
77 test_callback.callback(), request, 77 test_callback.callback(), request,
78 net::BoundNetLog()); 78 net::NetLogWithSource());
79 } 79 }
80 80
81 bool SupportsAdditionalTrustAnchors() { 81 bool SupportsAdditionalTrustAnchors() {
82 scoped_refptr<net::CertVerifyProc> proc = 82 scoped_refptr<net::CertVerifyProc> proc =
83 net::CertVerifyProc::CreateDefault(); 83 net::CertVerifyProc::CreateDefault();
84 return proc->SupportsAdditionalTrustAnchors(); 84 return proc->SupportsAdditionalTrustAnchors();
85 } 85 }
86 86
87 // Returns whether |cert_verifier| signalled usage of one of the additional 87 // Returns whether |cert_verifier| signalled usage of one of the additional
88 // 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
227 int error = VerifyTestServerCert(callback, &verify_result, &request); 227 int error = VerifyTestServerCert(callback, &verify_result, &request);
228 // 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.
229 EXPECT_EQ(net::ERR_CERT_AUTHORITY_INVALID, error); 229 EXPECT_EQ(net::ERR_CERT_AUTHORITY_INVALID, error);
230 } 230 }
231 // The additional trust anchors were reset, thus |cert_verifier_| should not 231 // The additional trust anchors were reset, thus |cert_verifier_| should not
232 // signal it's usage anymore. 232 // signal it's usage anymore.
233 EXPECT_FALSE(WasTrustAnchorUsedAndReset()); 233 EXPECT_FALSE(WasTrustAnchorUsedAndReset());
234 } 234 }
235 235
236 } // namespace policy 236 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698