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 157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
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); | 177 spdy::SpdyFramer::set_enable_compression_default(false); |
178 ssl_data_->SetNextProto(SSLClientSocket::kProtoSPDY21); | 178 ssl_data_->SetNextProto(SSLClientSocket::kProtoSPDY3); |
179 } | 179 } |
180 | 180 |
181 HttpNetworkSession* CreateNetworkSession() { | 181 HttpNetworkSession* CreateNetworkSession() { |
182 HttpNetworkSession::Params params; | 182 HttpNetworkSession::Params params; |
183 params.host_resolver = &host_resolver_; | 183 params.host_resolver = &host_resolver_; |
184 params.cert_verifier = &cert_verifier_; | 184 params.cert_verifier = &cert_verifier_; |
185 params.proxy_service = proxy_service_.get(); | 185 params.proxy_service = proxy_service_.get(); |
186 params.client_socket_factory = &socket_factory_; | 186 params.client_socket_factory = &socket_factory_; |
187 params.ssl_config_service = ssl_config_service_; | 187 params.ssl_config_service = ssl_config_service_; |
188 params.http_auth_handler_factory = http_auth_handler_factory_.get(); | 188 params.http_auth_handler_factory = http_auth_handler_factory_.get(); |
(...skipping 343 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 |