Revert of Update mojo sdk to rev c02a28868825edfa57ab77947b8cb15e741c5598

third_party/mojo/src/mojo/edk/system/simple_dispatcher_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/simple_dispatcher.h"
@@ skipping 10 matching lines @@
 
 namespace mojo {
 namespace system {
 namespace {
 
 class MockSimpleDispatcher final : public SimpleDispatcher {
  public:
   MockSimpleDispatcher()
       : state_(MOJO_HANDLE_SIGNAL_NONE,
                MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE) {}
-  explicit MockSimpleDispatcher(const HandleSignalsState& state)
-      : state_(state) {}
 
   void SetSatisfiedSignals(MojoHandleSignals new_satisfied_signals) {
-    MutexLocker locker(&mutex());
+    base::AutoLock locker(lock());
 
     // Any new signals that are set should be satisfiable.
     CHECK_EQ(new_satisfied_signals & ~state_.satisfied_signals,
              new_satisfied_signals & ~state_.satisfied_signals &
                  state_.satisfiable_signals);
 
     if (new_satisfied_signals == state_.satisfied_signals)
       return;
 
     state_.satisfied_signals = new_satisfied_signals;
     HandleSignalsStateChangedNoLock();
   }
 
   void SetSatisfiableSignals(MojoHandleSignals new_satisfiable_signals) {
-    MutexLocker locker(&mutex());
+    base::AutoLock locker(lock());
 
     // Satisfied implies satisfiable.
     CHECK_EQ(new_satisfiable_signals & state_.satisfied_signals,
              state_.satisfied_signals);
 
     if (new_satisfiable_signals == state_.satisfiable_signals)
       return;
 
     state_.satisfiable_signals = new_satisfiable_signals;
     HandleSignalsStateChangedNoLock();
   }
 
   Type GetType() const override { return Type::UNKNOWN; }
 
  private:
   friend class base::RefCountedThreadSafe<MockSimpleDispatcher>;
   ~MockSimpleDispatcher() override {}
 
   scoped_refptr<Dispatcher> CreateEquivalentDispatcherAndCloseImplNoLock()
       override {
-    scoped_refptr<MockSimpleDispatcher> rv(new MockSimpleDispatcher(state_));
+    scoped_refptr<MockSimpleDispatcher> rv(new MockSimpleDispatcher());
+    rv->state_ = state_;
     return scoped_refptr<Dispatcher>(rv.get());
   }
 
   // |Dispatcher| override:
   HandleSignalsState GetHandleSignalsStateImplNoLock() const override {
-    mutex().AssertHeld();
+    lock().AssertAcquired();
     return state_;
   }
 
-  HandleSignalsState state_ MOJO_GUARDED_BY(mutex());
+  // Protected by |lock()|:
+  HandleSignalsState state_;
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(MockSimpleDispatcher);
 };
 
 #if defined(OS_WIN)
 // http://crbug.com/396404
 #define MAYBE_Basic DISABLED_Basic
 #else
 #define MAYBE_Basic Basic
 #endif
@@ skipping 503 matching lines @@
     // Since we closed before joining, we can't say much about what each thread
     // saw as the state.
   }
 }
 
 // TODO(vtl): Stress test?
 
 }  // namespace
 }  // namespace system
 }  // namespace mojo