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

Unified Diff: net/socket/client_socket_pool_manager_impl.h

Issue 1892323002: Change scoped_ptr to std::unique_ptr in //net/socket. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/socket/client_socket_pool_manager.cc ('k') | net/socket/client_socket_pool_manager_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/client_socket_pool_manager_impl.h
diff --git a/net/socket/client_socket_pool_manager_impl.h b/net/socket/client_socket_pool_manager_impl.h
index d4a3f64f367beb26c90099467c87a6997d8bd97a..3fae145a304396c345eac97dea74e72c4b8eeda1 100644
--- a/net/socket/client_socket_pool_manager_impl.h
+++ b/net/socket/client_socket_pool_manager_impl.h
@@ -6,12 +6,12 @@
#define NET_SOCKET_CLIENT_SOCKET_POOL_MANAGER_IMPL_H_
#include <map>
+#include <memory>
#include <type_traits>
#include "base/compiler_specific.h"
#include "base/macros.h"
#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
#include "base/stl_util.h"
#include "base/threading/non_thread_safe.h"
#include "net/cert/cert_database.h"
@@ -87,7 +87,7 @@ class ClientSocketPoolManagerImpl : public base::NonThreadSafe,
const HostPortPair& proxy_server) override;
// Creates a Value summary of the state of the socket pools.
- scoped_ptr<base::Value> SocketPoolInfoToValue() const override;
+ std::unique_ptr<base::Value> SocketPoolInfoToValue() const override;
// CertDatabase::Observer methods:
void OnCertAdded(const X509Certificate* cert) override;
@@ -118,8 +118,8 @@ class ClientSocketPoolManagerImpl : public base::NonThreadSafe,
// Note: this ordering is important.
- scoped_ptr<TransportClientSocketPool> transport_socket_pool_;
- scoped_ptr<SSLClientSocketPool> ssl_socket_pool_;
+ std::unique_ptr<TransportClientSocketPool> transport_socket_pool_;
+ std::unique_ptr<SSLClientSocketPool> ssl_socket_pool_;
TransportSocketPoolMap transport_socket_pools_for_socks_proxies_;
SOCKSSocketPoolMap socks_socket_pools_;
TransportSocketPoolMap transport_socket_pools_for_http_proxies_;
« no previous file with comments | « net/socket/client_socket_pool_manager.cc ('k') | net/socket/client_socket_pool_manager_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698