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

mojo/edk/system/core_test_base.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_CORE_TEST_BASE_H_
 #define MOJO_EDK_SYSTEM_CORE_TEST_BASE_H_
 
 #include "mojo/edk/embedder/simple_platform_support.h"
-#include "mojo/edk/system/mutex.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"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
 namespace system {
 
 class Core;
 class Awakable;
 
@@ skipping 61 matching lines @@
   void IncrementEndReadDataCallCount();
   void IncrementAddAwakableCallCount();
   void IncrementRemoveAwakableCallCount();
   void IncrementCancelAllAwakablesCallCount();
 
   void AllowAddAwakable(bool alllow);
   bool IsAddAwakableAllowed() const;
   void AwakableWasAdded(Awakable*);
 
  private:
-  mutable Mutex mutex_;
+  mutable util::Mutex mutex_;
   unsigned ctor_call_count_ MOJO_GUARDED_BY(mutex_);
   unsigned dtor_call_count_ MOJO_GUARDED_BY(mutex_);
   unsigned close_call_count_ MOJO_GUARDED_BY(mutex_);
   unsigned write_message_call_count_ MOJO_GUARDED_BY(mutex_);
   unsigned read_message_call_count_ MOJO_GUARDED_BY(mutex_);
   unsigned write_data_call_count_ MOJO_GUARDED_BY(mutex_);
   unsigned begin_write_data_call_count_ MOJO_GUARDED_BY(mutex_);
   unsigned end_write_data_call_count_ MOJO_GUARDED_BY(mutex_);
   unsigned read_data_call_count_ MOJO_GUARDED_BY(mutex_);
   unsigned begin_read_data_call_count_ MOJO_GUARDED_BY(mutex_);
   unsigned end_read_data_call_count_ MOJO_GUARDED_BY(mutex_);
   unsigned add_awakable_call_count_ MOJO_GUARDED_BY(mutex_);
   unsigned remove_awakable_call_count_ MOJO_GUARDED_BY(mutex_);
   unsigned cancel_all_awakables_call_count_ MOJO_GUARDED_BY(mutex_);
 
   bool add_awakable_allowed_ MOJO_GUARDED_BY(mutex_);
   std::vector<Awakable*> added_awakables_ MOJO_GUARDED_BY(mutex_);
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(CoreTestBase_MockHandleInfo);
 };
 
 }  // namespace test
 }  // namespace system
 }  // namespace mojo
 
 #endif  // MOJO_EDK_SYSTEM_CORE_TEST_BASE_H_