Chromium Code Reviews| 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 406 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 417 HostResolver* host_resolver, CertVerifier* /* cert_verifier */) | 417 HostResolver* host_resolver, CertVerifier* /* cert_verifier */) |
| 418 : HttpProxyClientSocketPool(0, 0, NULL, host_resolver, NULL, NULL, NULL), | 418 : HttpProxyClientSocketPool(0, 0, NULL, host_resolver, NULL, NULL, NULL), |
| 419 last_num_streams_(-1) {} | 419 last_num_streams_(-1) {} |
| 420 | 420 |
| 421 template <> | 421 template <> |
| 422 CapturePreconnectsSSLSocketPool::CapturePreconnectsSocketPool( | 422 CapturePreconnectsSSLSocketPool::CapturePreconnectsSocketPool( |
| 423 HostResolver* host_resolver, | 423 HostResolver* host_resolver, |
| 424 CertVerifier* cert_verifier) | 424 CertVerifier* cert_verifier) |
| 425 : SSLClientSocketPool(0, | 425 : SSLClientSocketPool(0, |
| 426 0, | 426 0, |
| 427 NULL, | 427 NULL /* ssl_histograms */, |
| 428 host_resolver, | 428 host_resolver, |
| 429 cert_verifier, | 429 cert_verifier, |
| 430 NULL /* server_bound_cert_store */, | |
| 431 NULL /* transport_security_state */, | |
| 432 NULL /* ssl_host_info_factory */, | |
| 433 NULL /* cert_transparency_verifier */, | |
|
wtc
2014/01/15 19:08:59
Reverse these two arguments to match the argument
ramant (doing other things)
2014/01/18 00:21:56
Done.
| |
| 434 std::string() /* ssl_session_cache_shard */, | |
| 435 NULL /* deterministic_socket_factory */, | |
| 436 NULL /* transport_socket_pool */, | |
| 430 NULL, | 437 NULL, |
| 431 NULL, | 438 NULL, |
| 432 NULL, | 439 NULL /* ssl_config_service */, |
| 433 std::string(), | 440 NULL /* net_log */), |
| 434 NULL, | |
| 435 NULL, | |
| 436 NULL, | |
| 437 NULL, | |
| 438 NULL, | |
| 439 NULL), | |
| 440 last_num_streams_(-1) {} | 441 last_num_streams_(-1) {} |
| 441 | 442 |
| 442 class HttpStreamFactoryTest : public ::testing::Test, | 443 class HttpStreamFactoryTest : public ::testing::Test, |
| 443 public ::testing::WithParamInterface<NextProto> { | 444 public ::testing::WithParamInterface<NextProto> { |
| 444 }; | 445 }; |
| 445 | 446 |
| 446 INSTANTIATE_TEST_CASE_P( | 447 INSTANTIATE_TEST_CASE_P( |
| 447 NextProto, | 448 NextProto, |
| 448 HttpStreamFactoryTest, | 449 HttpStreamFactoryTest, |
| 449 testing::Values(kProtoDeprecatedSPDY2, | 450 testing::Values(kProtoDeprecatedSPDY2, |
| (...skipping 827 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1277 EXPECT_TRUE(waiter.used_proxy_info().is_direct()); | 1278 EXPECT_TRUE(waiter.used_proxy_info().is_direct()); |
| 1278 | 1279 |
| 1279 // Make sure there is no orphaned job. it is already canceled. | 1280 // Make sure there is no orphaned job. it is already canceled. |
| 1280 ASSERT_EQ(0u, static_cast<HttpStreamFactoryImpl*>( | 1281 ASSERT_EQ(0u, static_cast<HttpStreamFactoryImpl*>( |
| 1281 session->http_stream_factory_for_websocket())->num_orphaned_jobs()); | 1282 session->http_stream_factory_for_websocket())->num_orphaned_jobs()); |
| 1282 } | 1283 } |
| 1283 | 1284 |
| 1284 } // namespace | 1285 } // namespace |
| 1285 | 1286 |
| 1286 } // namespace net | 1287 } // namespace net |
| OLD | NEW |