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

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"
@@ skipping 81 matching lines @@
   base::WaitableEvent read_event(true, false);
   client1b()->SetReadEvent(&read_event);
   EXPECT_EQ(0u, client1b()->NumMessages());
 
   EXPECT_TRUE(endpoint1a()->EnqueueMessage(test::MakeTestMessage(12345)));
 
   EXPECT_TRUE(read_event.TimedWait(TestTimeouts::tiny_timeout()));
   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);
 
   // Now do the same thing in the opposite direction.
   read_event.Reset();
   client1a()->SetReadEvent(&read_event);
   EXPECT_EQ(0u, client1a()->NumMessages());
 
   EXPECT_TRUE(endpoint1b()->EnqueueMessage(test::MakeTestMessage(67890)));
 
@@ skipping 17 matching lines @@
   client1b()->SetReadEvent(&read_event);
   for (size_t i = 0; client1b()->NumMessages() < 5 && i < 5; i++) {
     EXPECT_TRUE(read_event.TimedWait(TestTimeouts::tiny_timeout()));
     read_event.Reset();
   }
   client1b()->SetReadEvent(nullptr);
 
   // 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);
   }
 }
 
 // A simple test filter. It will filter test messages made with
 // |test::MakeTestMessage()| with |id >= 1000|, and not filter other messages.
 class TestFilter : public EndpointRelayer::Filter {
  public:
   // |filtered_messages| will receive (and own) filtered messages; it will be
@@ skipping 12 matching lines @@
   // Note: Recall that this is called under the |EndpointRelayer|'s lock.
   bool OnReadMessage(ChannelEndpoint* endpoint,
                      ChannelEndpoint* peer_endpoint,
                      MessageInTransit* message) override {
     CHECK(endpoint);
     CHECK(peer_endpoint);
     CHECK(message);
 
     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;
     }
 
     return false;
   }
 
  private:
   MessageInTransitQueue* const filtered_messages_;
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(TestFilter);
@@ skipping 16 matching lines @@
   client1b()->SetReadEvent(&read_event);
   for (size_t i = 0; client1b()->NumMessages() < 5 && i < 5; i++) {
     EXPECT_TRUE(read_event.TimedWait(TestTimeouts::tiny_timeout()));
     read_event.Reset();
   }
   client1b()->SetReadEvent(nullptr);
 
   // 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);
   }
 
   // Reset the filter, so we can safely examine |filtered_messages|.
   relayer()->SetFilter(nullptr);
 
   // Note that since "5" was sent after "1003" and it the former was received,
   // 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);
   }
 }
 
 // TODO(vtl): Add some "shutdown" tests.
 
 }  // namespace
 }  // namespace system
 }  // namespace mojo