From 21d179b334e59e9a3bfcaed4c4430bef1bc5759d Mon Sep 17 00:00:00 2001 From: Kristian Monsen Date: Wed, 11 May 2011 20:53:37 +0100 Subject: Merge Chromium at 10.0.621.0: Initial merge by git. Change-Id: I070cc91c608dfa4a968a5a54c173260765ac8097 --- base/watchdog_unittest.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'base/watchdog_unittest.cc') diff --git a/base/watchdog_unittest.cc b/base/watchdog_unittest.cc index 19dfe28..658a31a 100644 --- a/base/watchdog_unittest.cc +++ b/base/watchdog_unittest.cc @@ -86,7 +86,7 @@ TEST_F(WatchdogTest, AlarmTest) { // Make sure a basic alarm fires when the time has expired. TEST_F(WatchdogTest, AlarmPriorTimeTest) { - WatchdogCounter watchdog(TimeDelta::TimeDelta(), "Enabled2", true); + WatchdogCounter watchdog(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. -- cgit v1.1