| OLD | NEW |
| 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 "net/http/http_proxy_client_socket_pool.h" | 5 #include "net/http/http_proxy_client_socket_pool.h" |
| 6 | 6 |
| 7 #include "base/callback.h" | 7 #include "base/callback.h" |
| 8 #include "base/compiler_specific.h" | 8 #include "base/compiler_specific.h" |
| 9 #include "base/string_util.h" | 9 #include "base/string_util.h" |
| 10 #include "base/utf_string_conversions.h" | 10 #include "base/utf_string_conversions.h" |
| (...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 167 if (GetParam() != HTTP) { | 167 if (GetParam() != HTTP) { |
| 168 ssl_data_.reset(new SSLSocketDataProvider(SYNCHRONOUS, OK)); | 168 ssl_data_.reset(new SSLSocketDataProvider(SYNCHRONOUS, OK)); |
| 169 if (GetParam() == SPDY) { | 169 if (GetParam() == SPDY) { |
| 170 InitializeSpdySsl(); | 170 InitializeSpdySsl(); |
| 171 } | 171 } |
| 172 socket_factory_.AddSSLSocketDataProvider(ssl_data_.get()); | 172 socket_factory_.AddSSLSocketDataProvider(ssl_data_.get()); |
| 173 } | 173 } |
| 174 } | 174 } |
| 175 | 175 |
| 176 void InitializeSpdySsl() { | 176 void InitializeSpdySsl() { |
| 177 spdy::SpdyFramer::set_enable_compression_default(false); | |
| 178 ssl_data_->SetNextProto(SSLClientSocket::kProtoSPDY2); | 177 ssl_data_->SetNextProto(SSLClientSocket::kProtoSPDY2); |
| 179 } | 178 } |
| 180 | 179 |
| 181 HttpNetworkSession* CreateNetworkSession() { | 180 HttpNetworkSession* CreateNetworkSession() { |
| 182 HttpNetworkSession::Params params; | 181 HttpNetworkSession::Params params; |
| 183 params.host_resolver = &host_resolver_; | 182 params.host_resolver = &host_resolver_; |
| 184 params.cert_verifier = &cert_verifier_; | 183 params.cert_verifier = &cert_verifier_; |
| 185 params.proxy_service = proxy_service_.get(); | 184 params.proxy_service = proxy_service_.get(); |
| 186 params.client_socket_factory = &socket_factory_; | 185 params.client_socket_factory = &socket_factory_; |
| 187 params.ssl_config_service = ssl_config_service_; | 186 params.ssl_config_service = ssl_config_service_; |
| (...skipping 14 matching lines...) Expand all Loading... |
| 202 MockHostResolver host_resolver_; | 201 MockHostResolver host_resolver_; |
| 203 CertVerifier cert_verifier_; | 202 CertVerifier cert_verifier_; |
| 204 const scoped_ptr<ProxyService> proxy_service_; | 203 const scoped_ptr<ProxyService> proxy_service_; |
| 205 const scoped_refptr<SSLConfigService> ssl_config_service_; | 204 const scoped_refptr<SSLConfigService> ssl_config_service_; |
| 206 SSLClientSocketPool ssl_socket_pool_; | 205 SSLClientSocketPool ssl_socket_pool_; |
| 207 | 206 |
| 208 const scoped_ptr<HttpAuthHandlerFactory> http_auth_handler_factory_; | 207 const scoped_ptr<HttpAuthHandlerFactory> http_auth_handler_factory_; |
| 209 HttpServerPropertiesImpl http_server_properties_; | 208 HttpServerPropertiesImpl http_server_properties_; |
| 210 const scoped_refptr<HttpNetworkSession> session_; | 209 const scoped_refptr<HttpNetworkSession> session_; |
| 211 ClientSocketPoolHistograms http_proxy_histograms_; | 210 ClientSocketPoolHistograms http_proxy_histograms_; |
| 211 SpdyTestStateHelper spdy_state_; |
| 212 | 212 |
| 213 protected: | 213 protected: |
| 214 scoped_ptr<SSLSocketDataProvider> ssl_data_; | 214 scoped_ptr<SSLSocketDataProvider> ssl_data_; |
| 215 scoped_refptr<DeterministicSocketData> data_; | 215 scoped_refptr<DeterministicSocketData> data_; |
| 216 HttpProxyClientSocketPool pool_; | 216 HttpProxyClientSocketPool pool_; |
| 217 ClientSocketHandle handle_; | 217 ClientSocketHandle handle_; |
| 218 TestCompletionCallback callback_; | 218 TestCompletionCallback callback_; |
| 219 }; | 219 }; |
| 220 | 220 |
| 221 //----------------------------------------------------------------------------- | 221 //----------------------------------------------------------------------------- |
| (...skipping 310 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 532 // HTTPS or SPDY Proxy CONNECT responses are trustworthy | 532 // HTTPS or SPDY Proxy CONNECT responses are trustworthy |
| 533 EXPECT_EQ(ERR_HTTPS_PROXY_TUNNEL_RESPONSE, rv); | 533 EXPECT_EQ(ERR_HTTPS_PROXY_TUNNEL_RESPONSE, rv); |
| 534 EXPECT_TRUE(handle_.is_initialized()); | 534 EXPECT_TRUE(handle_.is_initialized()); |
| 535 EXPECT_TRUE(handle_.socket()); | 535 EXPECT_TRUE(handle_.socket()); |
| 536 } | 536 } |
| 537 } | 537 } |
| 538 | 538 |
| 539 // It would be nice to also test the timeouts in HttpProxyClientSocketPool. | 539 // It would be nice to also test the timeouts in HttpProxyClientSocketPool. |
| 540 | 540 |
| 541 } // namespace net | 541 } // namespace net |
| OLD | NEW |