| Index: base/spin_wait.h
|
| ===================================================================
|
| --- base/spin_wait.h (revision 3954)
|
| +++ base/spin_wait.h (working copy)
|
| @@ -31,14 +31,15 @@
|
| // that the test passes, even if load varies, and external events vary.
|
|
|
| #define SPIN_FOR_1_SECOND_OR_UNTIL_TRUE(expression) \
|
| - SPIN_FOR_TIMEDELTA_OR_UNTIL_TRUE(TimeDelta::FromSeconds(1), (expression))
|
| + SPIN_FOR_TIMEDELTA_OR_UNTIL_TRUE(base::TimeDelta::FromSeconds(1), \
|
| + (expression))
|
|
|
| #define SPIN_FOR_TIMEDELTA_OR_UNTIL_TRUE(delta, expression) do { \
|
| - Time start = Time::Now(); \
|
| - const TimeDelta kTimeout = delta; \
|
| + base::Time start = base::Time::Now(); \
|
| + const base::TimeDelta kTimeout = delta; \
|
| while(!(expression)) { \
|
| - if (kTimeout < Time::Now() - start) { \
|
| - EXPECT_LE((Time::Now() - start).InMilliseconds(), \
|
| + if (kTimeout < base::Time::Now() - start) { \
|
| + EXPECT_LE((base::Time::Now() - start).InMilliseconds(), \
|
| kTimeout.InMilliseconds()) << "Timed out"; \
|
| break; \
|
| } \
|
| @@ -48,4 +49,3 @@
|
| while(0)
|
|
|
| #endif // BASE_SPIN_WAIT_H__
|
| -
|
|
|