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

mojo/edk/system/endpoint_relayer.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/endpoint_relayer.h"
 
 #include <utility>
 
 #include "base/logging.h"
 #include "mojo/edk/system/channel_endpoint.h"
@@ skipping 37 matching lines @@
 
   unsigned peer_port = GetPeerPort(port);
 
   if (filter_ && message->type() == MessageInTransit::Type::ENDPOINT_CLIENT) {
     if (filter_->OnReadMessage(endpoints_[port].get(),
                                endpoints_[peer_port].get(), message))
       return true;
   }
 
   // Otherwise, consume it even if the peer port is closed.
-  if (endpoints_[peer_port])
-    endpoints_[peer_port]->EnqueueMessage(make_scoped_ptr(message));
+  if (endpoints_[peer_port]) {
+    endpoints_[peer_port]->EnqueueMessage(
+        std::unique_ptr<MessageInTransit>(message));
+  }
   return true;
 }
 
 void EndpointRelayer::OnDetachFromChannel(unsigned port) {
   MutexLocker locker(&mutex_);
 
   if (endpoints_[port]) {
     endpoints_[port]->DetachFromClient();
     endpoints_[port] = nullptr;
   }
 
   unsigned peer_port = GetPeerPort(port);
   if (endpoints_[peer_port]) {
     endpoints_[peer_port]->DetachFromClient();
     endpoints_[peer_port] = nullptr;
   }
 }
 
 EndpointRelayer::~EndpointRelayer() {
   DCHECK(!endpoints_[0]);
   DCHECK(!endpoints_[1]);
 }
 
 }  // namespace system
 }  // namespace mojo