Revert "EDK: Move //mojo/edk/system/waitable_event* to edk/util."

mojo/edk/util/cond_var_unittest.cc

 // Copyright 2015 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/util/cond_var.h"
 
 #include <stdint.h>
 #include <stdlib.h>
 
 #include <thread>
 #include <type_traits>
 #include <vector>
 
 #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::system::test::DeadlineFromMilliseconds;
-using mojo::system::test::EpsilonTimeout;
-using mojo::system::test::SleepMilliseconds;
-using mojo::system::test::Stopwatch;
-using mojo::system::test::TinyTimeout;
-
 namespace mojo {
 namespace util {
 namespace {
 
 // Sleeps for a "very small" amount of time.
 void EpsilonRandomSleep() {
-  SleepMilliseconds(static_cast<unsigned>(rand()) % 20u);
+  system::test::SleepMilliseconds(static_cast<unsigned>(rand()) % 20u);
 }
 
 // We'll use |MojoDeadline| with |uint64_t| (for |CondVar::WaitWithTimeout()|'s
 // timeout argument), though note that |WaitWithTimeout()| doesn't support
 // |MOJO_DEADLINE_INDEFINITE|.
 static_assert(std::is_same<uint64_t, MojoDeadline>::value,
               "MojoDeadline isn't uint64_t!");
 
 TEST(CondVarTest, Basic) {
   // Create/destroy.
@@ skipping 11 matching lines @@
     Mutex mu;
     CondVar cv;
 
     MutexLocker locker(&mu);
 
     // Note: Theoretically, pthreads is allowed to wake us up spuriously, in
     // which case |WaitWithTimeout()| would return false. (This would also
     // happen if we're interrupted, e.g., by ^Z.)
     EXPECT_TRUE(cv.WaitWithTimeout(&mu, 0));
     mu.AssertHeld();
-    EXPECT_TRUE(cv.WaitWithTimeout(&mu, DeadlineFromMilliseconds(1)));
+    EXPECT_TRUE(
+        cv.WaitWithTimeout(&mu, system::test::DeadlineFromMilliseconds(1)));
     mu.AssertHeld();
   }
 
   // Wait using |Wait()| or |WaitWithTimeout()|, to be signaled by |Signal()| or
   // |SignalAll()|.
   for (size_t i = 0; i < 30; i++) {
     Mutex mu;
     CondVar cv;
     bool condition = false;
 
@@ skipping 11 matching lines @@
     EpsilonRandomSleep();
 
     MutexLocker locker(&mu);
     if (rand() % 2 == 0) {
       while (!condition) {
         cv.Wait(&mu);
         mu.AssertHeld();
       }
     } else {
       while (!condition) {
-        EXPECT_FALSE(cv.WaitWithTimeout(&mu, TinyTimeout()));
+        EXPECT_FALSE(cv.WaitWithTimeout(&mu, system::test::TinyTimeout()));
         mu.AssertHeld();
       }
     }
 
     thread.join();
   }
 }
 
 TEST(CondVarTest, SignalAll) {
   Mutex mu;
   CondVar cv;
   bool condition = false;
 
   for (size_t i = 0; i < 10; i++) {
     for (size_t num_waiters = 1; num_waiters < 5; num_waiters++) {
       std::vector<std::thread> threads;
       for (size_t j = 0; j < num_waiters; j++) {
         threads.push_back(std::thread([&mu, &cv, &condition]() {
           EpsilonRandomSleep();
 
           MutexLocker locker(&mu);
           if (rand() % 2 == 0) {
             while (!condition) {
               cv.Wait(&mu);
               mu.AssertHeld();
             }
           } else {
             while (!condition) {
-              EXPECT_FALSE(cv.WaitWithTimeout(&mu, TinyTimeout()));
+              EXPECT_FALSE(
+                  cv.WaitWithTimeout(&mu, system::test::TinyTimeout()));
               mu.AssertHeld();
             }
           }
         }));
       }
 
       EpsilonRandomSleep();
 
       {
         MutexLocker locker(&mu);
         condition = true;
         cv.SignalAll();
       }
 
       for (auto& thread : threads)
         thread.join();
     }
   }
 }
 
 TEST(CondVarTest, Timeouts) {
   static const unsigned kTestTimeoutsMs[] = {0, 10, 20, 40, 80, 160};
 
-  Stopwatch stopwatch;
+  system::test::Stopwatch stopwatch;
 
   Mutex mu;
   CondVar cv;
 
   MutexLocker locker(&mu);
 
   for (size_t i = 0; i < MOJO_ARRAYSIZE(kTestTimeoutsMs); i++) {
-    uint64_t timeout = DeadlineFromMilliseconds(kTestTimeoutsMs[i]);
+    uint64_t timeout =
+        system::test::DeadlineFromMilliseconds(kTestTimeoutsMs[i]);
 
     stopwatch.Start();
     // See note in CondVarTest.Basic about spurious wakeups.
     EXPECT_TRUE(cv.WaitWithTimeout(&mu, timeout));
     MojoDeadline elapsed = stopwatch.Elapsed();
 
     // It should time out after *at least* the specified amount of time.
     EXPECT_GE(elapsed, timeout);
     // But we expect that it should time out soon after that amount of time.
-    EXPECT_LT(elapsed, timeout + EpsilonTimeout());
+    EXPECT_LT(elapsed, timeout + system::test::EpsilonTimeout());
   }
 }
 
 // TODO(vtl): Test that |Signal()| (usually) wakes only one waiter.
 
 }  // namespace
 }  // namespace util
 }  // namespace mojo