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>

dns_server_tester_unittest.cc

diff --git a/dns_server_tester_unittest.cc b/dns_server_tester_unittest.cc
index e68d660..ae752c6 100644
--- a/dns_server_tester_unittest.cc
+++ b/dns_server_tester_unittest.cc
@@ -4,10 +4,10 @@
 
 #include "shill/dns_server_tester.h"
 
+#include <memory>
 #include <string>
 
 #include <base/bind.h>
-#include <base/memory/scoped_ptr.h>
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
@@ -94,12 +94,12 @@
  private:
   StrictMock<MockEventDispatcher> dispatcher_;
   MockControl control_;
-  scoped_ptr<MockDeviceInfo> device_info_;
+  std::unique_ptr<MockDeviceInfo> device_info_;
   scoped_refptr<MockConnection> connection_;
   CallbackTarget callback_target_;
   const string interface_name_;
   vector<string> dns_servers_;
-  scoped_ptr<DNSServerTester> dns_server_tester_;
+  std::unique_ptr<DNSServerTester> dns_server_tester_;
 };
 
 TEST_F(DNSServerTesterTest, Constructor) {