1 files changed, 39 insertions, 37 deletions
diff --git a/chromium/net/url_request/url_request_context_storage.h b/chromium/net/url_request/url_request_context_storage.h
index b888fb0c3ce..88077498d96 100644
--- a/chromium/net/url_request/url_request_context_storage.h
+++ b/chromium/net/url_request/url_request_context_storage.h
@@ -5,9 +5,10 @@
 #ifndef NET_URL_REQUEST_URL_REQUEST_CONTEXT_STORAGE_H_
 #define NET_URL_REQUEST_URL_REQUEST_CONTEXT_STORAGE_H_
 
+#include <memory>
+
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
 #include "net/base/net_export.h"
 
 namespace net {
@@ -47,33 +48,34 @@ class NET_EXPORT URLRequestContextStorage {
   // These setters will set both the member variables and call the setter on the
   // URLRequestContext object. In all cases, ownership is passed to |this|.
 
-  void set_net_log(scoped_ptr<NetLog> net_log);
-  void set_host_resolver(scoped_ptr<HostResolver> host_resolver);
-  void set_cert_verifier(scoped_ptr<CertVerifier> cert_verifier);
-  void set_channel_id_service(scoped_ptr<ChannelIDService> channel_id_service);
+  void set_net_log(std::unique_ptr<NetLog> net_log);
+  void set_host_resolver(std::unique_ptr<HostResolver> host_resolver);
+  void set_cert_verifier(std::unique_ptr<CertVerifier> cert_verifier);
+  void set_channel_id_service(
+      std::unique_ptr<ChannelIDService> channel_id_service);
   void set_http_auth_handler_factory(
-      scoped_ptr<HttpAuthHandlerFactory> http_auth_handler_factory);
-  void set_proxy_service(scoped_ptr<ProxyService> proxy_service);
+      std::unique_ptr<HttpAuthHandlerFactory> http_auth_handler_factory);
+  void set_proxy_service(std::unique_ptr<ProxyService> proxy_service);
   void set_ssl_config_service(SSLConfigService* ssl_config_service);
-  void set_network_delegate(scoped_ptr<NetworkDelegate> network_delegate);
-  void set_proxy_delegate(scoped_ptr<ProxyDelegate> proxy_delegate);
+  void set_network_delegate(std::unique_ptr<NetworkDelegate> network_delegate);
+  void set_proxy_delegate(std::unique_ptr<ProxyDelegate> proxy_delegate);
   void set_http_server_properties(
-      scoped_ptr<HttpServerProperties> http_server_properties);
-  void set_cookie_store(scoped_ptr<CookieStore> cookie_store);
+      std::unique_ptr<HttpServerProperties> http_server_properties);
+  void set_cookie_store(std::unique_ptr<CookieStore> cookie_store);
   void set_transport_security_state(
-      scoped_ptr<TransportSecurityState> transport_security_state);
+      std::unique_ptr<TransportSecurityState> transport_security_state);
   void set_http_network_session(
-      scoped_ptr<HttpNetworkSession> http_network_session);
+      std::unique_ptr<HttpNetworkSession> http_network_session);
   void set_http_transaction_factory(
-      scoped_ptr<HttpTransactionFactory> http_transaction_factory);
-  void set_job_factory(scoped_ptr<URLRequestJobFactory> job_factory);
+      std::unique_ptr<HttpTransactionFactory> http_transaction_factory);
+  void set_job_factory(std::unique_ptr<URLRequestJobFactory> job_factory);
   void set_throttler_manager(
-      scoped_ptr<URLRequestThrottlerManager> throttler_manager);
+      std::unique_ptr<URLRequestThrottlerManager> throttler_manager);
   void set_backoff_manager(
-      scoped_ptr<URLRequestBackoffManager> backoff_manager);
+      std::unique_ptr<URLRequestBackoffManager> backoff_manager);
   void set_http_user_agent_settings(
-      scoped_ptr<HttpUserAgentSettings> http_user_agent_settings);
-  void set_sdch_manager(scoped_ptr<SdchManager> sdch_manager);
+      std::unique_ptr<HttpUserAgentSettings> http_user_agent_settings);
+  void set_sdch_manager(std::unique_ptr<SdchManager> sdch_manager);
 
   // Everything else can be access through the URLRequestContext, but this
   // cannot.  Having an accessor for it makes usage a little cleaner.
@@ -88,31 +90,31 @@ class NET_EXPORT URLRequestContextStorage {
   URLRequestContext* const context_;
 
   // Owned members.
-  scoped_ptr<NetLog> net_log_;
-  scoped_ptr<HostResolver> host_resolver_;
-  scoped_ptr<CertVerifier> cert_verifier_;
+  std::unique_ptr<NetLog> net_log_;
+  std::unique_ptr<HostResolver> host_resolver_;
+  std::unique_ptr<CertVerifier> cert_verifier_;
   // The ChannelIDService must outlive the HttpTransactionFactory.
-  scoped_ptr<ChannelIDService> channel_id_service_;
-  scoped_ptr<HttpAuthHandlerFactory> http_auth_handler_factory_;
-  scoped_ptr<ProxyService> proxy_service_;
+  std::unique_ptr<ChannelIDService> channel_id_service_;
+  std::unique_ptr<HttpAuthHandlerFactory> http_auth_handler_factory_;
+  std::unique_ptr<ProxyService> proxy_service_;
   // TODO(willchan): Remove refcounting on these members.
   scoped_refptr<SSLConfigService> ssl_config_service_;
-  scoped_ptr<NetworkDelegate> network_delegate_;
-  scoped_ptr<ProxyDelegate> proxy_delegate_;
-  scoped_ptr<HttpServerProperties> http_server_properties_;
-  scoped_ptr<HttpUserAgentSettings> http_user_agent_settings_;
-  scoped_ptr<CookieStore> cookie_store_;
-  scoped_ptr<TransportSecurityState> transport_security_state_;
+  std::unique_ptr<NetworkDelegate> network_delegate_;
+  std::unique_ptr<ProxyDelegate> proxy_delegate_;
+  std::unique_ptr<HttpServerProperties> http_server_properties_;
+  std::unique_ptr<HttpUserAgentSettings> http_user_agent_settings_;
+  std::unique_ptr<CookieStore> cookie_store_;
+  std::unique_ptr<TransportSecurityState> transport_security_state_;
 
   // Not actually pointed at by the URLRequestContext, but may be used (but not
   // owned) by the HttpTransactionFactory.
-  scoped_ptr<HttpNetworkSession> http_network_session_;
+  std::unique_ptr<HttpNetworkSession> http_network_session_;
 
-  scoped_ptr<HttpTransactionFactory> http_transaction_factory_;
-  scoped_ptr<URLRequestJobFactory> job_factory_;
-  scoped_ptr<URLRequestThrottlerManager> throttler_manager_;
-  scoped_ptr<URLRequestBackoffManager> backoff_manager_;
-  scoped_ptr<SdchManager> sdch_manager_;
+  std::unique_ptr<HttpTransactionFactory> http_transaction_factory_;
+  std::unique_ptr<URLRequestJobFactory> job_factory_;
+  std::unique_ptr<URLRequestThrottlerManager> throttler_manager_;
+  std::unique_ptr<URLRequestBackoffManager> backoff_manager_;
+  std::unique_ptr<SdchManager> sdch_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(URLRequestContextStorage);
 };