commit 22f1fbc11b69ee41af8370ec38f1b90577db6c3c
author Ben Chan <benchan@chromium.org> Fri Oct 17 14:18:07 2014 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Sat Oct 18 07:38:22 2014 +0000
tree 3ec5f76690e31e5d7c8f2dd3fe382ec2b9717be0
parent 3a1bf99b484ad8a9a054518f49046221251d5612

shill: connection: 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: I41a34f47ce3998d380912c565a72e54e240d4436
Reviewed-on: https://chromium-review.googlesource.com/224159
Reviewed-by: Paul Stewart <pstew@chromium.org>
Commit-Queue: Ben Chan <benchan@chromium.org>
Tested-by: Ben Chan <benchan@chromium.org>

connection_health_checker.h

diff --git a/connection_health_checker.h b/connection_health_checker.h
index 624ab48..24827ee 100644
--- a/connection_health_checker.h
+++ b/connection_health_checker.h
@@ -5,13 +5,13 @@
 #ifndef SHILL_CONNECTION_HEALTH_CHECKER_H_
 #define SHILL_CONNECTION_HEALTH_CHECKER_H_
 
+#include <memory>
 #include <string>
 #include <vector>
 
 #include <base/callback.h>
 #include <base/cancelable_callback.h>
 #include <base/macros.h>
-#include <base/memory/scoped_ptr.h>
 #include <base/memory/scoped_vector.h>
 #include <base/memory/weak_ptr.h>
 #include <gtest/gtest_prod.h>
@@ -184,19 +184,19 @@
   IPAddressStore *remote_ips_;
   base::Callback<void(Result)> result_callback_;
 
-  scoped_ptr<Sockets> socket_;
+  std::unique_ptr<Sockets> socket_;
   base::WeakPtrFactory<ConnectionHealthChecker> weak_ptr_factory_;
 
   // Callback passed to |tcp_connection_| to report an established TCP
   // connection.
   const base::Callback<void(bool, int)> connection_complete_callback_;
   // Active TCP connection during health check.
-  scoped_ptr<AsyncConnection> tcp_connection_;
+  std::unique_ptr<AsyncConnection> tcp_connection_;
   const base::Callback<void(void)> report_result_;
   // Active socket for |tcp_connection_| during an active health check.
   int sock_fd_;
   // Interface to read TCP connection information from the system.
-  scoped_ptr<SocketInfoReader> socket_info_reader_;
+  std::unique_ptr<SocketInfoReader> socket_info_reader_;
 
   DNSClientFactory *dns_client_factory_;
   ScopedVector<DNSClient> dns_clients_;