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 386 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
397 HostResolver* host_resolver, | 397 HostResolver* host_resolver, |
398 CertVerifier* cert_verifier) | 398 CertVerifier* cert_verifier) |
399 : SSLClientSocketPool(0, | 399 : SSLClientSocketPool(0, |
400 0, | 400 0, |
401 NULL, // ssl_histograms | 401 NULL, // ssl_histograms |
402 host_resolver, | 402 host_resolver, |
403 cert_verifier, | 403 cert_verifier, |
404 NULL, // channel_id_store | 404 NULL, // channel_id_store |
405 NULL, // transport_security_state | 405 NULL, // transport_security_state |
406 NULL, // cert_transparency_verifier | 406 NULL, // cert_transparency_verifier |
| 407 NULL, // cert_policy_enforcer |
407 std::string(), // ssl_session_cache_shard | 408 std::string(), // ssl_session_cache_shard |
408 NULL, // deterministic_socket_factory | 409 NULL, // deterministic_socket_factory |
409 NULL, // transport_socket_pool | 410 NULL, // transport_socket_pool |
410 NULL, | 411 NULL, |
411 NULL, | 412 NULL, |
412 NULL, // ssl_config_service | 413 NULL, // ssl_config_service |
413 false, // enable_ssl_connect_job_waiting | 414 false, // enable_ssl_connect_job_waiting |
414 NULL), // net_log | 415 NULL), // net_log |
415 last_num_streams_(-1) { | 416 last_num_streams_(-1) { |
416 } | 417 } |
(...skipping 880 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1297 EXPECT_TRUE(waiter.used_proxy_info().is_direct()); | 1298 EXPECT_TRUE(waiter.used_proxy_info().is_direct()); |
1298 | 1299 |
1299 // Make sure there is no orphaned job. it is already canceled. | 1300 // Make sure there is no orphaned job. it is already canceled. |
1300 ASSERT_EQ(0u, static_cast<HttpStreamFactoryImpl*>( | 1301 ASSERT_EQ(0u, static_cast<HttpStreamFactoryImpl*>( |
1301 session->http_stream_factory_for_websocket())->num_orphaned_jobs()); | 1302 session->http_stream_factory_for_websocket())->num_orphaned_jobs()); |
1302 } | 1303 } |
1303 | 1304 |
1304 } // namespace | 1305 } // namespace |
1305 | 1306 |
1306 } // namespace net | 1307 } // namespace net |
OLD | NEW |