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

mojo/edk/util/mutex_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/mutex.h"
+#include "mojo/edk/util/mutex.h"
 
 #include <stdlib.h>
 
 #include <thread>
 
 #include "mojo/edk/system/test/sleep.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
-namespace system {
+namespace util {
 namespace {
 
 // Sleeps for a "very small" amount of time.
 void EpsilonRandomSleep() {
-  test::SleepMilliseconds(static_cast<unsigned>(rand()) % 20u);
+  system::test::SleepMilliseconds(static_cast<unsigned>(rand()) % 20u);
 }
 
 // Basic test to make sure that Lock()/Unlock()/TryLock() don't crash ----------
 
 TEST(MutexTest, Basic) {
   Mutex mutex;
 
   int thread_acquired = 0;
   auto thread = std::thread([&mutex, &thread_acquired]() {
     for (int i = 0; i < 10; i++) {
@@ skipping 55 matching lines @@
   EXPECT_GE(thread_acquired, 20);
 }
 
 TEST(MutexTest, AssertHeld) {
   Mutex mutex;
 
 #if defined(NDEBUG) && !defined(DCHECK_ALWAYS_ON)
   // For non-Debug builds, |AssertHeld()| should do nothing.
   mutex.AssertHeld();
 #else
-  EXPECT_DEATH_IF_SUPPORTED({ mutex.AssertHeld(); }, "Check failed");
+  EXPECT_DEATH_IF_SUPPORTED({ mutex.AssertHeld(); }, "pthread_mutex_lock");
 #endif  // defined(NDEBUG) && !defined(DCHECK_ALWAYS_ON)
 
   // TODO(vtl): Should also test the case when the mutex is held by another
   // thread, though this is more annoying since it requires synchronization.
 }
 
 // Test that TryLock() works as expected ---------------------------------------
 
 TEST(MutexTest, TryLock) MOJO_NO_THREAD_SAFETY_ANALYSIS {
   Mutex mutex;
@@ skipping 83 matching lines @@
     mutex.AssertHeld();
   }
 
   // The destruction of |locker| should unlock |mutex|.
   ASSERT_TRUE(mutex.TryLock());
   mutex.AssertHeld();
   mutex.Unlock();
 }
 
 }  // namespace
-}  // namespace system
+}  // namespace util
 }  // namespace mojo