commit 8e3f1263218c5046d2281c1d1d3c886acda85b47
author Gilad Arnold <garnold@chromium.org> Tue Jan 08 14:59:54 2013 -0800
committer ChromeBot <chrome-bot@google.com> Wed Jan 09 19:01:48 2013 -0800
tree 55d2348084f8f60e142fe13b75b49553e70153d4
parent bf7919ba5ecd58a6a03afdca8ff88caebd25581d

AU: replace sleep/usleep with g_usleep

Also deploying 'using base::TimeDelta' where it is useful.

BUG=chromium-os:33541
TEST=Passes unit tests; update runs on x86-alex

Change-Id: I9478d46d0796b13789878393e3a4086564124d33
Reviewed-on: https://gerrit.chromium.org/gerrit/40904
Commit-Queue: Gilad Arnold <garnold@chromium.org>
Reviewed-by: Gilad Arnold <garnold@chromium.org>
Tested-by: Gilad Arnold <garnold@chromium.org>

subprocess_unittest.cc

diff --git a/subprocess_unittest.cc b/subprocess_unittest.cc
index ae67fbb..d23040d 100644
--- a/subprocess_unittest.cc
+++ b/subprocess_unittest.cc
@@ -5,16 +5,21 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
+
 #include <string>
 #include <vector>
-#include "base/string_util.h"
+
+#include <base/string_util.h>
 #include <base/stringprintf.h>
+#include <base/time.h>
 #include <glib.h>
 #include <gtest/gtest.h>
+
 #include "update_engine/subprocess.h"
 #include "update_engine/test_utils.h"
 #include "update_engine/utils.h"
 
+using base::TimeDelta;
 using std::string;
 using std::vector;
 
@@ -114,8 +119,9 @@
   cancel_test_data->spawned = true;
   printf("spawned\n");
   // Wait for server to be up and running
-  useconds_t total_wait_time = 0;
-  const useconds_t kMaxWaitTime = 3 * 1000000;  // 3 seconds
+  TimeDelta total_wait_time;
+  const TimeDelta kSleepTime = TimeDelta::FromMilliseconds(100);
+  const TimeDelta kMaxWaitTime = TimeDelta::FromSeconds(3);
   for (;;) {
     int status =
         System(StringPrintf("wget -O /dev/null http://127.0.0.1:%d/foo",
@@ -126,10 +132,9 @@
     if (0 == WEXITSTATUS(status))
       break;
 
-    const useconds_t kSleepTime = 100 * 1000;  // 100ms
-    usleep(kSleepTime);  // 100 ms
+    g_usleep(kSleepTime.InMicroseconds());
     total_wait_time += kSleepTime;
-    CHECK_LT(total_wait_time, kMaxWaitTime);
+    CHECK_LT(total_wait_time.InMicroseconds(), kMaxWaitTime.InMicroseconds());
   }
   Subprocess::Get().CancelExec(tag);
   return FALSE;