commit d42e48a950f4c69b976b67036307db9790a684e7
author Viet-Trung Luu <viettrungluu@chromium.org> Tue Nov 03 14:54:55 2015 -0800
committer Viet-Trung Luu <viettrungluu@chromium.org> Tue Nov 03 14:54:55 2015 -0800
tree 3fe97ee93c1aeeee14708cab8a0dbca942d7e8c6
parent 81b04c567fb6f6c4865e8cd08adb6a49fc24f235

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

(Also, make them not depend on //base/logging.h. Add some simple logging
macros for those needs.)

R=jamesr@chromium.org

Review URL: https://codereview.chromium.org/1426343002 .

mojo/edk/system/raw_channel.h

diff --git a/mojo/edk/system/raw_channel.h b/mojo/edk/system/raw_channel.h
index 6a78395..beb0194 100644
--- a/mojo/edk/system/raw_channel.h
+++ b/mojo/edk/system/raw_channel.h
@@ -13,8 +13,8 @@
 #include "mojo/edk/embedder/scoped_platform_handle.h"
 #include "mojo/edk/system/message_in_transit.h"
 #include "mojo/edk/system/message_in_transit_queue.h"
-#include "mojo/edk/system/mutex.h"
-#include "mojo/edk/system/thread_annotations.h"
+#include "mojo/edk/util/mutex.h"
+#include "mojo/edk/util/thread_annotations.h"
 #include "mojo/public/cpp/system/macros.h"
 
 namespace base {
@@ -211,7 +211,9 @@
                         size_t bytes_written) MOJO_LOCKS_EXCLUDED(write_mutex_);
 
   base::MessageLoopForIO* message_loop_for_io() { return message_loop_for_io_; }
-  Mutex& write_mutex() MOJO_LOCK_RETURNED(write_mutex_) { return write_mutex_; }
+  util::Mutex& write_mutex() MOJO_LOCK_RETURNED(write_mutex_) {
+    return write_mutex_;
+  }
 
   // Should only be called on the I/O thread.
   ReadBuffer* read_buffer() { return read_buffer_.get(); }
@@ -319,7 +321,7 @@
   bool* set_on_shutdown_;
   std::unique_ptr<ReadBuffer> read_buffer_;
 
-  Mutex write_mutex_;  // Protects the following members.
+  util::Mutex write_mutex_;  // Protects the following members.
   bool write_stopped_ MOJO_GUARDED_BY(write_mutex_);
   std::unique_ptr<WriteBuffer> write_buffer_ MOJO_GUARDED_BY(write_mutex_);