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

Side by Side Diff: net/url_request/url_request_unittest.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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/memory/ptr_util.h" 8 #include "base/memory/ptr_util.h"
9 #include "base/run_loop.h" 9 #include "base/run_loop.h"
10 #include "build/build_config.h" 10 #include "build/build_config.h"
(...skipping 6338 matching lines...) Expand 10 before | Expand all | Expand 10 after
6349 // A CTVerifier that returns net::OK for every certificate. 6349 // A CTVerifier that returns net::OK for every certificate.
6350 class MockCTVerifier : public CTVerifier { 6350 class MockCTVerifier : public CTVerifier {
6351 public: 6351 public:
6352 MockCTVerifier() {} 6352 MockCTVerifier() {}
6353 ~MockCTVerifier() override {} 6353 ~MockCTVerifier() override {}
6354 6354
6355 int Verify(X509Certificate* cert, 6355 int Verify(X509Certificate* cert,
6356 const std::string& stapled_ocsp_response, 6356 const std::string& stapled_ocsp_response,
6357 const std::string& sct_list_from_tls_extension, 6357 const std::string& sct_list_from_tls_extension,
6358 ct::CTVerifyResult* result, 6358 ct::CTVerifyResult* result,
6359 const BoundNetLog& net_log) override { 6359 const NetLogWithSource& net_log) override {
6360 return net::OK; 6360 return net::OK;
6361 } 6361 }
6362 6362
6363 void SetObserver(Observer* observer) override {} 6363 void SetObserver(Observer* observer) override {}
6364 }; 6364 };
6365 6365
6366 // A CTPolicyEnforcer that returns a default CertPolicyCompliance value 6366 // A CTPolicyEnforcer that returns a default CertPolicyCompliance value
6367 // for every certificate. 6367 // for every certificate.
6368 class MockCTPolicyEnforcer : public CTPolicyEnforcer { 6368 class MockCTPolicyEnforcer : public CTPolicyEnforcer {
6369 public: 6369 public:
6370 MockCTPolicyEnforcer() 6370 MockCTPolicyEnforcer()
6371 : default_result_( 6371 : default_result_(
6372 ct::CertPolicyCompliance::CERT_POLICY_COMPLIES_VIA_SCTS) {} 6372 ct::CertPolicyCompliance::CERT_POLICY_COMPLIES_VIA_SCTS) {}
6373 ~MockCTPolicyEnforcer() override {} 6373 ~MockCTPolicyEnforcer() override {}
6374 6374
6375 ct::CertPolicyCompliance DoesConformToCertPolicy( 6375 ct::CertPolicyCompliance DoesConformToCertPolicy(
6376 X509Certificate* cert, 6376 X509Certificate* cert,
6377 const SCTList& verified_scts, 6377 const SCTList& verified_scts,
6378 const BoundNetLog& net_log) override { 6378 const NetLogWithSource& net_log) override {
6379 return default_result_; 6379 return default_result_;
6380 } 6380 }
6381 6381
6382 void set_default_result(ct::CertPolicyCompliance default_result) { 6382 void set_default_result(ct::CertPolicyCompliance default_result) {
6383 default_result_ = default_result; 6383 default_result_ = default_result;
6384 } 6384 }
6385 6385
6386 private: 6386 private:
6387 ct::CertPolicyCompliance default_result_; 6387 ct::CertPolicyCompliance default_result_;
6388 }; 6388 };
(...skipping 2581 matching lines...) Expand 10 before | Expand all | Expand 10 after
8970 8970
8971 protected: 8971 protected:
8972 class AllowAnyCertCTPolicyEnforcer : public CTPolicyEnforcer { 8972 class AllowAnyCertCTPolicyEnforcer : public CTPolicyEnforcer {
8973 public: 8973 public:
8974 AllowAnyCertCTPolicyEnforcer() = default; 8974 AllowAnyCertCTPolicyEnforcer() = default;
8975 ~AllowAnyCertCTPolicyEnforcer() override = default; 8975 ~AllowAnyCertCTPolicyEnforcer() override = default;
8976 8976
8977 ct::CertPolicyCompliance DoesConformToCertPolicy( 8977 ct::CertPolicyCompliance DoesConformToCertPolicy(
8978 X509Certificate* cert, 8978 X509Certificate* cert,
8979 const SCTList& verified_scts, 8979 const SCTList& verified_scts,
8980 const BoundNetLog& net_log) override { 8980 const NetLogWithSource& net_log) override {
8981 return ct::CertPolicyCompliance::CERT_POLICY_COMPLIES_VIA_SCTS; 8981 return ct::CertPolicyCompliance::CERT_POLICY_COMPLIES_VIA_SCTS;
8982 } 8982 }
8983 8983
8984 ct::EVPolicyCompliance DoesConformToCTEVPolicy( 8984 ct::EVPolicyCompliance DoesConformToCTEVPolicy(
8985 X509Certificate* cert, 8985 X509Certificate* cert,
8986 const ct::EVCertsWhitelist* ev_whitelist, 8986 const ct::EVCertsWhitelist* ev_whitelist,
8987 const SCTList& verified_scts, 8987 const SCTList& verified_scts,
8988 const BoundNetLog& net_log) override { 8988 const NetLogWithSource& net_log) override {
8989 return ct::EVPolicyCompliance::EV_POLICY_COMPLIES_VIA_SCTS; 8989 return ct::EVPolicyCompliance::EV_POLICY_COMPLIES_VIA_SCTS;
8990 } 8990 }
8991 }; 8991 };
8992 // SetupContext configures the URLRequestContext that will be used for making 8992 // SetupContext configures the URLRequestContext that will be used for making
8993 // connetions to testserver. This can be overridden in test subclasses for 8993 // connetions to testserver. This can be overridden in test subclasses for
8994 // different behaviour. 8994 // different behaviour.
8995 virtual void SetupContext() { 8995 virtual void SetupContext() {
8996 context_.set_ssl_config_service(new TestSSLConfigService( 8996 context_.set_ssl_config_service(new TestSSLConfigService(
8997 true /* check for EV */, true /* online revocation checking */, 8997 true /* check for EV */, true /* online revocation checking */,
8998 false /* require rev. checking for local 8998 false /* require rev. checking for local
(...skipping 1193 matching lines...) Expand 10 before | Expand all | Expand 10 after
10192 AddTestInterceptor()->set_main_intercept_job(std::move(job)); 10192 AddTestInterceptor()->set_main_intercept_job(std::move(job));
10193 10193
10194 req->Start(); 10194 req->Start();
10195 req->Cancel(); 10195 req->Cancel();
10196 base::RunLoop().RunUntilIdle(); 10196 base::RunLoop().RunUntilIdle();
10197 EXPECT_EQ(ERR_ABORTED, d.request_status()); 10197 EXPECT_EQ(ERR_ABORTED, d.request_status());
10198 EXPECT_EQ(0, d.received_redirect_count()); 10198 EXPECT_EQ(0, d.received_redirect_count());
10199 } 10199 }
10200 10200
10201 } // namespace net 10201 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698