Revert of Update mojo sdk to rev c02a28868825edfa57ab77947b8cb15e741c5598

third_party/mojo/src/mojo/edk/embedder/embedder_unittest.cc

Index: third_party/mojo/src/mojo/edk/embedder/embedder_unittest.cc
diff --git a/third_party/mojo/src/mojo/edk/embedder/embedder_unittest.cc b/third_party/mojo/src/mojo/edk/embedder/embedder_unittest.cc
index e9735b1aa5396b430103443c1fa5fc44c3b7b2c9..0d1f3d92d0ea4f25ab55b465d4f47b7d8e30f43f 100644
--- a/third_party/mojo/src/mojo/edk/embedder/embedder_unittest.cc
+++ b/third_party/mojo/src/mojo/edk/embedder/embedder_unittest.cc
@@ -16,7 +16,6 @@
 #include "base/test/test_timeouts.h"
 #include "mojo/edk/embedder/platform_channel_pair.h"
 #include "mojo/edk/embedder/test_embedder.h"
-#include "mojo/edk/system/mutex.h"
 #include "mojo/edk/system/test_utils.h"
 #include "mojo/edk/test/multiprocess_test_helper.h"
 #include "mojo/edk/test/scoped_ipc_support.h"
@@ -181,7 +180,7 @@
   TestAsyncWaiter() : event_(true, false), wait_result_(MOJO_RESULT_UNKNOWN) {}
 
   void Awake(MojoResult result) {
-    system::MutexLocker l(&wait_result_mutex_);
+    base::AutoLock l(wait_result_lock_);
     wait_result_ = result;
     event_.Signal();
   }
@@ -189,15 +188,15 @@
   bool TryWait() { return event_.TimedWait(TestTimeouts::action_timeout()); }
 
   MojoResult wait_result() const {
-    system::MutexLocker l(&wait_result_mutex_);
+    base::AutoLock l(wait_result_lock_);
     return wait_result_;
   }
 
  private:
   base::WaitableEvent event_;
 
-  mutable system::Mutex wait_result_mutex_;
-  MojoResult wait_result_ MOJO_GUARDED_BY(wait_result_mutex_);
+  mutable base::Lock wait_result_lock_;
+  MojoResult wait_result_;
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(TestAsyncWaiter);
 };