| Index: third_party/mojo/src/mojo/edk/system/shared_buffer_dispatcher.cc
|
| diff --git a/third_party/mojo/src/mojo/edk/system/shared_buffer_dispatcher.cc b/third_party/mojo/src/mojo/edk/system/shared_buffer_dispatcher.cc
|
| index caf8e0b64bfb313975c6cdef71a6a4d3e283ca34..8ab8f10684938a18d05a46bfaf915f184fea5485 100644
|
| --- a/third_party/mojo/src/mojo/edk/system/shared_buffer_dispatcher.cc
|
| +++ b/third_party/mojo/src/mojo/edk/system/shared_buffer_dispatcher.cc
|
| @@ -177,14 +177,14 @@
|
| }
|
|
|
| void SharedBufferDispatcher::CloseImplNoLock() {
|
| - mutex().AssertHeld();
|
| + lock().AssertAcquired();
|
| DCHECK(shared_buffer_);
|
| shared_buffer_ = nullptr;
|
| }
|
|
|
| scoped_refptr<Dispatcher>
|
| SharedBufferDispatcher::CreateEquivalentDispatcherAndCloseImplNoLock() {
|
| - mutex().AssertHeld();
|
| + lock().AssertAcquired();
|
| DCHECK(shared_buffer_);
|
| return CreateInternal(shared_buffer_.Pass());
|
| }
|
| @@ -192,7 +192,7 @@
|
| MojoResult SharedBufferDispatcher::DuplicateBufferHandleImplNoLock(
|
| UserPointer<const MojoDuplicateBufferHandleOptions> options,
|
| scoped_refptr<Dispatcher>* new_dispatcher) {
|
| - mutex().AssertHeld();
|
| + lock().AssertAcquired();
|
|
|
| MojoDuplicateBufferHandleOptions validated_options;
|
| MojoResult result = ValidateDuplicateOptions(options, &validated_options);
|
| @@ -209,7 +209,7 @@
|
| uint64_t num_bytes,
|
| MojoMapBufferFlags flags,
|
| scoped_ptr<embedder::PlatformSharedBufferMapping>* mapping) {
|
| - mutex().AssertHeld();
|
| + lock().AssertAcquired();
|
| DCHECK(shared_buffer_);
|
|
|
| if (offset > static_cast<uint64_t>(std::numeric_limits<size_t>::max()))
|
|
|