diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-15 21:56:20 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-15 21:56:20 +0000 |
| commit | ea79ba9670fc957f0acfe6e4e55bc27d0ed52606 (patch) | |
| tree | 7438b48783babf211f85bcd534fe28f3bbba16e2 /net/spdy | |
| parent | b35a866cd4ddf6ea33e7ca66789ad5bd3a51718c (diff) | |
| download | chromium_src-ea79ba9670fc957f0acfe6e4e55bc27d0ed52606.zip chromium_src-ea79ba9670fc957f0acfe6e4e55bc27d0ed52606.tar.gz chromium_src-ea79ba9670fc957f0acfe6e4e55bc27d0ed52606.tar.bz2 | |
Clean up SSLSocketParams
Remove ProxyServer::Scheme parameter from SSLSocketParams. Replace it with
a ConnectionType enum.
Rework some of the parameter/function names.
BUG=166689
R=mmenke@chromium.org
Review URL: https://codereview.chromium.org/23232002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@217842 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/spdy')
| -rw-r--r-- | net/spdy/spdy_test_util_common.cc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/net/spdy/spdy_test_util_common.cc b/net/spdy/spdy_test_util_common.cc index 443779b..af3b337 100644 --- a/net/spdy/spdy_test_util_common.cc +++ b/net/spdy/spdy_test_util_common.cc @@ -509,13 +509,10 @@ base::WeakPtr<SpdySession> CreateSpdySessionHelper( int rv = ERR_UNEXPECTED; if (is_secure) { SSLConfig ssl_config; - scoped_refptr<SOCKSSocketParams> socks_params; - scoped_refptr<HttpProxySocketParams> http_proxy_params; scoped_refptr<SSLSocketParams> ssl_params( new SSLSocketParams(transport_params, - socks_params, - http_proxy_params, - ProxyServer::SCHEME_DIRECT, + NULL, + NULL, key.host_port_pair(), ssl_config, key.privacy_mode(), |