Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1074)

Side by Side Diff: net/http/http_stream_factory_impl_unittest.cc

Issue 353713005: Implements new, more robust design for communicating between SSLConnectJobs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed comment I missed in the last patch. Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 389 matching lines...) Expand 10 before | Expand all | Expand 10 after
400 HostResolver* host_resolver, CertVerifier* /* cert_verifier */) 400 HostResolver* host_resolver, CertVerifier* /* cert_verifier */)
401 : HttpProxyClientSocketPool(0, 0, NULL, host_resolver, NULL, NULL, NULL), 401 : HttpProxyClientSocketPool(0, 0, NULL, host_resolver, NULL, NULL, NULL),
402 last_num_streams_(-1) {} 402 last_num_streams_(-1) {}
403 403
404 template <> 404 template <>
405 CapturePreconnectsSSLSocketPool::CapturePreconnectsSocketPool( 405 CapturePreconnectsSSLSocketPool::CapturePreconnectsSocketPool(
406 HostResolver* host_resolver, 406 HostResolver* host_resolver,
407 CertVerifier* cert_verifier) 407 CertVerifier* cert_verifier)
408 : SSLClientSocketPool(0, 408 : SSLClientSocketPool(0,
409 0, 409 0,
410 NULL, // ssl_histograms 410 NULL, // ssl_histograms
411 host_resolver, 411 host_resolver,
412 cert_verifier, 412 cert_verifier,
413 NULL, // server_bound_cert_store 413 NULL, // server_bound_cert_store
414 NULL, // transport_security_state 414 NULL, // transport_security_state
415 NULL, // cert_transparency_verifier 415 NULL, // cert_transparency_verifier
416 std::string(), // ssl_session_cache_shard 416 std::string(), // ssl_session_cache_shard
417 NULL, // deterministic_socket_factory 417 NULL, // deterministic_socket_factory
418 NULL, // transport_socket_pool 418 NULL, // transport_socket_pool
419 NULL, 419 NULL,
420 NULL, 420 NULL,
421 NULL, // ssl_config_service 421 NULL, // ssl_config_service
422 NULL), // net_log 422 false, // enable_ssl_connect_job_waiting
423 last_num_streams_(-1) {} 423 NULL), // net_log
wtc 2014/07/23 22:53:32 Please align all the comments. I wonder why "git c
mshelley 2014/07/24 20:37:46 Done.
424 last_num_streams_(-1) {
425 }
424 426
425 class HttpStreamFactoryTest : public ::testing::Test, 427 class HttpStreamFactoryTest : public ::testing::Test,
426 public ::testing::WithParamInterface<NextProto> { 428 public ::testing::WithParamInterface<NextProto> {
427 }; 429 };
428 430
429 INSTANTIATE_TEST_CASE_P( 431 INSTANTIATE_TEST_CASE_P(
430 NextProto, 432 NextProto,
431 HttpStreamFactoryTest, 433 HttpStreamFactoryTest,
432 testing::Values(kProtoDeprecatedSPDY2, 434 testing::Values(kProtoDeprecatedSPDY2,
433 kProtoSPDY3, kProtoSPDY31, kProtoSPDY4)); 435 kProtoSPDY3, kProtoSPDY31, kProtoSPDY4));
(...skipping 883 matching lines...) Expand 10 before | Expand all | Expand 10 after
1317 EXPECT_TRUE(waiter.used_proxy_info().is_direct()); 1319 EXPECT_TRUE(waiter.used_proxy_info().is_direct());
1318 1320
1319 // Make sure there is no orphaned job. it is already canceled. 1321 // Make sure there is no orphaned job. it is already canceled.
1320 ASSERT_EQ(0u, static_cast<HttpStreamFactoryImpl*>( 1322 ASSERT_EQ(0u, static_cast<HttpStreamFactoryImpl*>(
1321 session->http_stream_factory_for_websocket())->num_orphaned_jobs()); 1323 session->http_stream_factory_for_websocket())->num_orphaned_jobs());
1322 } 1324 }
1323 1325
1324 } // namespace 1326 } // namespace
1325 1327
1326 } // namespace net 1328 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698