diff options
| author | bnc <bnc@chromium.org> | 2016-03-24 15:20:50 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-24 22:23:10 +0000 |
| commit | 4b66be4f38e85141ae28a4e6b9ef67574bebcdc7 (patch) | |
| tree | 05be00664231cf2b7286ecc15dc8b9a589e59e26 /net | |
| parent | b7efce03ce6c4a2c17db1ca6cbd73637544cb0dc (diff) | |
| download | chromium_src-4b66be4f38e85141ae28a4e6b9ef67574bebcdc7.zip chromium_src-4b66be4f38e85141ae28a4e6b9ef67574bebcdc7.tar.gz chromium_src-4b66be4f38e85141ae28a4e6b9ef67574bebcdc7.tar.bz2 | |
Remove unused HttpStreamFactoryImpl::Job::InitSSLConfig argument.
Review URL: https://codereview.chromium.org/1830173002
Cr-Commit-Position: refs/heads/master@{#383162}
Diffstat (limited to 'net')
| -rw-r--r-- | net/http/http_stream_factory_impl_job.cc | 8 | ||||
| -rw-r--r-- | net/http/http_stream_factory_impl_job.h | 8 |
2 files changed, 6 insertions, 10 deletions
diff --git a/net/http/http_stream_factory_impl_job.cc b/net/http/http_stream_factory_impl_job.cc index 0493921d..82a760c 100644 --- a/net/http/http_stream_factory_impl_job.cc +++ b/net/http/http_stream_factory_impl_job.cc @@ -956,14 +956,13 @@ int HttpStreamFactoryImpl::Job::DoInitConnection() { } if (proxy_info_.is_https() || proxy_info_.is_quic()) { - InitSSLConfig(proxy_info_.proxy_server().host_port_pair(), - &proxy_ssl_config_, /*is_proxy=*/true); + InitSSLConfig(&proxy_ssl_config_, /*is_proxy=*/true); // Disable revocation checking for HTTPS proxies since the revocation // requests are probably going to need to go through the proxy too. proxy_ssl_config_.rev_checking_enabled = false; } if (using_ssl_) { - InitSSLConfig(server_, &server_ssl_config_, /*is_proxy=*/false); + InitSSLConfig(&server_ssl_config_, /*is_proxy=*/false); } if (using_quic_) { @@ -1512,8 +1511,7 @@ bool HttpStreamFactoryImpl::Job::IsQuicAlternative() const { return alternative_service_.protocol == QUIC; } -void HttpStreamFactoryImpl::Job::InitSSLConfig(const HostPortPair& server, - SSLConfig* ssl_config, +void HttpStreamFactoryImpl::Job::InitSSLConfig(SSLConfig* ssl_config, bool is_proxy) const { if (!is_proxy) { // Prior to HTTP/2 and SPDY, some servers use TLS renegotiation to request diff --git a/net/http/http_stream_factory_impl_job.h b/net/http/http_stream_factory_impl_job.h index a795189..17519741 100644 --- a/net/http/http_stream_factory_impl_job.h +++ b/net/http/http_stream_factory_impl_job.h @@ -262,11 +262,9 @@ class HttpStreamFactoryImpl::Job { bool IsSpdyAlternative() const; bool IsQuicAlternative() const; - // Sets several fields of |ssl_config| for |server| based on the proxy info - // and other factors. - void InitSSLConfig(const HostPortPair& server, - SSLConfig* ssl_config, - bool is_proxy) const; + // Sets several fields of |ssl_config| based on the proxy info and other + // factors. + void InitSSLConfig(SSLConfig* ssl_config, bool is_proxy) const; // Retrieve SSLInfo from our SSL Socket. // This must only be called when we are using an SSLSocket. |