Replace base::MakeUnique with std::make_unique in components/ - 2
If file doesn't use base::WrapUnique, base/memory/ptr_util.h includes
are changed to <memory>.
Bug: 755727
Change-Id: I6fc3a696a2222e140d6d366b2bc9b285fdef2dbc
Reviewed-on: https://chromium-review.googlesource.com/878083
Reviewed-by: Colin Blundell <blundell@chromium.org>
Commit-Queue: Gyuyoung Kim <gyuyoung.kim@lge.com>
Cr-Original-Commit-Position: refs/heads/master@{#531218}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 8b084c0832974592b5fdb639b1d2558b4f5549ac
diff --git a/alarm_timer_chromeos.cc b/alarm_timer_chromeos.cc
index da011e3..1718038 100644
--- a/alarm_timer_chromeos.cc
+++ b/alarm_timer_chromeos.cc
@@ -8,13 +8,13 @@
#include <sys/timerfd.h>
#include <algorithm>
+#include <memory>
#include <utility>
#include "base/bind.h"
#include "base/debug/task_annotator.h"
#include "base/files/file_util.h"
#include "base/logging.h"
-#include "base/memory/ptr_util.h"
#include "base/pending_task.h"
#include "base/trace_event/trace_event.h"
@@ -72,7 +72,7 @@
// Set up the pending task.
base::Timer::set_desired_run_time(
delay.is_zero() ? base::TimeTicks() : base::TimeTicks::Now() + delay);
- pending_task_ = base::MakeUnique<base::PendingTask>(
+ pending_task_ = std::make_unique<base::PendingTask>(
base::Timer::posted_from(), base::Timer::user_task(),
base::Timer::desired_run_time());
diff --git a/alarm_timer_unittest.cc b/alarm_timer_unittest.cc
index 78494ad..ecbeb21 100644
--- a/alarm_timer_unittest.cc
+++ b/alarm_timer_unittest.cc
@@ -11,7 +11,6 @@
#include "base/files/file_descriptor_watcher_posix.h"
#include "base/location.h"
#include "base/macros.h"
-#include "base/memory/ptr_util.h"
#include "base/message_loop/message_loop.h"
#include "base/run_loop.h"
#include "base/single_thread_task_runner.h"
@@ -253,9 +252,9 @@
// if debug heap checking is enabled.
bool did_run = false;
{
- auto loop = base::MakeUnique<base::MessageLoopForIO>();
+ auto loop = std::make_unique<base::MessageLoopForIO>();
auto file_descriptor_watcher =
- base::MakeUnique<base::FileDescriptorWatcher>(loop.get());
+ std::make_unique<base::FileDescriptorWatcher>(loop.get());
OneShotAlarmTimerTester a(&did_run, kTenMilliseconds);
OneShotAlarmTimerTester b(&did_run, kTenMilliseconds);
OneShotAlarmTimerTester c(&did_run, kTenMilliseconds);