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/network_selector_android.cc b/network_selector_android.cc
index 6879b69..5edfe40 100644
--- a/network_selector_android.cc
+++ b/network_selector_android.cc
@@ -18,7 +18,7 @@
#include <android/multinetwork.h>
#include <base/logging.h>
-#include <brillo/make_unique_ptr.h>
+#include <base/memory/ptr_util.h>
namespace chromeos_update_engine {
@@ -26,7 +26,7 @@
// Factory defined in network_selector.h.
std::unique_ptr<NetworkSelectorInterface> CreateNetworkSelector() {
- return brillo::make_unique_ptr(new NetworkSelectorAndroid());
+ return base::MakeUnique<NetworkSelectorAndroid>();
}
} // namespace network