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

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

Issue 12680003: net: split net/ssl out of net/base (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 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 | Annotate | Revision Log
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_proxy_client_socket_pool.h" 5 #include "net/http/http_proxy_client_socket_pool.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/time.h" 9 #include "base/time.h"
10 #include "base/values.h" 10 #include "base/values.h"
11 #include "googleurl/src/gurl.h" 11 #include "googleurl/src/gurl.h"
12 #include "net/base/load_flags.h" 12 #include "net/base/load_flags.h"
13 #include "net/base/net_errors.h" 13 #include "net/base/net_errors.h"
14 #include "net/base/ssl_cert_request_info.h"
15 #include "net/http/http_network_session.h" 14 #include "net/http/http_network_session.h"
16 #include "net/http/http_proxy_client_socket.h" 15 #include "net/http/http_proxy_client_socket.h"
17 #include "net/socket/client_socket_factory.h" 16 #include "net/socket/client_socket_factory.h"
18 #include "net/socket/client_socket_handle.h" 17 #include "net/socket/client_socket_handle.h"
19 #include "net/socket/client_socket_pool_base.h" 18 #include "net/socket/client_socket_pool_base.h"
20 #include "net/socket/ssl_client_socket.h" 19 #include "net/socket/ssl_client_socket.h"
21 #include "net/socket/ssl_client_socket_pool.h" 20 #include "net/socket/ssl_client_socket_pool.h"
22 #include "net/socket/transport_client_socket_pool.h" 21 #include "net/socket/transport_client_socket_pool.h"
23 #include "net/spdy/spdy_proxy_client_socket.h" 22 #include "net/spdy/spdy_proxy_client_socket.h"
24 #include "net/spdy/spdy_session.h" 23 #include "net/spdy/spdy_session.h"
25 #include "net/spdy/spdy_session_pool.h" 24 #include "net/spdy/spdy_session_pool.h"
26 #include "net/spdy/spdy_stream.h" 25 #include "net/spdy/spdy_stream.h"
26 #include "net/ssl/ssl_cert_request_info.h"
27 27
28 namespace net { 28 namespace net {
29 29
30 HttpProxySocketParams::HttpProxySocketParams( 30 HttpProxySocketParams::HttpProxySocketParams(
31 const scoped_refptr<TransportSocketParams>& transport_params, 31 const scoped_refptr<TransportSocketParams>& transport_params,
32 const scoped_refptr<SSLSocketParams>& ssl_params, 32 const scoped_refptr<SSLSocketParams>& ssl_params,
33 const GURL& request_url, 33 const GURL& request_url,
34 const std::string& user_agent, 34 const std::string& user_agent,
35 const HostPortPair& endpoint, 35 const HostPortPair& endpoint,
36 HttpAuthCache* http_auth_cache, 36 HttpAuthCache* http_auth_cache,
(...skipping 491 matching lines...) Expand 10 before | Expand all | Expand 10 after
528 return base_.histograms(); 528 return base_.histograms();
529 } 529 }
530 530
531 bool HttpProxyClientSocketPool::CloseOneIdleConnection() { 531 bool HttpProxyClientSocketPool::CloseOneIdleConnection() {
532 if (base_.CloseOneIdleSocket()) 532 if (base_.CloseOneIdleSocket())
533 return true; 533 return true;
534 return base_.CloseOneIdleConnectionInLayeredPool(); 534 return base_.CloseOneIdleConnectionInLayeredPool();
535 } 535 }
536 536
537 } // namespace net 537 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698