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

mojo/edk/system/master_connection_manager.h

 // 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.
 
 #ifndef MOJO_EDK_SYSTEM_MASTER_CONNECTION_MANAGER_H_
 #define MOJO_EDK_SYSTEM_MASTER_CONNECTION_MANAGER_H_
 
 #include <stdint.h>
 
 #include <unordered_map>
@@ skipping 10 matching lines @@
 class TaskRunner;
 }
 
 namespace mojo {
 
 namespace embedder {
 class MasterProcessDelegate;
 using SlaveInfo = void*;
 }
 
-namespace util {
-class AutoResetWaitableEvent;
-}
-
 namespace system {
 
+class AutoResetWaitableEvent;
+
 // The |ConnectionManager| implementation for the master process.
 //
 // This class is thread-safe (except that no public methods may be called from
 // its internal, private thread), with condition that |Init()| be called before
 // anything else and |Shutdown()| be called before destruction (and no other
 // public methods may be called during/after |Shutdown()|).
 class MasterConnectionManager final : public ConnectionManager {
  public:
   // Note: None of the public methods may be called from |private_thread_|.
 
@@ skipping 64 matching lines @@
       ProcessIdentifier peer_process_identifier,
       embedder::ScopedPlatformHandle* platform_handle)
       MOJO_EXCLUSIVE_LOCKS_REQUIRED(mutex_);
 
   // These should only be called on |private_thread_|:
   void ShutdownOnPrivateThread() MOJO_NOT_THREAD_SAFE;
   // Signals |*event| on completion.
   void AddSlaveOnPrivateThread(embedder::SlaveInfo slave_info,
                                embedder::ScopedPlatformHandle platform_handle,
                                ProcessIdentifier slave_process_identifier,
-                               util::AutoResetWaitableEvent* event);
+                               AutoResetWaitableEvent* event);
   // Called by |Helper::OnError()|.
   void OnError(ProcessIdentifier process_identifier);
   // Posts a call to |master_process_delegate_->OnSlaveDisconnect()|.
   void CallOnSlaveDisconnect(embedder::SlaveInfo slave_info);
 
   // Asserts that the current thread is *not* |private_thread_| (no-op if
   // DCHECKs are not enabled). This should only be called while
   // |private_thread_| is alive (i.e., after |Init()| but before |Shutdown()|).
   void AssertNotOnPrivateThread() const;
 
@@ skipping 40 matching lines @@
   std::unordered_map<ProcessIdentifier, ProcessConnections*> connections_
       MOJO_GUARDED_BY(mutex_);  // Owns its values.
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(MasterConnectionManager);
 };
 
 }  // namespace system
 }  // namespace mojo
 
 #endif  // MOJO_EDK_SYSTEM_MASTER_CONNECTION_MANAGER_H_