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

Side by Side Diff: net/socket/ssl_client_socket_pool.cc

Issue 2315613002: Extracted NetLog class's inner enum types into their own enum classes and (Closed)
Patch Set: Ran "git cl format" on code. Much formatting ensued. Created 4 years, 3 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
« no previous file with comments | « net/socket/ssl_client_socket_impl.cc ('k') | net/socket/ssl_client_socket_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/socket/ssl_client_socket_pool.h" 5 #include "net/socket/ssl_client_socket_pool.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
11 #include "base/metrics/field_trial.h" 11 #include "base/metrics/field_trial.h"
12 #include "base/metrics/histogram_macros.h" 12 #include "base/metrics/histogram_macros.h"
13 #include "base/metrics/sparse_histogram.h" 13 #include "base/metrics/sparse_histogram.h"
14 #include "base/profiler/scoped_tracker.h" 14 #include "base/profiler/scoped_tracker.h"
15 #include "base/trace_event/trace_event.h" 15 #include "base/trace_event/trace_event.h"
16 #include "base/values.h" 16 #include "base/values.h"
17 #include "net/base/host_port_pair.h" 17 #include "net/base/host_port_pair.h"
18 #include "net/base/net_errors.h" 18 #include "net/base/net_errors.h"
19 #include "net/http/http_proxy_client_socket.h" 19 #include "net/http/http_proxy_client_socket.h"
20 #include "net/http/http_proxy_client_socket_pool.h" 20 #include "net/http/http_proxy_client_socket_pool.h"
21 #include "net/log/net_log_source_type.h"
21 #include "net/socket/client_socket_factory.h" 22 #include "net/socket/client_socket_factory.h"
22 #include "net/socket/client_socket_handle.h" 23 #include "net/socket/client_socket_handle.h"
23 #include "net/socket/socks_client_socket_pool.h" 24 #include "net/socket/socks_client_socket_pool.h"
24 #include "net/socket/ssl_client_socket.h" 25 #include "net/socket/ssl_client_socket.h"
25 #include "net/socket/transport_client_socket_pool.h" 26 #include "net/socket/transport_client_socket_pool.h"
26 #include "net/ssl/ssl_cert_request_info.h" 27 #include "net/ssl/ssl_cert_request_info.h"
27 #include "net/ssl/ssl_cipher_suite_names.h" 28 #include "net/ssl/ssl_cipher_suite_names.h"
28 #include "net/ssl/ssl_connection_status_flags.h" 29 #include "net/ssl/ssl_connection_status_flags.h"
29 #include "net/ssl/ssl_info.h" 30 #include "net/ssl/ssl_info.h"
30 31
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 HttpProxyClientSocketPool* http_proxy_pool, 103 HttpProxyClientSocketPool* http_proxy_pool,
103 ClientSocketFactory* client_socket_factory, 104 ClientSocketFactory* client_socket_factory,
104 const SSLClientSocketContext& context, 105 const SSLClientSocketContext& context,
105 Delegate* delegate, 106 Delegate* delegate,
106 NetLog* net_log) 107 NetLog* net_log)
107 : ConnectJob(group_name, 108 : ConnectJob(group_name,
108 timeout_duration, 109 timeout_duration,
109 priority, 110 priority,
110 respect_limits, 111 respect_limits,
111 delegate, 112 delegate,
112 BoundNetLog::Make(net_log, NetLog::SOURCE_CONNECT_JOB)), 113 BoundNetLog::Make(net_log, NetLogSourceType::CONNECT_JOB)),
113 params_(params), 114 params_(params),
114 transport_pool_(transport_pool), 115 transport_pool_(transport_pool),
115 socks_pool_(socks_pool), 116 socks_pool_(socks_pool),
116 http_proxy_pool_(http_proxy_pool), 117 http_proxy_pool_(http_proxy_pool),
117 client_socket_factory_(client_socket_factory), 118 client_socket_factory_(client_socket_factory),
118 context_(context.cert_verifier, 119 context_(context.cert_verifier,
119 context.channel_id_service, 120 context.channel_id_service,
120 context.transport_security_state, 121 context.transport_security_state,
121 context.cert_transparency_verifier, 122 context.cert_transparency_verifier,
122 context.ct_policy_enforcer, 123 context.ct_policy_enforcer,
(...skipping 569 matching lines...) Expand 10 before | Expand all | Expand 10 after
692 if (base_.CloseOneIdleSocket()) 693 if (base_.CloseOneIdleSocket())
693 return true; 694 return true;
694 return base_.CloseOneIdleConnectionInHigherLayeredPool(); 695 return base_.CloseOneIdleConnectionInHigherLayeredPool();
695 } 696 }
696 697
697 void SSLClientSocketPool::OnSSLConfigChanged() { 698 void SSLClientSocketPool::OnSSLConfigChanged() {
698 FlushWithError(ERR_NETWORK_CHANGED); 699 FlushWithError(ERR_NETWORK_CHANGED);
699 } 700 }
700 701
701 } // namespace net 702 } // namespace net
OLDNEW
« no previous file with comments | « net/socket/ssl_client_socket_impl.cc ('k') | net/socket/ssl_client_socket_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698