diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-05-11 20:53:37 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-05-16 13:54:48 +0100 |
| commit | 21d179b334e59e9a3bfcaed4c4430bef1bc5759d (patch) | |
| tree | 64e2bb6da27af6a5c93ca34f6051584aafbfcb9e /base/watchdog_unittest.cc | |
| parent | 0c63f00edd6ed0482fd5cbcea937ca088baf7858 (diff) | |
| download | external_chromium-21d179b334e59e9a3bfcaed4c4430bef1bc5759d.zip external_chromium-21d179b334e59e9a3bfcaed4c4430bef1bc5759d.tar.gz external_chromium-21d179b334e59e9a3bfcaed4c4430bef1bc5759d.tar.bz2 | |
Merge Chromium at 10.0.621.0: Initial merge by git.
Change-Id: I070cc91c608dfa4a968a5a54c173260765ac8097
Diffstat (limited to 'base/watchdog_unittest.cc')
| -rw-r--r-- | base/watchdog_unittest.cc | 2 |
1 files changed, 1 insertions, 1 deletions
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. |