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

mojo/edk/util/ref_counted_perftest.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 <stdint.h>
 
 #include "mojo/edk/system/test/perf_log.h"
 #include "mojo/edk/system/test/stopwatch.h"
 #include "mojo/edk/system/test/timeouts.h"
 #include "mojo/edk/util/ref_counted.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-using mojo::system::test::DeadlineFromMilliseconds;
-using mojo::system::test::LogPerfResult;
-using mojo::system::test::Stopwatch;
-
 namespace mojo {
 namespace util {
 namespace {
 
 class MyClass : public RefCountedThreadSafe<MyClass> {
  public:
   static RefPtr<MyClass> Create() {
     return RefPtr<MyClass>(AdoptRef(new MyClass()));
   }
 
  private:
   friend class RefCountedThreadSafe<MyClass>;
 
   MyClass() {}
   ~MyClass() {}
 };
 
 TEST(RefCountedPerfTest, OneThreadCreateAdoptDestroy) {
   uint64_t iterations = 0;
-  Stopwatch stopwatch;
+  system::test::Stopwatch stopwatch;
   stopwatch.Start();
   do {
     for (size_t i = 0; i < 1000; i++, iterations++) {
       RefPtr<MyClass> x = MyClass::Create();
       x = nullptr;
     }
     iterations++;
-  } while (stopwatch.Elapsed() < DeadlineFromMilliseconds(1000));
+  } while (stopwatch.Elapsed() < system::test::DeadlineFromMilliseconds(1000));
   double elapsed = stopwatch.Elapsed() / 1000000.0;
 
-  LogPerfResult("OneThreadCreateAdoptDestroy", iterations / elapsed,
-                "iterations/s");
+  system::test::LogPerfResult("OneThreadCreateAdoptDestroy",
+                              iterations / elapsed, "iterations/s");
 }
 
 TEST(RefCountedPerfTest, OneThreadAssignRefPtr) {
   RefPtr<MyClass> x = MyClass::Create();
   uint64_t iterations = 0;
-  Stopwatch stopwatch;
+  system::test::Stopwatch stopwatch;
   stopwatch.Start();
   do {
     for (size_t i = 0; i < 1000; i++, iterations++) {
       RefPtr<MyClass> y = x;
     }
     iterations++;
-  } while (stopwatch.Elapsed() < DeadlineFromMilliseconds(1000));
+  } while (stopwatch.Elapsed() < system::test::DeadlineFromMilliseconds(1000));
   double elapsed = stopwatch.Elapsed() / 1000000.0;
 
-  LogPerfResult("OneThreadAssignRefPtr", iterations / elapsed, "iterations/s");
+  system::test::LogPerfResult("OneThreadAssignRefPtr", iterations / elapsed,
+                              "iterations/s");
 }
 
 // TODO(vtl): Add threaded perf tests.
 
 }  // namespace
 }  // namespace util
 }  // namespace mojo