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

mojo/edk/system/endpoint_relayer_unittest.cc

Index: mojo/edk/system/endpoint_relayer_unittest.cc
diff --git a/mojo/edk/system/endpoint_relayer_unittest.cc b/mojo/edk/system/endpoint_relayer_unittest.cc
index 36711a97cdb42ebe7c5341d7bddcdecd87ddf980..276bfeeb2ececa2834e38bfeb0e6cbd53e75ce8a 100644
--- a/mojo/edk/system/endpoint_relayer_unittest.cc
+++ b/mojo/edk/system/endpoint_relayer_unittest.cc
@@ -99,7 +99,7 @@ TEST_F(EndpointRelayerTest, Basic) {
   client1b()->SetReadEvent(nullptr);
 
   ASSERT_EQ(1u, client1b()->NumMessages());
-  scoped_ptr<MessageInTransit> read_message = client1b()->PopMessage();
+  std::unique_ptr<MessageInTransit> read_message = client1b()->PopMessage();
   ASSERT_TRUE(read_message);
   test::VerifyTestMessage(read_message.get(), 12345);
 
@@ -137,7 +137,7 @@ TEST_F(EndpointRelayerTest, MultipleMessages) {
   // Check the received messages.
   ASSERT_EQ(5u, client1b()->NumMessages());
   for (unsigned message_id = 1; message_id <= 5; message_id++) {
-    scoped_ptr<MessageInTransit> read_message = client1b()->PopMessage();
+    std::unique_ptr<MessageInTransit> read_message = client1b()->PopMessage();
     ASSERT_TRUE(read_message);
     test::VerifyTestMessage(read_message.get(), message_id);
   }
@@ -170,7 +170,8 @@ class TestFilter : public EndpointRelayer::Filter {
 
     unsigned id = 0;
     if (test::IsTestMessage(message, &id) && id >= 1000) {
-      filtered_messages_->AddMessage(make_scoped_ptr(message));
+      filtered_messages_->AddMessage(
+          std::unique_ptr<MessageInTransit>(message));
       return true;
     }
 
@@ -207,7 +208,7 @@ TEST_F(EndpointRelayerTest, Filter) {
   // Check the received messages: We should get "1"-"5".
   ASSERT_EQ(5u, client1b()->NumMessages());
   for (unsigned message_id = 1; message_id <= 5; message_id++) {
-    scoped_ptr<MessageInTransit> read_message = client1b()->PopMessage();
+    std::unique_ptr<MessageInTransit> read_message = client1b()->PopMessage();
     ASSERT_TRUE(read_message);
     test::VerifyTestMessage(read_message.get(), message_id);
   }
@@ -219,7 +220,7 @@ TEST_F(EndpointRelayerTest, Filter) {
   // the latter must have also been "received"/filtered.
   ASSERT_EQ(3u, filtered_messages.Size());
   for (unsigned message_id = 1001; message_id <= 1003; message_id++) {
-    scoped_ptr<MessageInTransit> message = filtered_messages.GetMessage();
+    std::unique_ptr<MessageInTransit> message = filtered_messages.GetMessage();
     ASSERT_TRUE(message);
     test::VerifyTestMessage(message.get(), message_id);
   }