Mojo C++ bindings: change some std::unique_ptr<base::Lock> to base::Optional<base::Lock>.

mojo/public/cpp/bindings/lib/connector.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.
 
 #include "mojo/public/cpp/bindings/connector.h"
 
 #include <stdint.h>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/synchronization/lock.h"
 #include "mojo/public/cpp/bindings/lib/may_auto_lock.h"
 #include "mojo/public/cpp/bindings/sync_handle_watcher.h"
 
 namespace mojo {
 
 Connector::Connector(ScopedMessagePipeHandle message_pipe,
                      ConnectorConfig config,
                      scoped_refptr<base::SingleThreadTaskRunner> runner)
     : message_pipe_(std::move(message_pipe)),
       task_runner_(std::move(runner)),
-      lock_(config == MULTI_THREADED_SEND ? new base::Lock : nullptr),
       weak_factory_(this) {
+  if (config == MULTI_THREADED_SEND)
+    lock_.emplace();
+
   weak_self_ = weak_factory_.GetWeakPtr();
   // Even though we don't have an incoming receiver, we still want to monitor
   // the message pipe to know if is closed or encounters an error.
   WaitToReadMore();
 }
 
 Connector::~Connector() {
   {
     // Allow for quick destruction on any thread if the pipe is already closed.
     base::AutoLock lock(connected_lock_);
     if (!connected_)
       return;
   }
 
   DCHECK(thread_checker_.CalledOnValidThread());
   CancelWait();
 }
 
 void Connector::CloseMessagePipe() {
   // Throw away the returned message pipe.
   PassMessagePipe();
 }
 
 ScopedMessagePipeHandle Connector::PassMessagePipe() {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   CancelWait();
-  internal::MayAutoLock locker(lock_.get());
+  internal::MayAutoLock locker(&lock_);
   ScopedMessagePipeHandle message_pipe = std::move(message_pipe_);
   weak_factory_.InvalidateWeakPtrs();
   sync_handle_watcher_callback_count_ = 0;
 
   base::AutoLock lock(connected_lock_);
   connected_ = false;
   return message_pipe;
 }
 
 void Connector::RaiseError() {
@@ skipping 46 matching lines @@
 
 bool Connector::Accept(Message* message) {
   DCHECK(lock_ || thread_checker_.CalledOnValidThread());
 
   // It shouldn't hurt even if |error_| may be changed by a different thread at
   // the same time. The outcome is that we may write into |message_pipe_| after
   // encountering an error, which should be fine.
   if (error_)
     return false;
 
-  internal::MayAutoLock locker(lock_.get());
+  internal::MayAutoLock locker(&lock_);
 
   if (!message_pipe_.is_valid() || drop_writes_)
     return true;
 
   MojoResult rv =
       WriteMessageNew(message_pipe_.get(), message->TakeMojoMessage(),
                       MOJO_WRITE_MESSAGE_FLAG_NONE);
 
   switch (rv) {
     case MOJO_RESULT_OK:
@@ skipping 174 matching lines @@
     // receiving messages. We need to wait until the user starts receiving
     // messages again.
     force_async_handler = true;
   }
 
   if (!force_pipe_reset && force_async_handler)
     force_pipe_reset = true;
 
   if (force_pipe_reset) {
     CancelWait();
-    internal::MayAutoLock locker(lock_.get());
+    internal::MayAutoLock locker(&lock_);
     message_pipe_.reset();
     MessagePipe dummy_pipe;
     message_pipe_ = std::move(dummy_pipe.handle0);
   } else {
     CancelWait();
   }
 
   if (force_async_handler) {
     if (!paused_)
       WaitToReadMore();
   } else {
     error_ = true;
     if (!connection_error_handler_.is_null())
       connection_error_handler_.Run();
   }
 }
 
 void Connector::EnsureSyncWatcherExists() {
   if (sync_watcher_)
     return;
   sync_watcher_.reset(new SyncHandleWatcher(
       message_pipe_.get(), MOJO_HANDLE_SIGNAL_READABLE,
       base::Bind(&Connector::OnSyncHandleWatcherHandleReady,
                  base::Unretained(this))));
 }
 
 }  // namespace mojo