diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-24 02:32:48 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-24 02:32:48 +0000 |
| commit | c091d360da97bdeb6f7d025245991b34ac28c273 (patch) | |
| tree | 3680b61fee828f66a3f599f5b361afdc83b8878a /net/url_request | |
| parent | 0226ef2a6be5eec0e7fbfa70deb74ab3c624fdeb (diff) | |
| download | chromium_src-c091d360da97bdeb6f7d025245991b34ac28c273.zip chromium_src-c091d360da97bdeb6f7d025245991b34ac28c273.tar.gz chromium_src-c091d360da97bdeb6f7d025245991b34ac28c273.tar.bz2 | |
Move SSLConfig class from ssl_config_service.h to ssl_config.h
SSLConfigService depends on CRLSet that is not useful in net_nacl.
Separate SSLConfig from SSLConfigService, so that they can be compiled
independently.
Also replaced default_version_(min|max) in SSLConfigService with
constants kDefaultSSLVersion(Min|Max).
BUG=276739
TBR=wtc@chromium.org
Review URL: https://codereview.chromium.org/208713004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@258843 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/url_request')
| -rw-r--r-- | net/url_request/url_request_unittest.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc index b85da78..f56439c 100644 --- a/net/url_request/url_request_unittest.cc +++ b/net/url_request/url_request_unittest.cc @@ -6204,12 +6204,11 @@ TEST_F(HTTPSRequestTest, HTTPSExpiredTest) { // Tests TLSv1.1 -> TLSv1 fallback. Verifies that we don't fall back more // than necessary. TEST_F(HTTPSRequestTest, TLSv1Fallback) { - uint16 default_version_max = SSLConfigService::default_version_max(); // The OpenSSL library in use may not support TLS 1.1. #if !defined(USE_OPENSSL) - EXPECT_GT(default_version_max, SSL_PROTOCOL_VERSION_TLS1); + EXPECT_GT(kDefaultSSLVersionMax, SSL_PROTOCOL_VERSION_TLS1); #endif - if (default_version_max <= SSL_PROTOCOL_VERSION_TLS1) + if (kDefaultSSLVersionMax <= SSL_PROTOCOL_VERSION_TLS1) return; SpawnedTestServer::SSLOptions ssl_options( |