EDK: Convert remaining scoped_ptr -> std::unique_ptr in //mojo/edk/system.

mojo/edk/system/slave_connection_manager.cc

 // Copyright 2015 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/slave_connection_manager.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "mojo/edk/system/connection_manager_messages.h"
 #include "mojo/edk/system/message_in_transit.h"
+#include "mojo/edk/util/make_unique.h"
 
 namespace mojo {
 namespace system {
 
 // SlaveConnectionManager ------------------------------------------------------
 
 SlaveConnectionManager::SlaveConnectionManager(
     embedder::PlatformSupport* platform_support)
     : ConnectionManager(platform_support),
       slave_process_delegate_(),
@@ skipping 129 matching lines @@
     Result* result) {
   DCHECK(result);
   AssertOnPrivateThread();
   // This should only posted (from another thread, to |private_thread_|) with
   // the lock held (until this thread triggers |event_|).
   DCHECK(!mutex_.TryLock());
   DCHECK_EQ(awaiting_ack_type_, NOT_AWAITING_ACK);
 
   DVLOG(1) << "Sending AllowConnect: connection ID "
            << connection_id.ToString();
-  if (!raw_channel_->WriteMessage(make_scoped_ptr(new MessageInTransit(
+  if (!raw_channel_->WriteMessage(util::MakeUnique<MessageInTransit>(
           MessageInTransit::Type::CONNECTION_MANAGER,
           MessageInTransit::Subtype::CONNECTION_MANAGER_ALLOW_CONNECT,
-          sizeof(connection_id), &connection_id)))) {
+          sizeof(connection_id), &connection_id))) {
     // Don't tear things down; possibly we'll still read some messages.
     *result = Result::FAILURE;
     event_.Signal();
     return;
   }
   awaiting_ack_type_ = AWAITING_ACCEPT_CONNECT_ACK;
   ack_result_ = result;
 }
 
 void SlaveConnectionManager::CancelConnectOnPrivateThread(
     const ConnectionIdentifier& connection_id,
     Result* result) {
   DCHECK(result);
   AssertOnPrivateThread();
   // This should only posted (from another thread, to |private_thread_|) with
   // the lock held (until this thread triggers |event_|).
   DCHECK(!mutex_.TryLock());
   DCHECK_EQ(awaiting_ack_type_, NOT_AWAITING_ACK);
 
   DVLOG(1) << "Sending CancelConnect: connection ID "
            << connection_id.ToString();
-  if (!raw_channel_->WriteMessage(make_scoped_ptr(new MessageInTransit(
+  if (!raw_channel_->WriteMessage(util::MakeUnique<MessageInTransit>(
           MessageInTransit::Type::CONNECTION_MANAGER,
           MessageInTransit::Subtype::CONNECTION_MANAGER_CANCEL_CONNECT,
-          sizeof(connection_id), &connection_id)))) {
+          sizeof(connection_id), &connection_id))) {
     // Don't tear things down; possibly we'll still read some messages.
     *result = Result::FAILURE;
     event_.Signal();
     return;
   }
   awaiting_ack_type_ = AWAITING_CANCEL_CONNECT_ACK;
   ack_result_ = result;
 }
 
 void SlaveConnectionManager::ConnectOnPrivateThread(
     const ConnectionIdentifier& connection_id,
     Result* result,
     ProcessIdentifier* peer_process_identifier,
     bool* is_first,
     embedder::ScopedPlatformHandle* platform_handle) {
   DCHECK(result);
   AssertOnPrivateThread();
   // This should only posted (from another thread, to |private_thread_|) with
   // the lock held (until this thread triggers |event_|).
   DCHECK(!mutex_.TryLock());
   DCHECK_EQ(awaiting_ack_type_, NOT_AWAITING_ACK);
 
   DVLOG(1) << "Sending Connect: connection ID " << connection_id.ToString();
-  if (!raw_channel_->WriteMessage(make_scoped_ptr(new MessageInTransit(
+  if (!raw_channel_->WriteMessage(util::MakeUnique<MessageInTransit>(
           MessageInTransit::Type::CONNECTION_MANAGER,
           MessageInTransit::Subtype::CONNECTION_MANAGER_CONNECT,
-          sizeof(connection_id), &connection_id)))) {
+          sizeof(connection_id), &connection_id))) {
     // Don't tear things down; possibly we'll still read some messages.
     *result = Result::FAILURE;
     platform_handle->reset();
     event_.Signal();
     return;
   }
   awaiting_ack_type_ = AWAITING_CONNECT_ACK;
   ack_result_ = result;
   ack_peer_process_identifier_ = peer_process_identifier;
   ack_is_first_ = is_first;
@@ skipping 106 matching lines @@
 }
 
 void SlaveConnectionManager::AssertOnPrivateThread() const {
   // This should only be called after |Init()| and before |Shutdown()|.
   DCHECK(private_thread_.message_loop());
   DCHECK_EQ(base::MessageLoop::current(), private_thread_.message_loop());
 }
 
 }  // namespace system
 }  // namespace mojo