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/run_loop.h" | 9 #include "base/run_loop.h" |
10 #include "base/strings/string_util.h" | 10 #include "base/strings/string_util.h" |
(...skipping 1239 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1250 EXPECT_FALSE(handle.socket()); | 1250 EXPECT_FALSE(handle.socket()); |
1251 EXPECT_FALSE(handle.is_ssl_error()); | 1251 EXPECT_FALSE(handle.is_ssl_error()); |
1252 const HttpResponseInfo& tunnel_info = handle.ssl_error_response_info(); | 1252 const HttpResponseInfo& tunnel_info = handle.ssl_error_response_info(); |
1253 EXPECT_EQ(tunnel_info.headers->response_code(), 407); | 1253 EXPECT_EQ(tunnel_info.headers->response_code(), 407); |
1254 scoped_ptr<ClientSocketHandle> tunnel_handle( | 1254 scoped_ptr<ClientSocketHandle> tunnel_handle( |
1255 handle.release_pending_http_proxy_connection()); | 1255 handle.release_pending_http_proxy_connection()); |
1256 EXPECT_TRUE(tunnel_handle->socket()); | 1256 EXPECT_TRUE(tunnel_handle->socket()); |
1257 EXPECT_FALSE(tunnel_handle->socket()->IsConnected()); | 1257 EXPECT_FALSE(tunnel_handle->socket()->IsConnected()); |
1258 } | 1258 } |
1259 | 1259 |
1260 // TODO(rch): re-enable this. | 1260 TEST_P(SSLClientSocketPoolTest, IPPooling) { |
1261 TEST_P(SSLClientSocketPoolTest, DISABLED_IPPooling) { | |
1262 const int kTestPort = 80; | 1261 const int kTestPort = 80; |
1263 struct TestHosts { | 1262 struct TestHosts { |
1264 std::string name; | 1263 std::string name; |
1265 std::string iplist; | 1264 std::string iplist; |
1266 SpdySessionKey key; | 1265 SpdySessionKey key; |
1267 AddressList addresses; | 1266 AddressList addresses; |
1268 } test_hosts[] = { | 1267 } test_hosts[] = { |
1269 { "www.webkit.org", "192.0.2.33,192.168.0.1,192.168.0.5" }, | 1268 { "www.webkit.org", "192.0.2.33,192.168.0.1,192.168.0.5" }, |
1270 { "code.google.com", "192.168.0.2,192.168.0.3,192.168.0.5" }, | 1269 { "code.google.com", "192.168.0.2,192.168.0.3,192.168.0.5" }, |
1271 { "js.webkit.org", "192.168.0.4,192.168.0.1,192.0.2.33" }, | 1270 { "js.webkit.org", "192.168.0.4,192.168.0.1,192.0.2.33" }, |
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1389 ssl.channel_id_sent = true; | 1388 ssl.channel_id_sent = true; |
1390 ssl.SetNextProto(GetParam()); | 1389 ssl.SetNextProto(GetParam()); |
1391 TestIPPoolingDisabled(&ssl); | 1390 TestIPPoolingDisabled(&ssl); |
1392 } | 1391 } |
1393 | 1392 |
1394 // It would be nice to also test the timeouts in SSLClientSocketPool. | 1393 // It would be nice to also test the timeouts in SSLClientSocketPool. |
1395 | 1394 |
1396 } // namespace | 1395 } // namespace |
1397 | 1396 |
1398 } // namespace net | 1397 } // namespace net |
OLD | NEW |