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_stream_factory_impl.h" | 5 #include "net/http/http_stream_factory_impl.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
10 #include "net/base/net_log.h" | 10 #include "net/base/net_log.h" |
(...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
264 HostResolver* host_resolver, CertVerifier* /* cert_verifier */) | 264 HostResolver* host_resolver, CertVerifier* /* cert_verifier */) |
265 : ParentPool(0, 0, NULL, host_resolver, NULL, NULL), | 265 : ParentPool(0, 0, NULL, host_resolver, NULL, NULL), |
266 last_num_streams_(-1) {} | 266 last_num_streams_(-1) {} |
267 | 267 |
268 template<> | 268 template<> |
269 CapturePreconnectsHttpProxySocketPool::CapturePreconnectsSocketPool( | 269 CapturePreconnectsHttpProxySocketPool::CapturePreconnectsSocketPool( |
270 HostResolver* host_resolver, CertVerifier* /* cert_verifier */) | 270 HostResolver* host_resolver, CertVerifier* /* cert_verifier */) |
271 : HttpProxyClientSocketPool(0, 0, NULL, host_resolver, NULL, NULL, NULL), | 271 : HttpProxyClientSocketPool(0, 0, NULL, host_resolver, NULL, NULL, NULL), |
272 last_num_streams_(-1) {} | 272 last_num_streams_(-1) {} |
273 | 273 |
274 template<> | 274 template <> |
275 CapturePreconnectsSSLSocketPool::CapturePreconnectsSocketPool( | 275 CapturePreconnectsSSLSocketPool::CapturePreconnectsSocketPool( |
276 HostResolver* host_resolver, CertVerifier* cert_verifier) | 276 HostResolver* host_resolver, |
277 : SSLClientSocketPool(0, 0, NULL, host_resolver, cert_verifier, NULL, | 277 CertVerifier* cert_verifier) |
278 NULL, "", NULL, NULL, NULL, NULL, NULL, NULL), | 278 : SSLClientSocketPool(0, |
| 279 0, |
| 280 NULL, |
| 281 host_resolver, |
| 282 cert_verifier, |
| 283 NULL, |
| 284 NULL, |
| 285 std::string(), |
| 286 NULL, |
| 287 NULL, |
| 288 NULL, |
| 289 NULL, |
| 290 NULL, |
| 291 NULL), |
279 last_num_streams_(-1) {} | 292 last_num_streams_(-1) {} |
280 | 293 |
281 TEST(HttpStreamFactoryTest, PreconnectDirect) { | 294 TEST(HttpStreamFactoryTest, PreconnectDirect) { |
282 for (size_t i = 0; i < arraysize(kTests); ++i) { | 295 for (size_t i = 0; i < arraysize(kTests); ++i) { |
283 SessionDependencies session_deps(ProxyService::CreateDirect()); | 296 SessionDependencies session_deps(ProxyService::CreateDirect()); |
284 scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps)); | 297 scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps)); |
285 HttpNetworkSessionPeer peer(session); | 298 HttpNetworkSessionPeer peer(session); |
286 CapturePreconnectsTransportSocketPool* transport_conn_pool = | 299 CapturePreconnectsTransportSocketPool* transport_conn_pool = |
287 new CapturePreconnectsTransportSocketPool( | 300 new CapturePreconnectsTransportSocketPool( |
288 session_deps.host_resolver.get(), | 301 session_deps.host_resolver.get(), |
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
453 const ProxyRetryInfoMap& retry_info = | 466 const ProxyRetryInfoMap& retry_info = |
454 session->proxy_service()->proxy_retry_info(); | 467 session->proxy_service()->proxy_retry_info(); |
455 EXPECT_EQ(1u, retry_info.size()); | 468 EXPECT_EQ(1u, retry_info.size()); |
456 ProxyRetryInfoMap::const_iterator iter = retry_info.find("bad:99"); | 469 ProxyRetryInfoMap::const_iterator iter = retry_info.find("bad:99"); |
457 EXPECT_TRUE(iter != retry_info.end()); | 470 EXPECT_TRUE(iter != retry_info.end()); |
458 } | 471 } |
459 | 472 |
460 } // namespace | 473 } // namespace |
461 | 474 |
462 } // namespace net | 475 } // namespace net |
OLD | NEW |