Revert of Update mojo sdk to rev c02a28868825edfa57ab77947b8cb15e741c5598

third_party/mojo/src/mojo/edk/system/core_test_base.h

Index: third_party/mojo/src/mojo/edk/system/core_test_base.h
diff --git a/third_party/mojo/src/mojo/edk/system/core_test_base.h b/third_party/mojo/src/mojo/edk/system/core_test_base.h
index e2375cde3d716471b6d53db7fcc2d484cc18538a..ce3291870878279ae39ee1f8c5ca26ea81e2db8c 100644
--- a/third_party/mojo/src/mojo/edk/system/core_test_base.h
+++ b/third_party/mojo/src/mojo/edk/system/core_test_base.h
@@ -5,8 +5,8 @@
 #ifndef MOJO_EDK_SYSTEM_CORE_TEST_BASE_H_
 #define MOJO_EDK_SYSTEM_CORE_TEST_BASE_H_
 
+#include "base/synchronization/lock.h"
 #include "mojo/edk/embedder/simple_platform_support.h"
-#include "mojo/edk/system/mutex.h"
 #include "mojo/public/c/system/types.h"
 #include "mojo/public/cpp/system/macros.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -88,24 +88,24 @@
   void AwakableWasAdded(Awakable*);
 
  private:
-  mutable 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_);
+  mutable base::Lock lock_;  // Protects the following members.
+  unsigned ctor_call_count_;
+  unsigned dtor_call_count_;
+  unsigned close_call_count_;
+  unsigned write_message_call_count_;
+  unsigned read_message_call_count_;
+  unsigned write_data_call_count_;
+  unsigned begin_write_data_call_count_;
+  unsigned end_write_data_call_count_;
+  unsigned read_data_call_count_;
+  unsigned begin_read_data_call_count_;
+  unsigned end_read_data_call_count_;
+  unsigned add_awakable_call_count_;
+  unsigned remove_awakable_call_count_;
+  unsigned cancel_all_awakables_call_count_;
 
-  bool add_awakable_allowed_ MOJO_GUARDED_BY(mutex_);
-  std::vector<Awakable*> added_awakables_ MOJO_GUARDED_BY(mutex_);
+  bool add_awakable_allowed_;
+  std::vector<Awakable*> added_awakables_;
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(CoreTestBase_MockHandleInfo);
 };