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

mojo/edk/util/thread_annotations_unittest.cc

Index: mojo/edk/util/thread_annotations_unittest.cc
diff --git a/mojo/edk/system/thread_annotations_unittest.cc b/mojo/edk/util/thread_annotations_unittest.cc
similarity index 95%
rename from mojo/edk/system/thread_annotations_unittest.cc
rename to mojo/edk/util/thread_annotations_unittest.cc
index d56814fa6ba97ed5a2993045ce0e36ccacc32bbb..838dda54334d2e3ee1c5bd2ab75ae9979cf96023 100644
--- a/mojo/edk/system/thread_annotations_unittest.cc
+++ b/mojo/edk/util/thread_annotations_unittest.cc
@@ -10,9 +10,9 @@
 // So instead we have some cheesy macros that you can define to enable
 // individual compilation failures.
 
-#include "mojo/edk/system/thread_annotations.h"
+#include "mojo/edk/util/thread_annotations.h"
 
-#include "mojo/edk/system/mutex.h"
+#include "mojo/edk/util/mutex.h"
 #include "mojo/public/cpp/system/macros.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -24,7 +24,7 @@
 // #define NC_ACQUIRED_BEFORE
 
 namespace mojo {
-namespace system {
+namespace util {
 namespace {
 
 // Test MOJO_GUARDED_BY --------------------------------------------------------
@@ -120,5 +120,5 @@ TEST(ThreadAnnotationsTest, AcquiredBefore) {
 // TODO(vtl): Test more things.
 
 }  // namespace
-}  // namespace system
+}  // namespace util
 }  // namespace mojo