EDK: Add a MakeUnique and use it somewhere.

mojo/edk/system/endpoint_relayer_unittest.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/endpoint_relayer.h"
 
 #include "base/logging.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/test/test_timeouts.h"
 #include "mojo/edk/system/channel_endpoint_id.h"
 #include "mojo/edk/system/channel_test_base.h"
+#include "mojo/edk/system/make_unique.h"
 #include "mojo/edk/system/message_in_transit_queue.h"
 #include "mojo/edk/system/message_in_transit_test_utils.h"
 #include "mojo/edk/system/test_channel_endpoint_client.h"
 #include "mojo/public/cpp/system/macros.h"
 
 namespace mojo {
 namespace system {
 namespace {
 
 class EndpointRelayerTest : public test::ChannelTestBase {
@@ skipping 155 matching lines @@
   }
 
  private:
   MessageInTransitQueue* const filtered_messages_;
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(TestFilter);
 };
 
 TEST_F(EndpointRelayerTest, Filter) {
   MessageInTransitQueue filtered_messages;
-  relayer()->SetFilter(make_scoped_ptr(new TestFilter(&filtered_messages)));
+  relayer()->SetFilter(MakeUnique<TestFilter>(&filtered_messages));
 
   EXPECT_TRUE(endpoint1a()->EnqueueMessage(test::MakeTestMessage(1)));
   EXPECT_TRUE(endpoint1a()->EnqueueMessage(test::MakeTestMessage(2)));
   EXPECT_TRUE(endpoint1a()->EnqueueMessage(test::MakeTestMessage(1001)));
   EXPECT_TRUE(endpoint1a()->EnqueueMessage(test::MakeTestMessage(3)));
   EXPECT_TRUE(endpoint1a()->EnqueueMessage(test::MakeTestMessage(4)));
   EXPECT_TRUE(endpoint1a()->EnqueueMessage(test::MakeTestMessage(1002)));
   EXPECT_TRUE(endpoint1a()->EnqueueMessage(test::MakeTestMessage(1003)));
   EXPECT_TRUE(endpoint1a()->EnqueueMessage(test::MakeTestMessage(5)));
 
@@ skipping 24 matching lines @@
     ASSERT_TRUE(message);
     test::VerifyTestMessage(message.get(), message_id);
   }
 }
 
 // TODO(vtl): Add some "shutdown" tests.
 
 }  // namespace
 }  // namespace system
 }  // namespace mojo