Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(234)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: components/timers/alarm_timer_unittest.cc

Issue 706993003: C++ readability review (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: reorder Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« components/timers/alarm_timer.cc ('K') | « components/timers/alarm_timer.cc ('k') | components/timers/rtc_alarm.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/timers/alarm_timer_unittest.cc
diff --git a/components/timers/alarm_timer_unittest.cc b/components/timers/alarm_timer_unittest.cc
index efa88d4229e813c28e5b991b915cc4492836a99a..cc071f9cb22a442d9bd200c61354a9fbba30300d 100644
--- a/components/timers/alarm_timer_unittest.cc
+++ b/components/timers/alarm_timer_unittest.cc
@@ -24,10 +24,10 @@ namespace timers {
namespace {
// The message loops on which each timer should be tested.
const base::MessageLoop::Type testing_message_loops[] = {
- base::MessageLoop::TYPE_DEFAULT,
- base::MessageLoop::TYPE_IO,
+ base::MessageLoop::TYPE_DEFAULT,
+ base::MessageLoop::TYPE_IO,
#if !defined(OS_IOS) // iOS does not allow direct running of the UI loop.
- base::MessageLoop::TYPE_UI,
+ base::MessageLoop::TYPE_UI,
#endif
};
@@ -39,13 +39,10 @@ class OneShotAlarmTimerTester {
OneShotAlarmTimerTester(bool* did_run, base::TimeDelta delay)
: did_run_(did_run),
delay_(delay),
- timer_(new timers::AlarmTimer(false, false)) {
- }
+ timer_(new timers::OneShotAlarmTimer()) {}
void Start() {
- timer_->Start(FROM_HERE,
- delay_,
- base::Bind(&OneShotAlarmTimerTester::Run,
- base::Unretained(this)));
+ timer_->Start(FROM_HERE, delay_, base::Bind(&OneShotAlarmTimerTester::Run,
+ base::Unretained(this)));
}
private:
@@ -58,7 +55,7 @@ class OneShotAlarmTimerTester {
bool* did_run_;
const base::TimeDelta delay_;
- scoped_ptr<timers::AlarmTimer> timer_;
+ scoped_ptr<timers::OneShotAlarmTimer> timer_;
DISALLOW_COPY_AND_ASSIGN(OneShotAlarmTimerTester);
};
@@ -68,11 +65,9 @@ class OneShotSelfDeletingAlarmTimerTester {
OneShotSelfDeletingAlarmTimerTester(bool* did_run, base::TimeDelta delay)
: did_run_(did_run),
delay_(delay),
- timer_(new timers::AlarmTimer(false, false)) {
- }
+ timer_(new timers::OneShotAlarmTimer()) {}
void Start() {
- timer_->Start(FROM_HERE,
- delay_,
+ timer_->Start(FROM_HERE, delay_,
base::Bind(&OneShotSelfDeletingAlarmTimerTester::Run,
base::Unretained(this)));
}
@@ -88,7 +83,7 @@ class OneShotSelfDeletingAlarmTimerTester {
bool* did_run_;
const base::TimeDelta delay_;
- scoped_ptr<timers::AlarmTimer> timer_;
+ scoped_ptr<timers::OneShotAlarmTimer> timer_;
DISALLOW_COPY_AND_ASSIGN(OneShotSelfDeletingAlarmTimerTester);
};
@@ -99,13 +94,10 @@ class RepeatingAlarmTimerTester {
: did_run_(did_run),
delay_(delay),
counter_(10),
- timer_(new timers::AlarmTimer(true, true)) {
- }
+ timer_(new timers::RepeatingAlarmTimer()) {}
void Start() {
- timer_->Start(FROM_HERE,
- delay_,
- base::Bind(&RepeatingAlarmTimerTester::Run,
- base::Unretained(this)));
+ timer_->Start(FROM_HERE, delay_, base::Bind(&RepeatingAlarmTimerTester::Run,
+ base::Unretained(this)));
}
private:
@@ -122,7 +114,7 @@ class RepeatingAlarmTimerTester {
bool* did_run_;
const base::TimeDelta delay_;
int counter_;
- scoped_ptr<timers::AlarmTimer> timer_;
+ scoped_ptr<timers::RepeatingAlarmTimer> timer_;
DISALLOW_COPY_AND_ASSIGN(RepeatingAlarmTimerTester);
};
@@ -144,8 +136,8 @@ void RunTest_OneShotAlarmTimer_Cancel(
base::MessageLoop loop(message_loop_type);
bool did_run_a = false;
- OneShotAlarmTimerTester* a = new OneShotAlarmTimerTester(&did_run_a,
- kTenMilliseconds);
+ OneShotAlarmTimerTester* a =
+ new OneShotAlarmTimerTester(&did_run_a, kTenMilliseconds);
// This should run before the timer expires.
base::MessageLoop::current()->DeleteSoon(FROM_HERE, a);
@@ -190,12 +182,13 @@ void RunTest_RepeatingAlarmTimer(base::MessageLoop::Type message_loop_type,
}
void RunTest_RepeatingAlarmTimer_Cancel(
- base::MessageLoop::Type message_loop_type, const base::TimeDelta& delay) {
+ base::MessageLoop::Type message_loop_type,
+ const base::TimeDelta& delay) {
base::MessageLoop loop(message_loop_type);
bool did_run_a = false;
- RepeatingAlarmTimerTester* a = new RepeatingAlarmTimerTester(&did_run_a,
- delay);
+ RepeatingAlarmTimerTester* a =
+ new RepeatingAlarmTimerTester(&did_run_a, delay);
// This should run before the timer expires.
base::MessageLoop::current()->DeleteSoon(FROM_HERE, a);
@@ -241,8 +234,7 @@ TEST(AlarmTimerTest, OneShotSelfDeletingAlarmTimer) {
TEST(AlarmTimerTest, RepeatingAlarmTimer) {
for (int i = 0; i < kNumTestingMessageLoops; i++) {
- RunTest_RepeatingAlarmTimer(testing_message_loops[i],
- kTenMilliseconds);
+ RunTest_RepeatingAlarmTimer(testing_message_loops[i], kTenMilliseconds);
}
}
@@ -283,7 +275,7 @@ TEST(AlarmTimerTest, MessageLoopShutdown) {
a.Start();
b.Start();
} // MessageLoop destructs by falling out of scope.
- } // OneShotTimers destruct. SHOULD NOT CRASH, of course.
+ } // OneShotTimers destruct. SHOULD NOT CRASH, of course.
EXPECT_FALSE(did_run);
}
@@ -291,7 +283,7 @@ TEST(AlarmTimerTest, MessageLoopShutdown) {
TEST(AlarmTimerTest, NonRepeatIsRunning) {
{
base::MessageLoop loop;
- timers::AlarmTimer timer(false, false);
+ timers::OneShotAlarmTimer timer;
EXPECT_FALSE(timer.IsRunning());
timer.Start(FROM_HERE, base::TimeDelta::FromDays(1),
base::Bind(&base::DoNothing));
@@ -302,7 +294,7 @@ TEST(AlarmTimerTest, NonRepeatIsRunning) {
}
{
- timers::AlarmTimer timer(true, false);
+ timers::SimpleAlarmTimer timer;
base::MessageLoop loop;
EXPECT_FALSE(timer.IsRunning());
timer.Start(FROM_HERE, base::TimeDelta::FromDays(1),
@@ -317,7 +309,7 @@ TEST(AlarmTimerTest, NonRepeatIsRunning) {
}
TEST(AlarmTimerTest, NonRepeatMessageLoopDeath) {
- timers::AlarmTimer timer(false, false);
+ timers::OneShotAlarmTimer timer;
{
base::MessageLoop loop;
EXPECT_FALSE(timer.IsRunning());
@@ -331,8 +323,8 @@ TEST(AlarmTimerTest, NonRepeatMessageLoopDeath) {
TEST(AlarmTimerTest, RetainRepeatIsRunning) {
base::MessageLoop loop;
- timers::AlarmTimer timer(FROM_HERE, base::TimeDelta::FromDays(1),
- base::Bind(&base::DoNothing), true);
+ timers::RepeatingAlarmTimer timer(FROM_HERE, base::TimeDelta::FromDays(1),
+ base::Bind(&base::DoNothing));
EXPECT_FALSE(timer.IsRunning());
timer.Reset();
EXPECT_TRUE(timer.IsRunning());
@@ -344,8 +336,8 @@ TEST(AlarmTimerTest, RetainRepeatIsRunning) {
TEST(AlarmTimerTest, RetainNonRepeatIsRunning) {
base::MessageLoop loop;
- timers::AlarmTimer timer(FROM_HERE, base::TimeDelta::FromDays(1),
- base::Bind(&base::DoNothing), false);
+ timers::SimpleAlarmTimer timer(FROM_HERE, base::TimeDelta::FromDays(1),
+ base::Bind(&base::DoNothing));
EXPECT_FALSE(timer.IsRunning());
timer.Reset();
EXPECT_TRUE(timer.IsRunning());
@@ -381,7 +373,7 @@ TEST(AlarmTimerTest, ContinuationStopStart) {
{
ClearAllCallbackHappened();
base::MessageLoop loop;
- timers::AlarmTimer timer(false, false);
+ timers::OneShotAlarmTimer timer;
timer.Start(FROM_HERE, base::TimeDelta::FromMilliseconds(10),
base::Bind(&SetCallbackHappened1));
timer.Stop();
@@ -397,7 +389,7 @@ TEST(AlarmTimerTest, ContinuationReset) {
{
ClearAllCallbackHappened();
base::MessageLoop loop;
- timers::AlarmTimer timer(false, false);
+ timers::OneShotAlarmTimer timer;
timer.Start(FROM_HERE, base::TimeDelta::FromMilliseconds(10),
base::Bind(&SetCallbackHappened1));
timer.Reset();
@@ -410,7 +402,6 @@ TEST(AlarmTimerTest, ContinuationReset) {
} // namespace
-
namespace {
void TimerRanCallback(bool* did_run) {
*did_run = true;
@@ -423,11 +414,11 @@ void RunTest_OneShotTimerConcurrentResetAndTimerFired(
base::MessageLoop::Type message_loop_type) {
base::MessageLoop loop(message_loop_type);
- timers::AlarmTimer timer(false, false);
+ timers::OneShotAlarmTimer timer;
bool did_run = false;
- timer.Start(
- FROM_HERE, kTenMilliseconds, base::Bind(&TimerRanCallback, &did_run));
+ timer.Start(FROM_HERE, kTenMilliseconds,
+ base::Bind(&TimerRanCallback, &did_run));
// Sleep twice as long as the timer to ensure that the timer task gets queued.
base::PlatformThread::Sleep(base::TimeDelta::FromMilliseconds(20));
@@ -452,11 +443,11 @@ void RunTest_RepeatingTimerConcurrentResetAndTimerFired(
base::MessageLoop::Type message_loop_type) {
base::MessageLoop loop(message_loop_type);
- timers::AlarmTimer timer(true, true);
+ timers::RepeatingAlarmTimer timer;
bool did_run = false;
- timer.Start(
- FROM_HERE, kTenMilliseconds, base::Bind(&TimerRanCallback, &did_run));
+ timer.Start(FROM_HERE, kTenMilliseconds,
+ base::Bind(&TimerRanCallback, &did_run));
// Sleep more that three times as long as the timer duration to ensure that
// multiple tasks get queued.
« components/timers/alarm_timer.cc ('K') | « components/timers/alarm_timer.cc ('k') | components/timers/rtc_alarm.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698