Convert //components/[o-t]* from scoped_ptr to std::unique_ptr
BUG=554298
R=danakj@chromium.org
TBR=jochen@chromium.org
Review URL: https://codereview.chromium.org/1921923002
Cr-Commit-Position: refs/heads/master@{#389637}
CrOS-Libchrome-Original-Commit: 82beb4ff418b0dcb40bd6b860d2e9793a0193118
diff --git a/components/timers/alarm_timer_unittest.cc b/components/timers/alarm_timer_unittest.cc
index 14c55a9..69ac9d3 100644
--- a/components/timers/alarm_timer_unittest.cc
+++ b/components/timers/alarm_timer_unittest.cc
@@ -4,6 +4,8 @@
#include <sys/timerfd.h>
+#include <memory>
+
#include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/macros.h"
@@ -57,7 +59,7 @@
bool* did_run_;
const base::TimeDelta delay_;
- scoped_ptr<timers::OneShotAlarmTimer> timer_;
+ std::unique_ptr<timers::OneShotAlarmTimer> timer_;
DISALLOW_COPY_AND_ASSIGN(OneShotAlarmTimerTester);
};
@@ -85,7 +87,7 @@
bool* did_run_;
const base::TimeDelta delay_;
- scoped_ptr<timers::OneShotAlarmTimer> timer_;
+ std::unique_ptr<timers::OneShotAlarmTimer> timer_;
DISALLOW_COPY_AND_ASSIGN(OneShotSelfDeletingAlarmTimerTester);
};
@@ -116,7 +118,7 @@
bool* did_run_;
const base::TimeDelta delay_;
int counter_;
- scoped_ptr<timers::RepeatingAlarmTimer> timer_;
+ std::unique_ptr<timers::RepeatingAlarmTimer> timer_;
DISALLOW_COPY_AND_ASSIGN(RepeatingAlarmTimerTester);
};