libbrillo: migrate from base::MakeUnique to std::make_unique

base::MakeUnique is being deprecated as we can now use std::make_unique
when compiling code in the C++14 mode.

BUG=chromium:769107
TEST=Run unit tests.

Change-Id: Ia3eb683524064888a1c4a29d3ba3e5124c3c9331
Reviewed-on: https://chromium-review.googlesource.com/703881
Commit-Ready: Ben Chan <benchan@chromium.org>
Tested-by: Ben Chan <benchan@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>

5 files changed, 14 insertions, 14 deletions

diff --git a/brillo/http/http_proxy_unittest.cc b/brillo/http/http_proxy_unittest.cc
index 8b857ad..4893a87 100644
--- a/brillo/http/http_proxy_unittest.cc
+++ b/brillo/http/http_proxy_unittest.cc
@@ -8,7 +8,6 @@
 #include <vector>
 
 #include <base/bind.h>
-#include <base/memory/ptr_util.h>
 #include <brillo/http/http_transport.h>
 #include <chromeos/dbus/service_constants.h>
 #include <dbus/mock_bus.h>
diff --git a/brillo/process.cc b/brillo/process.cc
index 5efbe5c..7768894 100644
--- a/brillo/process.cc
+++ b/brillo/process.cc
@@ -18,7 +18,6 @@
 #include <base/files/file_path.h>
 #include <base/files/file_util.h>
 #include <base/logging.h>
-#include <base/memory/ptr_util.h>
 #include <base/posix/eintr_wrapper.h>
 #include <base/process/process_metrics.h>
 #include <base/strings/string_number_conversions.h>
@@ -217,7 +216,7 @@ bool ProcessImpl::Start() {
     return false;
   }
   std::unique_ptr<char* []> argv =
-      base::MakeUnique<char* []>(arguments_.size() + 1);
+      std::make_unique<char* []>(arguments_.size() + 1);
 
   for (size_t i = 0; i < arguments_.size(); ++i)
     argv[i] = const_cast<char*>(arguments_[i].c_str());
diff --git a/policy/device_policy_impl.cc b/policy/device_policy_impl.cc
index 8afb22b..470652c 100644
--- a/policy/device_policy_impl.cc
+++ b/policy/device_policy_impl.cc
@@ -4,10 +4,11 @@
 
 #include "policy/device_policy_impl.h"
 
+#include <memory>
+
 #include <base/files/file_util.h>
 #include <base/logging.h>
 #include <base/macros.h>
-#include <base/memory/ptr_util.h>
 #include <openssl/evp.h>
 #include <openssl/x509.h>
 
@@ -109,7 +110,7 @@ DevicePolicyImpl::~DevicePolicyImpl() {
 bool DevicePolicyImpl::LoadPolicy() {
   bool verify_policy = true;
   if (!install_attributes_reader_) {
-    install_attributes_reader_ = base::MakeUnique<InstallAttributesReader>();
+    install_attributes_reader_ = std::make_unique<InstallAttributesReader>();
   }
   const std::string& mode =
       install_attributes_reader_->GetAttribute(
diff --git a/policy/libpolicy.cc b/policy/libpolicy.cc
index b057e8b..435f95e 100644
--- a/policy/libpolicy.cc
+++ b/policy/libpolicy.cc
@@ -4,8 +4,9 @@
 
 #include "policy/libpolicy.h"
 
+#include <memory>
+
 #include <base/logging.h>
-#include <base/memory/ptr_util.h>
 
 #include "policy/device_policy.h"
 #ifndef __ANDROID__
@@ -16,7 +17,7 @@ namespace policy {
 
 PolicyProvider::PolicyProvider() {
 #ifndef __ANDROID__
-  device_policy_ = base::MakeUnique<DevicePolicyImpl>();
+  device_policy_ = std::make_unique<DevicePolicyImpl>();
 #endif
 }
 
diff --git a/policy/tests/libpolicy_unittest.cc b/policy/tests/libpolicy_unittest.cc
index 30c5ca2..897d17b 100644
--- a/policy/tests/libpolicy_unittest.cc
+++ b/policy/tests/libpolicy_unittest.cc
@@ -4,6 +4,7 @@
 
 #include "policy/libpolicy.h"
 
+#include <memory>
 #include <utility>
 
 #include <openssl/err.h>
@@ -11,7 +12,6 @@
 
 #include <base/files/file_path.h>
 #include <base/logging.h>
-#include <base/memory/ptr_util.h>
 #include <gtest/gtest.h>
 
 #include "install_attributes/mock_install_attributes_reader.h"
@@ -58,7 +58,7 @@ TEST(PolicyTest, DevicePolicyAllSetTest) {
   base::FilePath policy_file(kPolicyFileAllSet);
   base::FilePath key_file(kKeyFile);
   MockDevicePolicyImpl* device_policy = new MockDevicePolicyImpl(
-      base::MakeUnique<MockInstallAttributesReader>(
+      std::make_unique<MockInstallAttributesReader>(
           cryptohome::SerializedInstallAttributes()),
       policy_file, key_file, false);
   PolicyProvider provider(device_policy);
@@ -189,7 +189,7 @@ TEST(PolicyTest, DevicePolicyNoneSetTest) {
   base::FilePath policy_file(kPolicyFileNoneSet);
   base::FilePath key_file(kKeyFile);
   MockDevicePolicyImpl* device_policy = new MockDevicePolicyImpl(
-      base::MakeUnique<MockInstallAttributesReader>(
+      std::make_unique<MockInstallAttributesReader>(
           cryptohome::SerializedInstallAttributes()),
       policy_file, key_file, false);
   PolicyProvider provider(device_policy);
@@ -239,7 +239,7 @@ TEST(PolicyTest, DevicePolicyFailure) {
   base::FilePath policy_file(kNonExistingFile);
   base::FilePath key_file(kNonExistingFile);
   MockDevicePolicyImpl* device_policy = new MockDevicePolicyImpl(
-      base::MakeUnique<MockInstallAttributesReader>(
+      std::make_unique<MockInstallAttributesReader>(
           cryptohome::SerializedInstallAttributes()),
       policy_file, key_file, true);
   PolicyProvider provider(device_policy);
@@ -261,7 +261,7 @@ TEST(PolicyTest, SkipSignatureForEnterpriseAD) {
   attr->set_value("enterprise_ad");
 
   MockDevicePolicyImpl* device_policy = new MockDevicePolicyImpl(
-      base::MakeUnique<MockInstallAttributesReader>(install_attributes),
+      std::make_unique<MockInstallAttributesReader>(install_attributes),
       policy_file, key_file, false);
   PolicyProvider provider(device_policy);
   provider.Reload();
@@ -283,7 +283,7 @@ TEST(PolicyTest, DontSkipSignatureForEnterprise) {
   attr->set_value("enterprise");
 
   MockDevicePolicyImpl* device_policy = new MockDevicePolicyImpl(
-      base::MakeUnique<MockInstallAttributesReader>(install_attributes),
+      std::make_unique<MockInstallAttributesReader>(install_attributes),
       policy_file, key_file, false);
   PolicyProvider provider(device_policy);
   provider.Reload();
@@ -299,7 +299,7 @@ TEST(PolicyTest, DontSkipSignatureForConsumer) {
   cryptohome::SerializedInstallAttributes install_attributes;
 
   MockDevicePolicyImpl* device_policy = new MockDevicePolicyImpl(
-      base::MakeUnique<MockInstallAttributesReader>(install_attributes),
+      std::make_unique<MockInstallAttributesReader>(install_attributes),
       policy_file, key_file, false);
   PolicyProvider provider(device_policy);
   provider.Reload();