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

Side by Side Diff: net/socket/client_socket_pool_manager_impl.h

Issue 1153003002: Returning scoped_ptr instead of raw pointer in SocketPoolInfoToValue() in net/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Updated CL as directed. Created 5 years, 7 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/client_socket_pool_manager.h ('k') | net/socket/client_socket_pool_manager_impl.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 #ifndef NET_SOCKET_CLIENT_SOCKET_POOL_MANAGER_IMPL_H_ 5 #ifndef NET_SOCKET_CLIENT_SOCKET_POOL_MANAGER_IMPL_H_
6 #define NET_SOCKET_CLIENT_SOCKET_POOL_MANAGER_IMPL_H_ 6 #define NET_SOCKET_CLIENT_SOCKET_POOL_MANAGER_IMPL_H_
7 7
8 #include <map> 8 #include <map>
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 75
76 SOCKSClientSocketPool* GetSocketPoolForSOCKSProxy( 76 SOCKSClientSocketPool* GetSocketPoolForSOCKSProxy(
77 const HostPortPair& socks_proxy) override; 77 const HostPortPair& socks_proxy) override;
78 78
79 HttpProxyClientSocketPool* GetSocketPoolForHTTPProxy( 79 HttpProxyClientSocketPool* GetSocketPoolForHTTPProxy(
80 const HostPortPair& http_proxy) override; 80 const HostPortPair& http_proxy) override;
81 81
82 SSLClientSocketPool* GetSocketPoolForSSLWithProxy( 82 SSLClientSocketPool* GetSocketPoolForSSLWithProxy(
83 const HostPortPair& proxy_server) override; 83 const HostPortPair& proxy_server) override;
84 84
85 // Creates a Value summary of the state of the socket pools. The caller is 85 // Creates a Value summary of the state of the socket pools.
86 // responsible for deleting the returned value. 86 scoped_ptr<base::Value> SocketPoolInfoToValue() const override;
87 base::Value* SocketPoolInfoToValue() const override;
88 87
89 // CertDatabase::Observer methods: 88 // CertDatabase::Observer methods:
90 void OnCertAdded(const X509Certificate* cert) override; 89 void OnCertAdded(const X509Certificate* cert) override;
91 void OnCACertChanged(const X509Certificate* cert) override; 90 void OnCACertChanged(const X509Certificate* cert) override;
92 91
93 private: 92 private:
94 typedef internal::OwnedPoolMap<HostPortPair, TransportClientSocketPool*> 93 typedef internal::OwnedPoolMap<HostPortPair, TransportClientSocketPool*>
95 TransportSocketPoolMap; 94 TransportSocketPoolMap;
96 typedef internal::OwnedPoolMap<HostPortPair, SOCKSClientSocketPool*> 95 typedef internal::OwnedPoolMap<HostPortPair, SOCKSClientSocketPool*>
97 SOCKSSocketPoolMap; 96 SOCKSSocketPoolMap;
(...skipping 25 matching lines...) Expand all
123 SSLSocketPoolMap ssl_socket_pools_for_https_proxies_; 122 SSLSocketPoolMap ssl_socket_pools_for_https_proxies_;
124 HTTPProxySocketPoolMap http_proxy_socket_pools_; 123 HTTPProxySocketPoolMap http_proxy_socket_pools_;
125 SSLSocketPoolMap ssl_socket_pools_for_proxies_; 124 SSLSocketPoolMap ssl_socket_pools_for_proxies_;
126 125
127 DISALLOW_COPY_AND_ASSIGN(ClientSocketPoolManagerImpl); 126 DISALLOW_COPY_AND_ASSIGN(ClientSocketPoolManagerImpl);
128 }; 127 };
129 128
130 } // namespace net 129 } // namespace net
131 130
132 #endif // NET_SOCKET_CLIENT_SOCKET_POOL_MANAGER_IMPL_H_ 131 #endif // NET_SOCKET_CLIENT_SOCKET_POOL_MANAGER_IMPL_H_
OLDNEW
« no previous file with comments | « net/socket/client_socket_pool_manager.h ('k') | net/socket/client_socket_pool_manager_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698