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

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

Issue 2333923004: Extracting NetLog inner classes into their own classes. (Closed)
Patch Set: Some nit fixes and better, impl-agnostic naming of net_log_parameters_callback_typedef.h -> net/log… Created 4 years, 2 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/socket/ssl_client_socket_pool.h" 5 #include "net/socket/ssl_client_socket_pool.h"
6 6
7 #include <openssl/ssl.h> 7 #include <openssl/ssl.h>
8 8
9 #include <utility> 9 #include <utility>
10 10
11 #include "base/bind.h" 11 #include "base/bind.h"
12 #include "base/bind_helpers.h" 12 #include "base/bind_helpers.h"
13 #include "base/metrics/field_trial.h" 13 #include "base/metrics/field_trial.h"
14 #include "base/metrics/histogram_macros.h" 14 #include "base/metrics/histogram_macros.h"
15 #include "base/metrics/sparse_histogram.h" 15 #include "base/metrics/sparse_histogram.h"
16 #include "base/profiler/scoped_tracker.h" 16 #include "base/profiler/scoped_tracker.h"
17 #include "base/trace_event/trace_event.h" 17 #include "base/trace_event/trace_event.h"
18 #include "base/values.h" 18 #include "base/values.h"
19 #include "net/base/host_port_pair.h" 19 #include "net/base/host_port_pair.h"
20 #include "net/base/net_errors.h" 20 #include "net/base/net_errors.h"
21 #include "net/http/http_proxy_client_socket.h" 21 #include "net/http/http_proxy_client_socket.h"
22 #include "net/http/http_proxy_client_socket_pool.h" 22 #include "net/http/http_proxy_client_socket_pool.h"
23 #include "net/log/net_log_source_type.h" 23 #include "net/log/net_log_source_type.h"
24 #include "net/log/net_log_with_source.h"
24 #include "net/socket/client_socket_factory.h" 25 #include "net/socket/client_socket_factory.h"
25 #include "net/socket/client_socket_handle.h" 26 #include "net/socket/client_socket_handle.h"
26 #include "net/socket/socks_client_socket_pool.h" 27 #include "net/socket/socks_client_socket_pool.h"
27 #include "net/socket/ssl_client_socket.h" 28 #include "net/socket/ssl_client_socket.h"
28 #include "net/socket/transport_client_socket_pool.h" 29 #include "net/socket/transport_client_socket_pool.h"
29 #include "net/ssl/ssl_cert_request_info.h" 30 #include "net/ssl/ssl_cert_request_info.h"
30 #include "net/ssl/ssl_connection_status_flags.h" 31 #include "net/ssl/ssl_connection_status_flags.h"
31 #include "net/ssl/ssl_info.h" 32 #include "net/ssl/ssl_info.h"
32 33
33 namespace net { 34 namespace net {
34 35
36 class NetLog;
37
35 SSLSocketParams::SSLSocketParams( 38 SSLSocketParams::SSLSocketParams(
36 const scoped_refptr<TransportSocketParams>& direct_params, 39 const scoped_refptr<TransportSocketParams>& direct_params,
37 const scoped_refptr<SOCKSSocketParams>& socks_proxy_params, 40 const scoped_refptr<SOCKSSocketParams>& socks_proxy_params,
38 const scoped_refptr<HttpProxySocketParams>& http_proxy_params, 41 const scoped_refptr<HttpProxySocketParams>& http_proxy_params,
39 const HostPortPair& host_and_port, 42 const HostPortPair& host_and_port,
40 const SSLConfig& ssl_config, 43 const SSLConfig& ssl_config,
41 PrivacyMode privacy_mode, 44 PrivacyMode privacy_mode,
42 int load_flags, 45 int load_flags,
43 bool expect_spdy) 46 bool expect_spdy)
44 : direct_params_(direct_params), 47 : direct_params_(direct_params),
(...skipping 638 matching lines...) Expand 10 before | Expand all | Expand 10 after
683 if (base_.CloseOneIdleSocket()) 686 if (base_.CloseOneIdleSocket())
684 return true; 687 return true;
685 return base_.CloseOneIdleConnectionInHigherLayeredPool(); 688 return base_.CloseOneIdleConnectionInHigherLayeredPool();
686 } 689 }
687 690
688 void SSLClientSocketPool::OnSSLConfigChanged() { 691 void SSLClientSocketPool::OnSSLConfigChanged() {
689 FlushWithError(ERR_NETWORK_CHANGED); 692 FlushWithError(ERR_NETWORK_CHANGED);
690 } 693 }
691 694
692 } // namespace net 695 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698