EDK: Add a MakeUnique and use it somewhere.

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"
 #include "mojo/edk/system/message_in_transit.h"
 
 namespace mojo {
 namespace system {
 
 EndpointRelayer::EndpointRelayer() {
 }
 
 // static
 unsigned EndpointRelayer::GetPeerPort(unsigned port) {
   DCHECK(port == 0 || port == 1);
   return port ^ 1;
 }
 
 void EndpointRelayer::Init(ChannelEndpoint* endpoint0,
                            ChannelEndpoint* endpoint1) {
   DCHECK(endpoint0);
   DCHECK(endpoint1);
   DCHECK(!endpoints_[0]);
   DCHECK(!endpoints_[1]);
   endpoints_[0] = endpoint0;
   endpoints_[1] = endpoint1;
 }
 
-void EndpointRelayer::SetFilter(scoped_ptr<Filter> filter) {
+void EndpointRelayer::SetFilter(std::unique_ptr<Filter> filter) {
   MutexLocker locker(&mutex_);
-  filter_ = filter.Pass();
+  filter_ = std::move(filter);
 }
 
 bool EndpointRelayer::OnReadMessage(unsigned port, MessageInTransit* message) {
   DCHECK(message);
 
   MutexLocker locker(&mutex_);
 
   // If we're no longer the client, then reject the message.
   if (!endpoints_[port])
     return false;
@@ skipping 27 matching lines @@
   }
 }
 
 EndpointRelayer::~EndpointRelayer() {
   DCHECK(!endpoints_[0]);
   DCHECK(!endpoints_[1]);
 }
 
 }  // namespace system
 }  // namespace mojo