commit 2e74917c069111e7cbe3d135e21d3a7e8b86157e
author Ben Chan <benchan@chromium.org> Fri Oct 13 06:49:57 2017 +0900
committer Qijiang Fan <fqj@google.com> Fri Jun 05 07:28:51 2020 +0900
tree 6cf3e45384124392afa0be29af79628c547546bd
parent 5650bc84df9f8b4f6617de8ef14eb94f6cc89639

dbus: replace base::MakeUnique with std::make_unique

Bug: 755727
Change-Id: I1bc7f033046a9fff59e7e10693e77cbd88a70d11
Reviewed-on: https://chromium-review.googlesource.com/716923
Reviewed-by: Steven Bennetts <stevenjb@chromium.org>
Commit-Queue: Ben Chan <benchan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#508487}

CrOS-Libchrome-Original-Commit: 6de799f3139066648e3c902726541179e94e1219

dbus/values_util.cc

diff --git a/dbus/values_util.cc b/dbus/values_util.cc
index e62a959..4b1a4ae 100644
--- a/dbus/values_util.cc
+++ b/dbus/values_util.cc
@@ -4,11 +4,11 @@
 
 #include "dbus/values_util.h"
 
+#include <memory>
 #include <utility>
 
 #include "base/json/json_writer.h"
 #include "base/logging.h"
-#include "base/memory/ptr_util.h"
 #include "base/values.h"
 #include "dbus/message.h"
 
@@ -98,37 +98,37 @@
     case Message::BYTE: {
       uint8_t value = 0;
       if (reader->PopByte(&value))
-        result = base::MakeUnique<base::Value>(value);
+        result = std::make_unique<base::Value>(value);
       break;
     }
     case Message::BOOL: {
       bool value = false;
       if (reader->PopBool(&value))
-        result = base::MakeUnique<base::Value>(value);
+        result = std::make_unique<base::Value>(value);
       break;
     }
     case Message::INT16: {
       int16_t value = 0;
       if (reader->PopInt16(&value))
-        result = base::MakeUnique<base::Value>(value);
+        result = std::make_unique<base::Value>(value);
       break;
     }
     case Message::UINT16: {
       uint16_t value = 0;
       if (reader->PopUint16(&value))
-        result = base::MakeUnique<base::Value>(value);
+        result = std::make_unique<base::Value>(value);
       break;
     }
     case Message::INT32: {
       int32_t value = 0;
       if (reader->PopInt32(&value))
-        result = base::MakeUnique<base::Value>(value);
+        result = std::make_unique<base::Value>(value);
       break;
     }
     case Message::UINT32: {
       uint32_t value = 0;
       if (reader->PopUint32(&value)) {
-        result = base::MakeUnique<base::Value>(static_cast<double>(value));
+        result = std::make_unique<base::Value>(static_cast<double>(value));
       }
       break;
     }
@@ -137,7 +137,7 @@
       if (reader->PopInt64(&value)) {
         DLOG_IF(WARNING, !IsExactlyRepresentableByDouble(value)) <<
             value << " is not exactly representable by double";
-        result = base::MakeUnique<base::Value>(static_cast<double>(value));
+        result = std::make_unique<base::Value>(static_cast<double>(value));
       }
       break;
     }
@@ -146,26 +146,26 @@
       if (reader->PopUint64(&value)) {
         DLOG_IF(WARNING, !IsExactlyRepresentableByDouble(value)) <<
             value << " is not exactly representable by double";
-        result = base::MakeUnique<base::Value>(static_cast<double>(value));
+        result = std::make_unique<base::Value>(static_cast<double>(value));
       }
       break;
     }
     case Message::DOUBLE: {
       double value = 0;
       if (reader->PopDouble(&value))
-        result = base::MakeUnique<base::Value>(value);
+        result = std::make_unique<base::Value>(value);
       break;
     }
     case Message::STRING: {
       std::string value;
       if (reader->PopString(&value))
-        result = base::MakeUnique<base::Value>(value);
+        result = std::make_unique<base::Value>(value);
       break;
     }
     case Message::OBJECT_PATH: {
       ObjectPath value;
       if (reader->PopObjectPath(&value))
-        result = base::MakeUnique<base::Value>(value.value());
+        result = std::make_unique<base::Value>(value.value());
       break;
     }
     case Message::UNIX_FD: {

dbus/values_util_unittest.cc

diff --git a/dbus/values_util_unittest.cc b/dbus/values_util_unittest.cc
index 1ee2b69..f0d63a9 100644
--- a/dbus/values_util_unittest.cc
+++ b/dbus/values_util_unittest.cc
@@ -14,7 +14,6 @@
 
 #include "base/json/json_writer.h"
 #include "base/macros.h"
-#include "base/memory/ptr_util.h"
 #include "base/values.h"
 #include "dbus/message.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -517,11 +516,11 @@
   const double kDoubleValue = 4.9;
   const std::string kStringValue = "fifty";
 
-  auto list_value = base::MakeUnique<base::ListValue>();
+  auto list_value = std::make_unique<base::ListValue>();
   list_value->AppendBoolean(kBoolValue);
   list_value->AppendInteger(kInt32Value);
 
-  auto dictionary_value = base::MakeUnique<base::DictionaryValue>();
+  auto dictionary_value = std::make_unique<base::DictionaryValue>();
   dictionary_value->SetBoolean(kKey1, kBoolValue);
   dictionary_value->SetInteger(kKey2, kDoubleValue);
 
@@ -564,11 +563,11 @@
   const double kDoubleValue = 4.9;
   const std::string kStringValue = "fifty";
 
-  auto list_value = base::MakeUnique<base::ListValue>();
+  auto list_value = std::make_unique<base::ListValue>();
   list_value->AppendBoolean(kBoolValue);
   list_value->AppendInteger(kInt32Value);
 
-  auto dictionary_value = base::MakeUnique<base::DictionaryValue>();
+  auto dictionary_value = std::make_unique<base::DictionaryValue>();
   dictionary_value->SetBoolean(kKey1, kBoolValue);
   dictionary_value->SetInteger(kKey2, kDoubleValue);