| Index: base/timer_unittest.cc
|
| diff --git a/base/timer_unittest.cc b/base/timer_unittest.cc
|
| index 74c6a6630742891fd9979faab9c3c8fe4db2dfab..8c18947b9b130910cf5d461e85d99214ebdd9e7c 100644
|
| --- a/base/timer_unittest.cc
|
| +++ b/base/timer_unittest.cc
|
| @@ -318,9 +318,8 @@ TEST(TimerTest, DelayTimer_OneCall) {
|
| RunTest_DelayTimer_OneCall(MessageLoop::TYPE_IO);
|
| }
|
|
|
| -// Disabled because it's flaky on the buildbot. Bug not filed because this
|
| -// kind of test is difficult to make not-flaky on buildbots.
|
| -TEST(TimerTest, DISABLED_DelayTimer_Reset) {
|
| +// It's flaky on the buildbot, http://crbug.com/25038.
|
| +TEST(TimerTest, FLAKY_DelayTimer_Reset) {
|
| RunTest_DelayTimer_Reset(MessageLoop::TYPE_DEFAULT);
|
| RunTest_DelayTimer_Reset(MessageLoop::TYPE_UI);
|
| RunTest_DelayTimer_Reset(MessageLoop::TYPE_IO);
|
|
|