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

Side by Side Diff: net/url_request/url_request_unittest.cc

Issue 2351513002: net: rename BoundNetLog to NetLogWithSource (Closed)
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 (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 6334 matching lines...) Expand 10 before | Expand all | Expand 10 after
6345 // A CTVerifier that returns net::OK for every certificate. 6345 // A CTVerifier that returns net::OK for every certificate.
6346 class MockCTVerifier : public CTVerifier { 6346 class MockCTVerifier : public CTVerifier {
6347 public: 6347 public:
6348 MockCTVerifier() {} 6348 MockCTVerifier() {}
6349 ~MockCTVerifier() override {} 6349 ~MockCTVerifier() override {}
6350 6350
6351 int Verify(X509Certificate* cert, 6351 int Verify(X509Certificate* cert,
6352 const std::string& stapled_ocsp_response, 6352 const std::string& stapled_ocsp_response,
6353 const std::string& sct_list_from_tls_extension, 6353 const std::string& sct_list_from_tls_extension,
6354 ct::CTVerifyResult* result, 6354 ct::CTVerifyResult* result,
6355 const BoundNetLog& net_log) override { 6355 const NetLogWithSource& net_log) override {
6356 return net::OK; 6356 return net::OK;
6357 } 6357 }
6358 6358
6359 void SetObserver(Observer* observer) override {} 6359 void SetObserver(Observer* observer) override {}
6360 }; 6360 };
6361 6361
6362 // A CTPolicyEnforcer that returns a default CertPolicyCompliance value 6362 // A CTPolicyEnforcer that returns a default CertPolicyCompliance value
6363 // for every certificate. 6363 // for every certificate.
6364 class MockCTPolicyEnforcer : public CTPolicyEnforcer { 6364 class MockCTPolicyEnforcer : public CTPolicyEnforcer {
6365 public: 6365 public:
6366 MockCTPolicyEnforcer() 6366 MockCTPolicyEnforcer()
6367 : default_result_( 6367 : default_result_(
6368 ct::CertPolicyCompliance::CERT_POLICY_COMPLIES_VIA_SCTS) {} 6368 ct::CertPolicyCompliance::CERT_POLICY_COMPLIES_VIA_SCTS) {}
6369 ~MockCTPolicyEnforcer() override {} 6369 ~MockCTPolicyEnforcer() override {}
6370 6370
6371 ct::CertPolicyCompliance DoesConformToCertPolicy( 6371 ct::CertPolicyCompliance DoesConformToCertPolicy(
6372 X509Certificate* cert, 6372 X509Certificate* cert,
6373 const SCTList& verified_scts, 6373 const SCTList& verified_scts,
6374 const BoundNetLog& net_log) override { 6374 const NetLogWithSource& net_log) override {
6375 return default_result_; 6375 return default_result_;
6376 } 6376 }
6377 6377
6378 void set_default_result(ct::CertPolicyCompliance default_result) { 6378 void set_default_result(ct::CertPolicyCompliance default_result) {
6379 default_result_ = default_result; 6379 default_result_ = default_result;
6380 } 6380 }
6381 6381
6382 private: 6382 private:
6383 ct::CertPolicyCompliance default_result_; 6383 ct::CertPolicyCompliance default_result_;
6384 }; 6384 };
(...skipping 2581 matching lines...) Expand 10 before | Expand all | Expand 10 after
8966 8966
8967 protected: 8967 protected:
8968 class AllowAnyCertCTPolicyEnforcer : public CTPolicyEnforcer { 8968 class AllowAnyCertCTPolicyEnforcer : public CTPolicyEnforcer {
8969 public: 8969 public:
8970 AllowAnyCertCTPolicyEnforcer() = default; 8970 AllowAnyCertCTPolicyEnforcer() = default;
8971 ~AllowAnyCertCTPolicyEnforcer() override = default; 8971 ~AllowAnyCertCTPolicyEnforcer() override = default;
8972 8972
8973 ct::CertPolicyCompliance DoesConformToCertPolicy( 8973 ct::CertPolicyCompliance DoesConformToCertPolicy(
8974 X509Certificate* cert, 8974 X509Certificate* cert,
8975 const SCTList& verified_scts, 8975 const SCTList& verified_scts,
8976 const BoundNetLog& net_log) override { 8976 const NetLogWithSource& net_log) override {
8977 return ct::CertPolicyCompliance::CERT_POLICY_COMPLIES_VIA_SCTS; 8977 return ct::CertPolicyCompliance::CERT_POLICY_COMPLIES_VIA_SCTS;
8978 } 8978 }
8979 8979
8980 ct::EVPolicyCompliance DoesConformToCTEVPolicy( 8980 ct::EVPolicyCompliance DoesConformToCTEVPolicy(
8981 X509Certificate* cert, 8981 X509Certificate* cert,
8982 const ct::EVCertsWhitelist* ev_whitelist, 8982 const ct::EVCertsWhitelist* ev_whitelist,
8983 const SCTList& verified_scts, 8983 const SCTList& verified_scts,
8984 const BoundNetLog& net_log) override { 8984 const NetLogWithSource& net_log) override {
8985 return ct::EVPolicyCompliance::EV_POLICY_COMPLIES_VIA_SCTS; 8985 return ct::EVPolicyCompliance::EV_POLICY_COMPLIES_VIA_SCTS;
8986 } 8986 }
8987 }; 8987 };
8988 // SetupContext configures the URLRequestContext that will be used for making 8988 // SetupContext configures the URLRequestContext that will be used for making
8989 // connetions to testserver. This can be overridden in test subclasses for 8989 // connetions to testserver. This can be overridden in test subclasses for
8990 // different behaviour. 8990 // different behaviour.
8991 virtual void SetupContext() { 8991 virtual void SetupContext() {
8992 context_.set_ssl_config_service(new TestSSLConfigService( 8992 context_.set_ssl_config_service(new TestSSLConfigService(
8993 true /* check for EV */, true /* online revocation checking */, 8993 true /* check for EV */, true /* online revocation checking */,
8994 false /* require rev. checking for local 8994 false /* require rev. checking for local
(...skipping 1193 matching lines...) Expand 10 before | Expand all | Expand 10 after
10188 AddTestInterceptor()->set_main_intercept_job(std::move(job)); 10188 AddTestInterceptor()->set_main_intercept_job(std::move(job));
10189 10189
10190 req->Start(); 10190 req->Start();
10191 req->Cancel(); 10191 req->Cancel();
10192 base::RunLoop().RunUntilIdle(); 10192 base::RunLoop().RunUntilIdle();
10193 EXPECT_EQ(ERR_ABORTED, d.request_status()); 10193 EXPECT_EQ(ERR_ABORTED, d.request_status());
10194 EXPECT_EQ(0, d.received_redirect_count()); 10194 EXPECT_EQ(0, d.received_redirect_count());
10195 } 10195 }
10196 10196
10197 } // namespace net 10197 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698