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

Hopefully this will cure teh flaky problem under Valgrind.

I also had to re-read my own code, and so I put in to minor changes to
hopefully make it incrementally easier ot read.  There should be no semantic
changes caused by my coding changes, but the level of nested braces is 
reduced, which makes it easier ot see what is (supposed to be) going on.


r=dank,phajdan
Review URL: http://codereview.chromium.org/42266

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17698 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 8 insertions, 4 deletions

diff --git a/base/watchdog_unittest.cc b/base/watchdog_unittest.cc
index 1bfc09b..698bf9a 100644
--- a/base/watchdog_unittest.cc
+++ b/base/watchdog_unittest.cc
@@ -75,14 +75,18 @@ TEST(WatchdogTest, AlarmTest) {
   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.
+TEST(WatchdogTest, AlarmPriorTimeTest) {
+  WatchdogCounter watchdog(TimeDelta::TimeDelta(), "Enabled2", true);
+  // 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 @@ TEST(WatchdogTest, ConstructorDisabledTest) {
 
 // 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();