Mark some disabled tests as flaky to increase test coverage.

base/timer_unittest.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/message_loop.h"
 #include "base/scoped_ptr.h"
 #include "base/task.h"
 #include "base/timer.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 300 matching lines @@
   RunTest_DelayTimer_NoCall(MessageLoop::TYPE_UI);
   RunTest_DelayTimer_NoCall(MessageLoop::TYPE_IO);
 }
 
 TEST(TimerTest, DelayTimer_OneCall) {
   RunTest_DelayTimer_OneCall(MessageLoop::TYPE_DEFAULT);
   RunTest_DelayTimer_OneCall(MessageLoop::TYPE_UI);
   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);
 }
 
 TEST(TimerTest, DelayTimer_Deleted) {
   RunTest_DelayTimer_Deleted(MessageLoop::TYPE_DEFAULT);
   RunTest_DelayTimer_Deleted(MessageLoop::TYPE_UI);
   RunTest_DelayTimer_Deleted(MessageLoop::TYPE_IO);
 }
@@ skipping 11 matching lines @@
     OneShotTimerTester d(&did_run);
     {
       MessageLoop loop(MessageLoop::TYPE_DEFAULT);
       a.Start();
       b.Start();
     }  // MessageLoop destructs by falling out of scope.
   }  // OneShotTimers destruct.  SHOULD NOT CRASH, of course.
 
   EXPECT_EQ(false, did_run);
 }