net/http/http_network_session.cc - Issue 353713005: Implements new, more robust design for communicating between SSLConnectJobs.

Side by Side Diff: net/http/http_network_session.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 nits from previous patchset. 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

« chrome/browser/extensions/api/socket/tls_socket_unittest.cc ('K') | « net/http/http_network_session.h ('k') | net/http/http_network_transaction_unittest.cc » ('j') | net/socket/ssl_client_socket_unittest.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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_network_session.h"	5 #include "net/http/http_network_session.h"

6	6

7 #include <utility>	7 #include <utility>

8	8

9 #include "base/compiler_specific.h"	9 #include "base/compiler_specific.h"

10 #include "base/debug/stack_trace.h"	10 #include "base/debug/stack_trace.h"

(...skipping 18 matching lines...) Expand all Loading...
29	29

30 namespace {	30 namespace {

31	31

32 net::ClientSocketPoolManager* CreateSocketPoolManager(	32 net::ClientSocketPoolManager* CreateSocketPoolManager(

33 net::HttpNetworkSession::SocketPoolType pool_type,	33 net::HttpNetworkSession::SocketPoolType pool_type,

34 const net::HttpNetworkSession::Params& params) {	34 const net::HttpNetworkSession::Params& params) {

35 // TODO(yutak): Differentiate WebSocket pool manager and allow more	35 // TODO(yutak): Differentiate WebSocket pool manager and allow more

36 // simultaneous connections for WebSockets.	36 // simultaneous connections for WebSockets.

37 return new net::ClientSocketPoolManagerImpl(	37 return new net::ClientSocketPoolManagerImpl(

38 params.net_log,	38 params.net_log,

39 params.client_socket_factory ?	39 params.client_socket_factory

40 params.client_socket_factory :	40 ? params.client_socket_factory

41 net::ClientSocketFactory::GetDefaultFactory(),	41 : net::ClientSocketFactory::GetDefaultFactory(),

42 params.host_resolver,	42 params.host_resolver,

43 params.cert_verifier,	43 params.cert_verifier,

44 params.channel_id_service,	44 params.channel_id_service,

45 params.transport_security_state,	45 params.transport_security_state,

46 params.cert_transparency_verifier,	46 params.cert_transparency_verifier,

47 params.ssl_session_cache_shard,	47 params.ssl_session_cache_shard,

48 params.proxy_service,	48 params.proxy_service,

49 params.ssl_config_service,	49 params.ssl_config_service,

	50 params.enable_ssl_connect_job_waiting,

50 pool_type);	51 pool_type);

51 }	52 }

52	53

53 } // unnamed namespace	54 } // unnamed namespace

54	55

55 namespace net {	56 namespace net {

56	57

57 HttpNetworkSession::Params::Params()	58 HttpNetworkSession::Params::Params()

58 : client_socket_factory(NULL),	59 : client_socket_factory(NULL),

59 host_resolver(NULL),	60 host_resolver(NULL),

(...skipping 239 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
299 case WEBSOCKET_SOCKET_POOL:	300 case WEBSOCKET_SOCKET_POOL:

300 return websocket_socket_pool_manager_.get();	301 return websocket_socket_pool_manager_.get();

301 default:	302 default:

302 NOTREACHED();	303 NOTREACHED();

303 break;	304 break;

304 }	305 }

305 return NULL;	306 return NULL;

306 }	307 }

307	308

308 } // namespace net	309 } // namespace net

OLD	NEW