EDK: Move mutex.*, cond_var.*, and thread_annotations.h to //mojo/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>
 
 #include "base/threading/thread.h"
 #include "mojo/edk/embedder/platform_task_runner.h"
 #include "mojo/edk/embedder/scoped_platform_handle.h"
 #include "mojo/edk/system/connection_manager.h"
-#include "mojo/edk/system/mutex.h"
+#include "mojo/edk/util/mutex.h"
+#include "mojo/edk/util/thread_annotations.h"
 #include "mojo/public/cpp/system/macros.h"
 
 namespace base {
 class TaskRunner;
 }
 
 namespace mojo {
 
 namespace embedder {
 class MasterProcessDelegate;
@@ skipping 113 matching lines @@
 
   // This is a private I/O thread on which this class does the bulk of its work.
   // It is started in |Init()| and terminated in |Shutdown()|.
   base::Thread private_thread_;
 
   // The following members are only accessed on |private_thread_|:
   std::unordered_map<ProcessIdentifier, Helper*> helpers_;  // Owns its values.
 
   // Note: |mutex_| is not needed in the constructor, |Init()|,
   // |Shutdown()|/|ShutdownOnPrivateThread()|, or the destructor
-  Mutex mutex_;
+  util::Mutex mutex_;
 
   ProcessIdentifier next_process_identifier_ MOJO_GUARDED_BY(mutex_);
 
   // Stores information on pending calls to |AllowConnect()|/|Connect()| (or
   // |CancelConnect()|, namely those for which at least one party has called
   // |AllowConnect()| but both have not yet called |Connect()| (or
   // |CancelConnect()|).
   struct PendingConnectInfo;
   std::unordered_map<ConnectionIdentifier, PendingConnectInfo*>
       pending_connects_ MOJO_GUARDED_BY(mutex_);  // Owns its values.
 
   // A |ProcessConnections| stores information about connections "from" a given
   // (fixed, implied) process "to" other processes. A connection may be not
   // present, running (meaning that both sides have connected and been given
   // platform handles to a connected "pipe"), or pending (meaning that the
   // "from" side must still be given a platform handle).
   class ProcessConnections;
   // This is a map from "from" processes to its |ProcessConnections| (above).
   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_