| 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 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
| (...skipping 363 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 374 | 374 |
| 375 typedef CapturePreconnectsSocketPool<TransportClientSocketPool> | 375 typedef CapturePreconnectsSocketPool<TransportClientSocketPool> |
| 376 CapturePreconnectsTransportSocketPool; | 376 CapturePreconnectsTransportSocketPool; |
| 377 typedef CapturePreconnectsSocketPool<HttpProxyClientSocketPool> | 377 typedef CapturePreconnectsSocketPool<HttpProxyClientSocketPool> |
| 378 CapturePreconnectsHttpProxySocketPool; | 378 CapturePreconnectsHttpProxySocketPool; |
| 379 typedef CapturePreconnectsSocketPool<SOCKSClientSocketPool> | 379 typedef CapturePreconnectsSocketPool<SOCKSClientSocketPool> |
| 380 CapturePreconnectsSOCKSSocketPool; | 380 CapturePreconnectsSOCKSSocketPool; |
| 381 typedef CapturePreconnectsSocketPool<SSLClientSocketPool> | 381 typedef CapturePreconnectsSocketPool<SSLClientSocketPool> |
| 382 CapturePreconnectsSSLSocketPool; | 382 CapturePreconnectsSSLSocketPool; |
| 383 | 383 |
| 384 template<typename ParentPool> | 384 template <typename ParentPool> |
| 385 CapturePreconnectsSocketPool<ParentPool>::CapturePreconnectsSocketPool( | 385 CapturePreconnectsSocketPool<ParentPool>::CapturePreconnectsSocketPool( |
| 386 HostResolver* host_resolver, CertVerifier* /* cert_verifier */) | 386 HostResolver* host_resolver, |
| 387 : ParentPool(0, 0, nullptr, host_resolver, nullptr, nullptr), | 387 CertVerifier* /* cert_verifier */) |
| 388 last_num_streams_(-1) {} | 388 : ParentPool(0, 0, host_resolver, nullptr, nullptr), last_num_streams_(-1) { |
| 389 } |
| 389 | 390 |
| 390 template <> | 391 template <> |
| 391 CapturePreconnectsHttpProxySocketPool::CapturePreconnectsSocketPool( | 392 CapturePreconnectsHttpProxySocketPool::CapturePreconnectsSocketPool( |
| 392 HostResolver* /* host_resolver */, | 393 HostResolver* /* host_resolver */, |
| 393 CertVerifier* /* cert_verifier */) | 394 CertVerifier* /* cert_verifier */) |
| 394 : HttpProxyClientSocketPool(0, 0, nullptr, nullptr, nullptr, nullptr), | 395 : HttpProxyClientSocketPool(0, 0, nullptr, nullptr, nullptr), |
| 395 last_num_streams_(-1) { | 396 last_num_streams_(-1) { |
| 396 } | 397 } |
| 397 | 398 |
| 398 template <> | 399 template <> |
| 399 CapturePreconnectsSSLSocketPool::CapturePreconnectsSocketPool( | 400 CapturePreconnectsSSLSocketPool::CapturePreconnectsSocketPool( |
| 400 HostResolver* /* host_resolver */, | 401 HostResolver* /* host_resolver */, |
| 401 CertVerifier* cert_verifier) | 402 CertVerifier* cert_verifier) |
| 402 : SSLClientSocketPool(0, | 403 : SSLClientSocketPool(0, |
| 403 0, | 404 0, |
| 404 nullptr, // ssl_histograms | |
| 405 cert_verifier, | 405 cert_verifier, |
| 406 nullptr, // channel_id_store | 406 nullptr, // channel_id_store |
| 407 nullptr, // transport_security_state | 407 nullptr, // transport_security_state |
| 408 nullptr, // cert_transparency_verifier | 408 nullptr, // cert_transparency_verifier |
| 409 nullptr, // cert_policy_enforcer | 409 nullptr, // cert_policy_enforcer |
| 410 std::string(), // ssl_session_cache_shard | 410 std::string(), // ssl_session_cache_shard |
| 411 nullptr, // deterministic_socket_factory | 411 nullptr, // deterministic_socket_factory |
| 412 nullptr, // transport_socket_pool | 412 nullptr, // transport_socket_pool |
| 413 nullptr, | 413 nullptr, |
| 414 nullptr, | 414 nullptr, |
| (...skipping 945 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1360 EXPECT_TRUE(waiter.used_proxy_info().is_direct()); | 1360 EXPECT_TRUE(waiter.used_proxy_info().is_direct()); |
| 1361 | 1361 |
| 1362 // Make sure there is no orphaned job. it is already canceled. | 1362 // Make sure there is no orphaned job. it is already canceled. |
| 1363 ASSERT_EQ(0u, static_cast<HttpStreamFactoryImpl*>( | 1363 ASSERT_EQ(0u, static_cast<HttpStreamFactoryImpl*>( |
| 1364 session->http_stream_factory_for_websocket())->num_orphaned_jobs()); | 1364 session->http_stream_factory_for_websocket())->num_orphaned_jobs()); |
| 1365 } | 1365 } |
| 1366 | 1366 |
| 1367 } // namespace | 1367 } // namespace |
| 1368 | 1368 |
| 1369 } // namespace net | 1369 } // namespace net |
| OLD | NEW |