commit 5c02c1335b98b3a1c8759a664bf7b6a48773f913
author Ben Chan <benchan@chromium.org> Tue Jun 27 07:10:36 2017 -0700
committer chrome-bot <chrome-bot@chromium.org> Fri Jun 30 12:51:26 2017 -0700
tree 4be3b1fd24c439bd32d13c36f4158ae8e99ff126
parent 1677e812f16ce2949238b0ec15d7925ac1035d01

Replace brillo::make_unique_ptr with base::MakeUnique/base::WrapUnique.

base::MakeUnique mimics std::make_unique and is preferred over
brillo::make_unique_ptr (which is identical to base::WrapUnique).
brillo::make_unique_ptr will eventually be deprecated and removed as its
functionality is well covered by base::MakeUnique and base::WrapUnique.

BUG=chromium:704644
TEST=Run unit tests.

Change-Id: I771b312d04643a1c74dd843947ed30bda510eed2
Reviewed-on: https://chromium-review.googlesource.com/458562
Commit-Ready: Ben Chan <benchan@chromium.org>
Tested-by: Ben Chan <benchan@chromium.org>
Reviewed-by: Dan Erat <derat@chromium.org>
Reviewed-by: Alex Deymo <deymo@google.com>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Sen Jiang <senj@chromium.org>

update_manager/state_factory.cc

diff --git a/update_manager/state_factory.cc b/update_manager/state_factory.cc
index 70fc80b..731a0cf 100644
--- a/update_manager/state_factory.cc
+++ b/update_manager/state_factory.cc
@@ -19,7 +19,7 @@
 #include <memory>
 
 #include <base/logging.h>
-#include <brillo/make_unique_ptr.h>
+#include <base/memory/ptr_util.h>
 #if USE_DBUS
 #include <session_manager/dbus-proxies.h>
 #endif  // USE_DBUS
@@ -57,8 +57,7 @@
       chromeos_update_engine::DBusConnection::Get()->GetDBus();
   unique_ptr<RealDevicePolicyProvider> device_policy_provider(
       new RealDevicePolicyProvider(
-          brillo::make_unique_ptr(
-              new org::chromium::SessionManagerInterfaceProxy(bus)),
+          base::MakeUnique<org::chromium::SessionManagerInterfaceProxy>(bus),
           policy_provider));
 #else
   unique_ptr<RealDevicePolicyProvider> device_policy_provider(