| Index: base/timer_unittest.cc
|
| diff --git a/base/timer_unittest.cc b/base/timer_unittest.cc
|
| index bb0eade8162ce210f4d0e80a8b9636ef6292ad2c..b19c6ddee05c0512e8117c0ffc2e5ca4a95370a0 100644
|
| --- a/base/timer_unittest.cc
|
| +++ b/base/timer_unittest.cc
|
| @@ -20,7 +20,7 @@ class OneShotTimerTester {
|
| }
|
| void Start() {
|
| timer_.Start(TimeDelta::FromMilliseconds(delay_ms_), this,
|
| - &OneShotTimerTester::Run);
|
| + &OneShotTimerTester::Run, FROM_HERE);
|
| }
|
| private:
|
| void Run() {
|
| @@ -40,7 +40,7 @@ class OneShotSelfDeletingTimerTester {
|
| }
|
| void Start() {
|
| timer_->Start(TimeDelta::FromMilliseconds(10), this,
|
| - &OneShotSelfDeletingTimerTester::Run);
|
| + &OneShotSelfDeletingTimerTester::Run, FROM_HERE);
|
| }
|
| private:
|
| void Run() {
|
| @@ -60,7 +60,7 @@ class RepeatingTimerTester {
|
|
|
| void Start() {
|
| timer_.Start(TimeDelta::FromMilliseconds(10), this,
|
| - &RepeatingTimerTester::Run);
|
| + &RepeatingTimerTester::Run, FROM_HERE);
|
| }
|
| private:
|
| void Run() {
|
| @@ -177,7 +177,8 @@ void RunTest_DelayTimer_NoCall(MessageLoop::Type message_loop_type) {
|
| // If Delay is never called, the timer shouldn't go off.
|
| DelayTimerTarget target;
|
| base::DelayTimer<DelayTimerTarget> timer(
|
| - TimeDelta::FromMilliseconds(1), &target, &DelayTimerTarget::Signal);
|
| + TimeDelta::FromMilliseconds(1), &target, &DelayTimerTarget::Signal,
|
| + FROM_HERE);
|
|
|
| bool did_run = false;
|
| OneShotTimerTester tester(&did_run);
|
| @@ -192,7 +193,8 @@ void RunTest_DelayTimer_OneCall(MessageLoop::Type message_loop_type) {
|
|
|
| DelayTimerTarget target;
|
| base::DelayTimer<DelayTimerTarget> timer(
|
| - TimeDelta::FromMilliseconds(1), &target, &DelayTimerTarget::Signal);
|
| + TimeDelta::FromMilliseconds(1), &target, &DelayTimerTarget::Signal,
|
| + FROM_HERE);
|
| timer.Reset();
|
|
|
| bool did_run = false;
|
| @@ -226,7 +228,8 @@ void RunTest_DelayTimer_Reset(MessageLoop::Type message_loop_type) {
|
| // If Delay is never called, the timer shouldn't go off.
|
| DelayTimerTarget target;
|
| base::DelayTimer<DelayTimerTarget> timer(
|
| - TimeDelta::FromMilliseconds(50), &target, &DelayTimerTarget::Signal);
|
| + TimeDelta::FromMilliseconds(50), &target, &DelayTimerTarget::Signal,
|
| + FROM_HERE);
|
| timer.Reset();
|
|
|
| ResetHelper reset_helper(&timer, &target);
|
| @@ -234,7 +237,7 @@ void RunTest_DelayTimer_Reset(MessageLoop::Type message_loop_type) {
|
| base::OneShotTimer<ResetHelper> timers[20];
|
| for (size_t i = 0; i < arraysize(timers); ++i) {
|
| timers[i].Start(TimeDelta::FromMilliseconds(i * 10), &reset_helper,
|
| - &ResetHelper::Reset);
|
| + &ResetHelper::Reset, FROM_HERE);
|
| }
|
|
|
| bool did_run = false;
|
| @@ -261,7 +264,7 @@ void RunTest_DelayTimer_Deleted(MessageLoop::Type message_loop_type) {
|
| {
|
| base::DelayTimer<DelayTimerFatalTarget> timer(
|
| TimeDelta::FromMilliseconds(50), &target,
|
| - &DelayTimerFatalTarget::Signal);
|
| + &DelayTimerFatalTarget::Signal, FROM_HERE);
|
| timer.Reset();
|
| }
|
|
|
|
|