commit d1fce5554f7478e1c9d0fb5fd7f82dcb53d07110
author Ben Chan <benchan@chromium.org> Fri Oct 17 01:12:52 2014 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Sat Oct 18 01:38:36 2014 +0000
tree e045ba2a531329c09700b99a245194b94a145825
parent d419b6dc297755e8f0546b2f780851b49aab1fc7

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

dbus_manager.h

diff --git a/dbus_manager.h b/dbus_manager.h
index c273c81..94d724f 100644
--- a/dbus_manager.h
+++ b/dbus_manager.h
@@ -7,12 +7,12 @@
 
 #include <list>
 #include <map>
+#include <memory>
 #include <string>
 
 #include <base/callback.h>
 #include <base/cancelable_callback.h>
 #include <base/macros.h>
-#include <base/memory/scoped_ptr.h>
 #include <base/memory/weak_ptr.h>
 #include <gtest/gtest_prod.h>  // for FRIEND_TEST
 
@@ -73,7 +73,7 @@
 
   ProxyFactory *proxy_factory_;
 
-  scoped_ptr<DBusServiceProxyInterface> proxy_;
+  std::unique_ptr<DBusServiceProxyInterface> proxy_;
 
   std::map<std::string, std::list<DBusNameWatcher *>> name_watchers_;