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

mojo/edk/system/raw_channel_unittest.cc

 // Copyright 2014 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.
 
 #include "mojo/edk/system/raw_channel.h"
 
 #include <stdint.h>
 #include <stdio.h>
 
 #include <memory>
 #include <utility>
 #include <vector>
 
 #include "base/logging.h"
 #include "mojo/edk/embedder/platform_channel_pair.h"
 #include "mojo/edk/platform/platform_handle.h"
 #include "mojo/edk/platform/scoped_platform_handle.h"
+#include "mojo/edk/platform/thread_utils.h"
 #include "mojo/edk/system/message_in_transit.h"
 #include "mojo/edk/system/test/random.h"
 #include "mojo/edk/system/test/scoped_test_dir.h"
 #include "mojo/edk/system/test/simple_test_thread.h"
-#include "mojo/edk/system/test/sleep.h"
 #include "mojo/edk/system/test/test_io_thread.h"
+#include "mojo/edk/system/test/timeouts.h"
 #include "mojo/edk/system/transport_data.h"
 #include "mojo/edk/test/test_utils.h"
 #include "mojo/edk/util/make_unique.h"
 #include "mojo/edk/util/mutex.h"
 #include "mojo/edk/util/scoped_file.h"
 #include "mojo/edk/util/waitable_event.h"
 #include "mojo/public/cpp/system/macros.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using mojo::platform::PlatformHandle;
 using mojo::platform::ScopedPlatformHandle;
+using mojo::platform::ThreadSleep;
 using mojo::util::AutoResetWaitableEvent;
 using mojo::util::MakeUnique;
 using mojo::util::Mutex;
 using mojo::util::MutexLocker;
 
 namespace mojo {
 namespace system {
 namespace {
 
 std::unique_ptr<MessageInTransit> MakeTestMessage(uint32_t num_bytes) {
@@ skipping 121 matching lines @@
 
           // Erase message data.
           bytes_.erase(bytes_.begin(),
                        bytes_.begin() + message_view.main_buffer_size());
           return rv;
         }
       }
 
       if (static_cast<size_t>(read_size) < sizeof(buffer)) {
         i++;
-        test::SleepMilliseconds(kMessageReaderSleepMs);
+        ThreadSleep(test::DeadlineFromMilliseconds(kMessageReaderSleepMs));
       }
     }
 
     LOG(ERROR) << "Too many iterations.";
     return false;
   }
 
  private:
   const PlatformHandle handle_;
 
@@ skipping 206 matching lines @@
     for (size_t i = 0; i < kNumWriterThreads; i++) {
       writer_threads.push_back(MakeUnique<RawChannelWriterThread>(
           writer_rc.get(), kNumWriteMessagesPerThread));
     }
     for (size_t i = 0; i < writer_threads.size(); i++)
       writer_threads[i]->Start();
   }  // Joins all the writer threads.
 
   // Sleep a bit, to let any extraneous reads be processed. (There shouldn't be
   // any, but we want to know about them.)
-  test::SleepMilliseconds(100u);
+  ThreadSleep(test::DeadlineFromMilliseconds(100u));
 
   // Wait for reading to finish.
   reader_delegate.Wait();
 
   io_thread()->PostTaskAndWait([&reader_rc]() { reader_rc->Shutdown(); });
 
   io_thread()->PostTaskAndWait([&writer_rc]() { writer_rc->Shutdown(); });
 }
 
 // RawChannelTest.OnError ------------------------------------------------------
@@ skipping 67 matching lines @@
   // We should get a write error.
   delegate.WaitForWriteError();
 
   // We should also get a read error.
   delegate.WaitForReadError();
 
   EXPECT_FALSE(rc->WriteMessage(MakeTestMessage(2)));
 
   // Sleep a bit, to make sure we don't get another |OnError()|
   // notification. (If we actually get another one, |OnError()| crashes.)
-  test::SleepMilliseconds(20u);
+  ThreadSleep(test::DeadlineFromMilliseconds(20u));
 
   io_thread()->PostTaskAndWait([&rc]() { rc->Shutdown(); });
 }
 
 // RawChannelTest.ReadUnaffectedByWriteError -----------------------------------
 
 TEST_F(RawChannelTest, ReadUnaffectedByWriteError) {
   const size_t kMessageCount = 5;
 
   // Write a few messages into the other end.
@@ skipping 336 matching lines @@
 
   read_delegate.Wait();
 
   io_thread()->PostTaskAndWait([&rc_read]() { rc_read->Shutdown(); });
   io_thread()->PostTaskAndWait([&rc_write]() { rc_write->Shutdown(); });
 }
 
 }  // namespace
 }  // namespace system
 }  // namespace mojo