EDK: Add a MakeUnique and use it somewhere.

mojo/edk/system/endpoint_relayer.h

 // 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.
 
 #ifndef MOJO_EDK_SYSTEM_ENDPOINT_RELAYER_H_
 #define MOJO_EDK_SYSTEM_ENDPOINT_RELAYER_H_
 
+#include <memory>
+
 #include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
 #include "mojo/edk/system/channel_endpoint_client.h"
 #include "mojo/edk/system/mutex.h"
 #include "mojo/edk/system/system_impl_export.h"
 #include "mojo/public/cpp/system/macros.h"
 
 namespace mojo {
 namespace system {
 
 class ChannelEndpoint;
 
@@ skipping 46 matching lines @@
 
   // Gets the other port number (i.e., 0 -> 1, 1 -> 0).
   static unsigned GetPeerPort(unsigned port);
 
   // Initialize this object. This must be called before any other method.
   void Init(ChannelEndpoint* endpoint0,
             ChannelEndpoint* endpoint1) MOJO_NOT_THREAD_SAFE;
 
   // Sets (or resets) the filter, which can (optionally) handle/filter
   // |Type::ENDPOINT_CLIENT| messages (see |Filter| above).
-  void SetFilter(scoped_ptr<Filter> filter);
+  void SetFilter(std::unique_ptr<Filter> filter);
 
   // |ChannelEndpointClient| methods:
   bool OnReadMessage(unsigned port, MessageInTransit* message) override;
   void OnDetachFromChannel(unsigned port) override;
 
  private:
   ~EndpointRelayer() override;
 
   Mutex mutex_;
   scoped_refptr<ChannelEndpoint> endpoints_[2] MOJO_GUARDED_BY(mutex_);
-  scoped_ptr<Filter> filter_ MOJO_GUARDED_BY(mutex_);
+  std::unique_ptr<Filter> filter_ MOJO_GUARDED_BY(mutex_);
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(EndpointRelayer);
 };
 
 }  // namespace system
 }  // namespace mojo
 
 #endif  // MOJO_EDK_SYSTEM_ENDPOINT_RELAYER_H_