Add a Mojo EDK for Chrome that uses one OS pipe per message pipe.

mojo/edk/system/waiter_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // NOTE(vtl): Some of these tests are inherently flaky (e.g., if run on a
 // heavily-loaded system). Sorry. |test::EpsilonDeadline()| may be increased to
 // increase tolerance and reduce observed flakiness (though doing so reduces the
 // meaningfulness of the test).
 
 #include "mojo/edk/system/waiter.h"
 
 #include <stdint.h>
 
+#include "base/synchronization/lock.h"
 #include "base/threading/simple_thread.h"
-#include "mojo/edk/system/mutex.h"
 #include "mojo/edk/system/test_utils.h"
 #include "mojo/public/cpp/system/macros.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
 namespace system {
 namespace {
 
 const unsigned kPollTimeMs = 10;
 
 class WaitingThread : public base::SimpleThread {
  public:
   explicit WaitingThread(MojoDeadline deadline)
       : base::SimpleThread("waiting_thread"),
         deadline_(deadline),
         done_(false),
         result_(MOJO_RESULT_UNKNOWN),
         context_(static_cast<uint32_t>(-1)) {
     waiter_.Init();
   }
 
   ~WaitingThread() override { Join(); }
 
   void WaitUntilDone(MojoResult* result,
                      uint32_t* context,
                      MojoDeadline* elapsed) {
     for (;;) {
       {
-        MutexLocker locker(&mutex_);
+        base::AutoLock locker(lock_);
         if (done_) {
           *result = result_;
           *context = context_;
           *elapsed = elapsed_;
           break;
         }
       }
 
       test::Sleep(test::DeadlineFromMilliseconds(kPollTimeMs));
     }
   }
 
   Waiter* waiter() { return &waiter_; }
 
  private:
   void Run() override {
     test::Stopwatch stopwatch;
     MojoResult result;
     uint32_t context = static_cast<uint32_t>(-1);
     MojoDeadline elapsed;
 
     stopwatch.Start();
     result = waiter_.Wait(deadline_, &context);
     elapsed = stopwatch.Elapsed();
 
     {
-      MutexLocker locker(&mutex_);
+      base::AutoLock locker(lock_);
       done_ = true;
       result_ = result;
       context_ = context;
       elapsed_ = elapsed;
     }
   }
 
   const MojoDeadline deadline_;
   Waiter waiter_;  // Thread-safe.
 
-  Mutex mutex_;
-  bool done_ MOJO_GUARDED_BY(mutex_);
-  MojoResult result_ MOJO_GUARDED_BY(mutex_);
-  uint32_t context_ MOJO_GUARDED_BY(mutex_);
-  MojoDeadline elapsed_ MOJO_GUARDED_BY(mutex_);
+  base::Lock lock_;  // Protects the following members.
+  bool done_;
+  MojoResult result_;
+  uint32_t context_;
+  MojoDeadline elapsed_;
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(WaitingThread);
 };
 
 TEST(WaiterTest, Basic) {
   MojoResult result;
   uint32_t context;
   MojoDeadline elapsed;
 
   // Finite deadline.
@@ skipping 192 matching lines @@
     EXPECT_EQ(MOJO_RESULT_FAILED_PRECONDITION, result);
     EXPECT_EQ(7u, context);
     EXPECT_GT(elapsed, (1 - 1) * test::EpsilonDeadline());
     EXPECT_LT(elapsed, (1 + 1) * test::EpsilonDeadline());
   }
 }
 
 }  // namespace
 }  // namespace system
 }  // namespace mojo