Add //mojo/edk/platform/thread_utils.* containing "yield" and "sleep".

mojo/edk/system/waiter_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // NOTE(vtl): Some of these tests are inherently flaky (e.g., if run on a
 // heavily-loaded system). Sorry. |test::EpsilonTimeout()| may be increased to
 // increase tolerance and reduce observed flakiness (though doing so reduces the
 // meaningfulness of the test).
 
 #include "mojo/edk/system/waiter.h"
 
 #include <stdint.h>
 
+#include "mojo/edk/platform/thread_utils.h"
 #include "mojo/edk/system/test/simple_test_thread.h"
-#include "mojo/edk/system/test/sleep.h"
 #include "mojo/edk/system/test/stopwatch.h"
 #include "mojo/edk/system/test/timeouts.h"
 #include "mojo/edk/util/mutex.h"
 #include "mojo/public/cpp/system/macros.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using mojo::platform::ThreadSleep;
 using mojo::util::Mutex;
 using mojo::util::MutexLocker;
 
 namespace mojo {
 namespace system {
 namespace {
 
 const unsigned kPollTimeMs = 10;
 
 class WaitingThread : public test::SimpleTestThread {
@@ skipping 15 matching lines @@
       {
         MutexLocker locker(&mutex_);
         if (done_) {
           *result = result_;
           *context = context_;
           *elapsed = elapsed_;
           break;
         }
       }
 
-      test::SleepMilliseconds(kPollTimeMs);
+      ThreadSleep(test::DeadlineFromMilliseconds(kPollTimeMs));
     }
   }
 
   Waiter* waiter() { return &waiter_; }
 
  private:
   void Run() override {
     test::Stopwatch stopwatch;
     MojoResult result;
     uint32_t context = static_cast<uint32_t>(-1);
@@ skipping 50 matching lines @@
     thread.WaitUntilDone(&result, &context, &elapsed);
     EXPECT_EQ(MOJO_RESULT_CANCELLED, result);
     EXPECT_EQ(2u, context);
     EXPECT_LT(elapsed, test::EpsilonTimeout());
   }
 
   // Awake some time after thread start.
   {
     WaitingThread thread(10 * test::EpsilonTimeout());
     thread.Start();
-    test::Sleep(2 * test::EpsilonTimeout());
+    ThreadSleep(2 * test::EpsilonTimeout());
     thread.waiter()->Awake(1, 3);
     thread.WaitUntilDone(&result, &context, &elapsed);
     EXPECT_EQ(1u, result);
     EXPECT_EQ(3u, context);
     EXPECT_GT(elapsed, (2 - 1) * test::EpsilonTimeout());
     EXPECT_LT(elapsed, (2 + 1) * test::EpsilonTimeout());
   }
 
   // Awake some longer time after thread start.
   {
     WaitingThread thread(10 * test::EpsilonTimeout());
     thread.Start();
-    test::Sleep(5 * test::EpsilonTimeout());
+    ThreadSleep(5 * test::EpsilonTimeout());
     thread.waiter()->Awake(2, 4);
     thread.WaitUntilDone(&result, &context, &elapsed);
     EXPECT_EQ(2u, result);
     EXPECT_EQ(4u, context);
     EXPECT_GT(elapsed, (5 - 1) * test::EpsilonTimeout());
     EXPECT_LT(elapsed, (5 + 1) * test::EpsilonTimeout());
   }
 
   // Don't awake -- time out (on another thread).
   {
@@ skipping 27 matching lines @@
     thread.WaitUntilDone(&result, &context, &elapsed);
     EXPECT_EQ(MOJO_RESULT_CANCELLED, result);
     EXPECT_EQ(6u, context);
     EXPECT_LT(elapsed, test::EpsilonTimeout());
   }
 
   // Awake some time after thread start.
   {
     WaitingThread thread(MOJO_DEADLINE_INDEFINITE);
     thread.Start();
-    test::Sleep(2 * test::EpsilonTimeout());
+    ThreadSleep(2 * test::EpsilonTimeout());
     thread.waiter()->Awake(1, 7);
     thread.WaitUntilDone(&result, &context, &elapsed);
     EXPECT_EQ(1u, result);
     EXPECT_EQ(7u, context);
     EXPECT_GT(elapsed, (2 - 1) * test::EpsilonTimeout());
     EXPECT_LT(elapsed, (2 + 1) * test::EpsilonTimeout());
   }
 
   // Awake some longer time after thread start.
   {
     WaitingThread thread(MOJO_DEADLINE_INDEFINITE);
     thread.Start();
-    test::Sleep(5 * test::EpsilonTimeout());
+    ThreadSleep(5 * test::EpsilonTimeout());
     thread.waiter()->Awake(2, 8);
     thread.WaitUntilDone(&result, &context, &elapsed);
     EXPECT_EQ(2u, result);
     EXPECT_EQ(8u, context);
     EXPECT_GT(elapsed, (5 - 1) * test::EpsilonTimeout());
     EXPECT_LT(elapsed, (5 + 1) * test::EpsilonTimeout());
   }
 }
 
 TEST(WaiterTest, TimeOut) {
@@ skipping 54 matching lines @@
     thread.WaitUntilDone(&result, &context, &elapsed);
     EXPECT_EQ(1u, result);
     EXPECT_EQ(3u, context);
     EXPECT_LT(elapsed, test::EpsilonTimeout());
   }
 
   {
     WaitingThread thread(MOJO_DEADLINE_INDEFINITE);
     thread.Start();
     thread.waiter()->Awake(10, 5);
-    test::Sleep(2 * test::EpsilonTimeout());
+    ThreadSleep(2 * test::EpsilonTimeout());
     thread.waiter()->Awake(20, 6);
     thread.WaitUntilDone(&result, &context, &elapsed);
     EXPECT_EQ(10u, result);
     EXPECT_EQ(5u, context);
     EXPECT_LT(elapsed, test::EpsilonTimeout());
   }
 
   {
     WaitingThread thread(10 * test::EpsilonTimeout());
     thread.Start();
-    test::Sleep(1 * test::EpsilonTimeout());
+    ThreadSleep(1 * test::EpsilonTimeout());
     thread.waiter()->Awake(MOJO_RESULT_FAILED_PRECONDITION, 7);
-    test::Sleep(2 * test::EpsilonTimeout());
+    ThreadSleep(2 * test::EpsilonTimeout());
     thread.waiter()->Awake(MOJO_RESULT_OK, 8);
     thread.WaitUntilDone(&result, &context, &elapsed);
     EXPECT_EQ(MOJO_RESULT_FAILED_PRECONDITION, result);
     EXPECT_EQ(7u, context);
     EXPECT_GT(elapsed, (1 - 1) * test::EpsilonTimeout());
     EXPECT_LT(elapsed, (1 + 1) * test::EpsilonTimeout());
   }
 }
 
 }  // namespace
 }  // namespace system
 }  // namespace mojo