commit cd47732488cd101eaf0d3558dde5a7d4e4fc260b
author Ben Chan <benchan@chromium.org> Fri Oct 17 14:19:30 2014 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Wed Oct 22 00:30:38 2014 +0000
tree 87cc6c8d767abb73e5224a47018f78d908ea5112
parent 24e1f1c4fde2f685d9b8f2a63df7b61461034380

shill: Replace scoped_ptr with std::unique_ptr.

BUG=None
TEST=`USE='wimax' FEATURES=test emerge-$BOARD shill`
TEST=`USE='wimax clang asan' FEATURES=test emerge-$BOARD shill`

Change-Id: Id9737d9a9c75ecb6abb466b5559ff06dcf0751cd
Reviewed-on: https://chromium-review.googlesource.com/224138
Tested-by: Ben Chan <benchan@chromium.org>
Reviewed-by: Paul Stewart <pstew@chromium.org>
Commit-Queue: Ben Chan <benchan@chromium.org>

http_proxy.h

diff --git a/http_proxy.h b/http_proxy.h
index bef7748..b0f4183 100644
--- a/http_proxy.h
+++ b/http_proxy.h
@@ -5,12 +5,12 @@
 #ifndef SHILL_HTTP_PROXY_H_
 #define SHILL_HTTP_PROXY_H_
 
+#include <memory>
 #include <string>
 #include <vector>
 
 #include <base/cancelable_callback.h>
 #include <base/memory/ref_counted.h>
-#include <base/memory/scoped_ptr.h>
 #include <base/memory/weak_ptr.h>
 
 #include "shill/byte_string.h"
@@ -129,12 +129,12 @@
   base::Callback<void(int)> write_server_callback_;
 
   // State held while proxy is started (even if no transaction is active).
-  scoped_ptr<IOHandler> accept_handler_;
+  std::unique_ptr<IOHandler> accept_handler_;
   EventDispatcher *dispatcher_;
-  scoped_ptr<DNSClient> dns_client_;
+  std::unique_ptr<DNSClient> dns_client_;
   int proxy_port_;
   int proxy_socket_;
-  scoped_ptr<AsyncConnection> server_async_connection_;
+  std::unique_ptr<AsyncConnection> server_async_connection_;
   Sockets *sockets_;
 
   // State held while proxy is started and a transaction is active.
@@ -150,10 +150,10 @@
   std::string server_hostname_;
   ByteString client_data_;
   ByteString server_data_;
-  scoped_ptr<IOHandler> read_client_handler_;
-  scoped_ptr<IOHandler> write_client_handler_;
-  scoped_ptr<IOHandler> read_server_handler_;
-  scoped_ptr<IOHandler> write_server_handler_;
+  std::unique_ptr<IOHandler> read_client_handler_;
+  std::unique_ptr<IOHandler> write_client_handler_;
+  std::unique_ptr<IOHandler> read_server_handler_;
+  std::unique_ptr<IOHandler> write_server_handler_;
 
   DISALLOW_COPY_AND_ASSIGN(HTTPProxy);
 };