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

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: Moved tests back to ssl_client_socket_unittest.cc, fixed various other issues. Created 6 years, 4 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 385 matching lines...) Expand 10 before | Expand all | Expand 10 after
396 HostResolver* host_resolver, CertVerifier* /* cert_verifier */) 396 HostResolver* host_resolver, CertVerifier* /* cert_verifier */)
397 : HttpProxyClientSocketPool(0, 0, NULL, host_resolver, NULL, NULL, NULL), 397 : HttpProxyClientSocketPool(0, 0, NULL, host_resolver, NULL, NULL, NULL),
398 last_num_streams_(-1) {} 398 last_num_streams_(-1) {}
399 399
400 template <> 400 template <>
401 CapturePreconnectsSSLSocketPool::CapturePreconnectsSocketPool( 401 CapturePreconnectsSSLSocketPool::CapturePreconnectsSocketPool(
402 HostResolver* host_resolver, 402 HostResolver* host_resolver,
403 CertVerifier* cert_verifier) 403 CertVerifier* cert_verifier)
404 : SSLClientSocketPool(0, 404 : SSLClientSocketPool(0,
405 0, 405 0,
406 NULL, // ssl_histograms 406 NULL, // ssl_histograms
407 host_resolver, 407 host_resolver,
408 cert_verifier, 408 cert_verifier,
409 NULL, // channel_id_store 409 NULL, // channel_id_store
410 NULL, // transport_security_state 410 NULL, // transport_security_state
411 NULL, // cert_transparency_verifier 411 NULL, // cert_transparency_verifier
412 std::string(), // ssl_session_cache_shard 412 std::string(), // ssl_session_cache_shard
413 NULL, // deterministic_socket_factory 413 NULL, // deterministic_socket_factory
414 NULL, // transport_socket_pool 414 NULL, // transport_socket_pool
415 NULL, 415 NULL,
416 NULL, 416 NULL,
417 NULL, // ssl_config_service 417 NULL, // ssl_config_service
418 NULL), // net_log 418 false, // enable_ssl_connect_job_waiting
419 last_num_streams_(-1) {} 419 NULL), // net_log
420 last_num_streams_(-1) {
421 }
420 422
421 class HttpStreamFactoryTest : public ::testing::Test, 423 class HttpStreamFactoryTest : public ::testing::Test,
422 public ::testing::WithParamInterface<NextProto> { 424 public ::testing::WithParamInterface<NextProto> {
423 }; 425 };
424 426
425 INSTANTIATE_TEST_CASE_P( 427 INSTANTIATE_TEST_CASE_P(
426 NextProto, 428 NextProto,
427 HttpStreamFactoryTest, 429 HttpStreamFactoryTest,
428 testing::Values(kProtoDeprecatedSPDY2, 430 testing::Values(kProtoDeprecatedSPDY2,
429 kProtoSPDY3, kProtoSPDY31, kProtoSPDY4)); 431 kProtoSPDY3, kProtoSPDY31, kProtoSPDY4));
(...skipping 875 matching lines...) Expand 10 before | Expand all | Expand 10 after
1305 EXPECT_TRUE(waiter.used_proxy_info().is_direct()); 1307 EXPECT_TRUE(waiter.used_proxy_info().is_direct());
1306 1308
1307 // Make sure there is no orphaned job. it is already canceled. 1309 // Make sure there is no orphaned job. it is already canceled.
1308 ASSERT_EQ(0u, static_cast<HttpStreamFactoryImpl*>( 1310 ASSERT_EQ(0u, static_cast<HttpStreamFactoryImpl*>(
1309 session->http_stream_factory_for_websocket())->num_orphaned_jobs()); 1311 session->http_stream_factory_for_websocket())->num_orphaned_jobs());
1310 } 1312 }
1311 1313
1312 } // namespace 1314 } // namespace
1313 1315
1314 } // namespace net 1316 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698