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

mojo/edk/system/endpoint_relayer_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/system/endpoint_relayer.h"
 
 #include "base/logging.h"
 #include "mojo/edk/system/channel_endpoint_id.h"
 #include "mojo/edk/system/channel_test_base.h"
 #include "mojo/edk/system/message_in_transit_queue.h"
 #include "mojo/edk/system/message_in_transit_test_utils.h"
 #include "mojo/edk/system/test/timeouts.h"
 #include "mojo/edk/system/test_channel_endpoint_client.h"
+#include "mojo/edk/system/waitable_event.h"
 #include "mojo/edk/util/make_unique.h"
 #include "mojo/edk/util/ref_ptr.h"
-#include "mojo/edk/util/waitable_event.h"
 #include "mojo/public/cpp/system/macros.h"
 
 using mojo::util::MakeRefCounted;
-using mojo::util::ManualResetWaitableEvent;
 using mojo::util::RefPtr;
 
 namespace mojo {
 namespace system {
 namespace {
 
 class EndpointRelayerTest : public test::ChannelTestBase {
  public:
   EndpointRelayerTest() {}
   ~EndpointRelayerTest() override {}
@@ skipping 198 matching lines @@
     ASSERT_TRUE(message);
     test::VerifyTestMessage(message.get(), message_id);
   }
 }
 
 // TODO(vtl): Add some "shutdown" tests.
 
 }  // namespace
 }  // namespace system
 }  // namespace mojo