EDK: Move mutex.*, cond_var.*, and thread_annotations.h to //mojo/edk/util.

mojo/edk/system/waiter.h

 // Copyright 2013 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_WAITER_H_
 #define MOJO_EDK_SYSTEM_WAITER_H_
 
 #include <stdint.h>
 
 #include "mojo/edk/system/awakable.h"
-#include "mojo/edk/system/cond_var.h"
-#include "mojo/edk/system/mutex.h"
-#include "mojo/edk/system/thread_annotations.h"
+#include "mojo/edk/util/cond_var.h"
+#include "mojo/edk/util/mutex.h"
+#include "mojo/edk/util/thread_annotations.h"
 #include "mojo/public/c/system/types.h"
 #include "mojo/public/cpp/system/macros.h"
 
 namespace mojo {
 namespace system {
 
 // IMPORTANT (all-caps gets your attention, right?): |Waiter| methods are called
 // under other locks, in particular, |Dispatcher::lock_|s, so |Waiter| methods
 // must never call out to other objects (in particular, |Dispatcher|s). This
 // class is thread-safe.
@@ skipping 30 matching lines @@
   //     |MojoWait()|/|MojoWaitMany()| cannot or can no longer be satisfied by
   //     the corresponding handle (e.g., if the other end of a message or data
   //     pipe is closed).
   MojoResult Wait(MojoDeadline deadline, uint32_t* context);
 
   // Wake the waiter up with the given result and context (or no-op if it's been
   // woken up already).
   bool Awake(MojoResult result, uintptr_t context) override;
 
  private:
-  CondVar cv_;  // Associated to |mutex_|.
-  Mutex mutex_;
+  util::CondVar cv_;  // Associated to |mutex_|.
+  util::Mutex mutex_;
 #ifndef NDEBUG
   bool initialized_ MOJO_GUARDED_BY(mutex_);
 #endif
   bool awoken_ MOJO_GUARDED_BY(mutex_);
   MojoResult awake_result_ MOJO_GUARDED_BY(mutex_);
   uintptr_t awake_context_ MOJO_GUARDED_BY(mutex_);
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(Waiter);
 };
 
 }  // namespace system
 }  // namespace mojo
 
 #endif  // MOJO_EDK_SYSTEM_WAITER_H_