Revert of Update mojo sdk to rev c02a28868825edfa57ab77947b8cb15e741c5598

third_party/mojo/src/mojo/edk/system/platform_handle_dispatcher.cc

 // Copyright 2014 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.
 
 #include "mojo/edk/system/platform_handle_dispatcher.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 
 namespace mojo {
 namespace system {
 
 namespace {
 
 const size_t kInvalidPlatformHandleIndex = static_cast<size_t>(-1);
 
 struct SerializedPlatformHandleDispatcher {
   size_t platform_handle_index;  // (Or |kInvalidPlatformHandleIndex|.)
 };
 
 }  // namespace
 
 embedder::ScopedPlatformHandle PlatformHandleDispatcher::PassPlatformHandle() {
-  MutexLocker locker(&mutex());
+  base::AutoLock locker(lock());
   return platform_handle_.Pass();
 }
 
 Dispatcher::Type PlatformHandleDispatcher::GetType() const {
   return Type::PLATFORM_HANDLE;
 }
 
 // static
 scoped_refptr<PlatformHandleDispatcher> PlatformHandleDispatcher::Deserialize(
     Channel* channel,
@@ skipping 30 matching lines @@
 
 PlatformHandleDispatcher::PlatformHandleDispatcher(
     embedder::ScopedPlatformHandle platform_handle)
     : platform_handle_(platform_handle.Pass()) {
 }
 
 PlatformHandleDispatcher::~PlatformHandleDispatcher() {
 }
 
 void PlatformHandleDispatcher::CloseImplNoLock() {
-  mutex().AssertHeld();
+  lock().AssertAcquired();
   platform_handle_.reset();
 }
 
 scoped_refptr<Dispatcher>
 PlatformHandleDispatcher::CreateEquivalentDispatcherAndCloseImplNoLock() {
-  mutex().AssertHeld();
+  lock().AssertAcquired();
   return Create(platform_handle_.Pass());
 }
 
 void PlatformHandleDispatcher::StartSerializeImplNoLock(
     Channel* /*channel*/,
     size_t* max_size,
     size_t* max_platform_handles) {
   DCHECK(HasOneRef());  // Only one ref => no need to take the lock.
   *max_size = sizeof(SerializedPlatformHandleDispatcher);
   *max_platform_handles = 1;
@@ skipping 14 matching lines @@
   } else {
     serialization->platform_handle_index = kInvalidPlatformHandleIndex;
   }
 
   *actual_size = sizeof(SerializedPlatformHandleDispatcher);
   return true;
 }
 
 }  // namespace system
 }  // namespace mojo