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>
diff --git a/real_system_state.cc b/real_system_state.cc
index 5cbf723..1beb541 100644
--- a/real_system_state.cc
+++ b/real_system_state.cc
@@ -21,8 +21,8 @@
#include <base/bind.h>
#include <base/files/file_util.h>
#include <base/location.h>
+#include <base/memory/ptr_util.h>
#include <base/time/time.h>
-#include <brillo/make_unique_ptr.h>
#include <brillo/message_loops/message_loop.h>
#if USE_LIBCROS
#include <chromeos/dbus/service_constants.h>
@@ -56,7 +56,7 @@
if (!boot_control_) {
LOG(WARNING) << "Unable to create BootControl instance, using stub "
<< "instead. All update attempts will fail.";
- boot_control_ = brillo::make_unique_ptr(new BootControlStub());
+ boot_control_ = base::MakeUnique<BootControlStub>();
}
hardware_ = hardware::CreateHardware();