| 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 371 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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, CertVerifier* /* cert_verifier */) |
| 387 : ParentPool(0, 0, nullptr, host_resolver, nullptr, nullptr), | 387 : ParentPool(0, 0, nullptr, host_resolver, nullptr, nullptr), |
| 388 last_num_streams_(-1) {} | 388 last_num_streams_(-1) {} |
| 389 | 389 |
| 390 template <> | 390 template <> |
| 391 CapturePreconnectsHttpProxySocketPool::CapturePreconnectsSocketPool( | 391 CapturePreconnectsHttpProxySocketPool::CapturePreconnectsSocketPool( |
| 392 HostResolver* host_resolver, | 392 HostResolver* /* host_resolver */, |
| 393 CertVerifier* /* cert_verifier */) | 393 CertVerifier* /* cert_verifier */) |
| 394 : HttpProxyClientSocketPool(0, | 394 : HttpProxyClientSocketPool(0, 0, nullptr, nullptr, nullptr, nullptr), |
| 395 0, | |
| 396 nullptr, | |
| 397 host_resolver, | |
| 398 nullptr, | |
| 399 nullptr, | |
| 400 nullptr), | |
| 401 last_num_streams_(-1) { | 395 last_num_streams_(-1) { |
| 402 } | 396 } |
| 403 | 397 |
| 404 template <> | 398 template <> |
| 405 CapturePreconnectsSSLSocketPool::CapturePreconnectsSocketPool( | 399 CapturePreconnectsSSLSocketPool::CapturePreconnectsSocketPool( |
| 406 HostResolver* host_resolver, | 400 HostResolver* /* host_resolver */, |
| 407 CertVerifier* cert_verifier) | 401 CertVerifier* cert_verifier) |
| 408 : SSLClientSocketPool(0, | 402 : SSLClientSocketPool(0, |
| 409 0, | 403 0, |
| 410 nullptr, // ssl_histograms | 404 nullptr, // ssl_histograms |
| 411 host_resolver, | |
| 412 cert_verifier, | 405 cert_verifier, |
| 413 nullptr, // channel_id_store | 406 nullptr, // channel_id_store |
| 414 nullptr, // transport_security_state | 407 nullptr, // transport_security_state |
| 415 nullptr, // cert_transparency_verifier | 408 nullptr, // cert_transparency_verifier |
| 416 nullptr, // cert_policy_enforcer | 409 nullptr, // cert_policy_enforcer |
| 417 std::string(), // ssl_session_cache_shard | 410 std::string(), // ssl_session_cache_shard |
| 418 nullptr, // deterministic_socket_factory | 411 nullptr, // deterministic_socket_factory |
| 419 nullptr, // transport_socket_pool | 412 nullptr, // transport_socket_pool |
| 420 nullptr, | 413 nullptr, |
| 421 nullptr, | 414 nullptr, |
| (...skipping 884 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1306 EXPECT_TRUE(waiter.used_proxy_info().is_direct()); | 1299 EXPECT_TRUE(waiter.used_proxy_info().is_direct()); |
| 1307 | 1300 |
| 1308 // Make sure there is no orphaned job. it is already canceled. | 1301 // Make sure there is no orphaned job. it is already canceled. |
| 1309 ASSERT_EQ(0u, static_cast<HttpStreamFactoryImpl*>( | 1302 ASSERT_EQ(0u, static_cast<HttpStreamFactoryImpl*>( |
| 1310 session->http_stream_factory_for_websocket())->num_orphaned_jobs()); | 1303 session->http_stream_factory_for_websocket())->num_orphaned_jobs()); |
| 1311 } | 1304 } |
| 1312 | 1305 |
| 1313 } // namespace | 1306 } // namespace |
| 1314 | 1307 |
| 1315 } // namespace net | 1308 } // namespace net |
| OLD | NEW |