commit bc3a37c1e46698a0607ae0ba64a5514c34f65cc2
author Viet-Trung Luu <viettrungluu@chromium.org> Tue Jul 07 13:07:09 2015 -0700
committer Viet-Trung Luu <viettrungluu@chromium.org> Tue Jul 07 13:07:09 2015 -0700
tree f1a8ca40fdec6cc452b63e04cdd98fad7db2f0a9
parent ffa919ef3c54f0583ef769abda8ed8f7d6efa283

Convert core.{h,cc} to use mojo::system::Mutex (and MutexLocker).

R=kulakowski@chromium.org

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

mojo/edk/system/core.h

diff --git a/mojo/edk/system/core.h b/mojo/edk/system/core.h
index 407a064..4ed5ede 100644
--- a/mojo/edk/system/core.h
+++ b/mojo/edk/system/core.h
@@ -10,10 +10,10 @@
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/synchronization/lock.h"
 #include "mojo/edk/system/handle_table.h"
 #include "mojo/edk/system/mapping_table.h"
 #include "mojo/edk/system/memory.h"
+#include "mojo/edk/system/mutex.h"
 #include "mojo/edk/system/system_impl_export.h"
 #include "mojo/public/c/system/buffer.h"
 #include "mojo/public/c/system/data_pipe.h"
@@ -175,13 +175,13 @@
 
   embedder::PlatformSupport* const platform_support_;
 
-  // TODO(vtl): |handle_table_lock_| should be a reader-writer lock (if only we
+  // TODO(vtl): |handle_table_mutex_| should be a reader-writer lock (if only we
   // had them).
-  base::Lock handle_table_lock_;  // Protects |handle_table_|.
-  HandleTable handle_table_;
+  Mutex handle_table_mutex_;
+  HandleTable handle_table_ MOJO_GUARDED_BY(handle_table_mutex_);
 
-  base::Lock mapping_table_lock_;  // Protects |mapping_table_|.
-  MappingTable mapping_table_;
+  Mutex mapping_table_mutex_;
+  MappingTable mapping_table_ MOJO_GUARDED_BY(mapping_table_mutex_);
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(Core);
 };