Break up unit test to avoid internal timing interactions between parts....

base/watchdog_unittest.cc

Index: base/watchdog_unittest.cc
===================================================================
--- base/watchdog_unittest.cc	(revision 11750)
+++ base/watchdog_unittest.cc	(working copy)
@@ -75,14 +75,18 @@
   SPIN_FOR_TIMEDELTA_OR_UNTIL_TRUE(TimeDelta::FromMinutes(5),
                                    watchdog.alarm_counter() > 0);
   EXPECT_EQ(1, watchdog.alarm_counter());
+}
 
-  // Set a time greater than the timeout into the past.
+// Make sure a basic alarm fires when the time has expired.

[wtc, 2009/06/04 23:14:24]

This comment should show how AlarmPriorTimeTest differs from
AlarmTest.  This comment is exactly the same as the comment on
line 71!

+TEST(WatchdogTest, AlarmPriorTimeTest) {
+  WatchdogCounter watchdog(TimeDelta::TimeDelta(), "Enabled2", true);

[wtc, 2009/06/04 23:14:24]

Why is the first argument TimeDelta::TimeDelta() instead
of TimeDelta::FromMilliseconds(10) or something like that?

Why can't this watchdog be named "Enabled"?  You didn't
changed the "Enabled" names in StartupShutdownTest and
ArmDisarmTest.

+  // Set a time in the past.
   watchdog.ArmSomeTimeDeltaAgo(TimeDelta::FromSeconds(2));
   // It should instantly go off, but certainly in less than 5 minutes.
   SPIN_FOR_TIMEDELTA_OR_UNTIL_TRUE(TimeDelta::FromMinutes(5),
-                                   watchdog.alarm_counter() > 1);
+                                   watchdog.alarm_counter() > 0);
 
-  EXPECT_EQ(2, watchdog.alarm_counter());
+  EXPECT_EQ(1, watchdog.alarm_counter());
 }
 
 // Make sure a disable alarm does nothing, even if we arm it.
@@ -96,7 +100,7 @@
 
 // Make sure Disarming will prevent firing, even after Arming.
 TEST(WatchdogTest, DisarmTest) {
-  WatchdogCounter watchdog(TimeDelta::FromSeconds(5), "Enabled", true);
+  WatchdogCounter watchdog(TimeDelta::FromSeconds(5), "Enabled3", true);
   watchdog.Arm();
   PlatformThread::Sleep(100);  // Don't sleep too long
   watchdog.Disarm();