commit df62e3171ca52cbdadb3c3edc93c42cfacbad054
author Elliott Hughes <enh@google.com> Sat Oct 03 16:29:55 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sat Oct 03 16:29:55 2015 +0000
tree 3defa1eb4d3a31417387dfb46e191dc34caeb498
parent ee9dea83fbaf2261066fbb20e5942c147018c949
parent 5c50449b0c098cb8191fe3f7791e91a7ec4f7029

am 5c50449b: Merge "Use const auto& in for loops."

* commit '5c50449b0c098cb8191fe3f7791e91a7ec4f7029':
  Use const auto& in for loops.

tests/time_test.cpp

diff --git a/tests/time_test.cpp b/tests/time_test.cpp
index 052997a..c685e94 100644
--- a/tests/time_test.cpp
+++ b/tests/time_test.cpp
@@ -296,8 +296,8 @@
   Counter counter(Counter::CountAndDisarmNotifyFunction);
   ASSERT_EQ(0, counter.Value());
 
-  counter.SetTime(0, 1, 1, 0);
-  usleep(500000);
+  counter.SetTime(0, 500000000, 1, 0);
+  sleep(1);
 
   // The count should just be 1 because we disarmed the timer the first time it fired.
   ASSERT_EQ(1, counter.Value());
@@ -381,8 +381,8 @@
   ASSERT_EQ(0, counter2.Value());
   ASSERT_EQ(0, counter3.Value());
 
-  counter2.SetTime(0, 1, 0, 0);
-  usleep(500000);
+  counter2.SetTime(0, 500000000, 0, 0);
+  sleep(1);
 
   EXPECT_EQ(0, counter1.Value());
   EXPECT_EQ(1, counter2.Value());