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

mojo/edk/system/raw_channel_unittest.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/raw_channel.h"
 
 #include <stdint.h>
 #include <stdio.h>
 
+#include <memory>
+#include <utility>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/logging.h"
-#include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/simple_thread.h"
 #include "mojo/edk/embedder/platform_channel_pair.h"
 #include "mojo/edk/embedder/platform_handle.h"
 #include "mojo/edk/embedder/scoped_platform_handle.h"
 #include "mojo/edk/system/message_in_transit.h"
 #include "mojo/edk/system/mutex.h"
 #include "mojo/edk/system/test_utils.h"
 #include "mojo/edk/system/transport_data.h"
 #include "mojo/edk/test/scoped_test_dir.h"
 #include "mojo/edk/test/test_io_thread.h"
 #include "mojo/edk/test/test_utils.h"
 #include "mojo/edk/util/make_unique.h"
 #include "mojo/edk/util/scoped_file.h"
 #include "mojo/public/cpp/system/macros.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
 namespace system {
 namespace {
 
-scoped_ptr<MessageInTransit> MakeTestMessage(uint32_t num_bytes) {
+std::unique_ptr<MessageInTransit> MakeTestMessage(uint32_t num_bytes) {
   std::vector<unsigned char> bytes(num_bytes, 0);
   for (size_t i = 0; i < num_bytes; i++)
     bytes[i] = static_cast<unsigned char>(i + num_bytes);
-  return make_scoped_ptr(
-      new MessageInTransit(MessageInTransit::Type::ENDPOINT_CLIENT,
-                           MessageInTransit::Subtype::ENDPOINT_CLIENT_DATA,
-                           num_bytes, bytes.empty() ? nullptr : &bytes[0]));
+  return util::MakeUnique<MessageInTransit>(
+      MessageInTransit::Type::ENDPOINT_CLIENT,
+      MessageInTransit::Subtype::ENDPOINT_CLIENT_DATA, num_bytes,
+      bytes.empty() ? nullptr : &bytes[0]);
 }
 
 bool CheckMessageData(const void* bytes, uint32_t num_bytes) {
   const unsigned char* b = static_cast<const unsigned char*>(bytes);
   for (uint32_t i = 0; i < num_bytes; i++) {
     if (b[i] != static_cast<unsigned char>(i + num_bytes))
       return false;
   }
   return true;
 }
 
 void InitOnIOThread(RawChannel* raw_channel, RawChannel::Delegate* delegate) {
   raw_channel->Init(delegate);
 }
 
 bool WriteTestMessageToHandle(const embedder::PlatformHandle& handle,
                               uint32_t num_bytes) {
-  scoped_ptr<MessageInTransit> message(MakeTestMessage(num_bytes));
+  std::unique_ptr<MessageInTransit> message(MakeTestMessage(num_bytes));
 
   size_t write_size = 0;
   mojo::test::BlockingWrite(handle, message->main_buffer(),
                             message->main_buffer_size(), &write_size);
   return write_size == message->main_buffer_size();
 }
 
 // -----------------------------------------------------------------------------
 
 class RawChannelTest : public testing::Test {
@@ skipping 740 matching lines @@
 
   {
     const char kHello[] = "hello";
     embedder::ScopedPlatformHandleVectorPtr platform_handles(
         new embedder::PlatformHandleVector());
     platform_handles->push_back(
         mojo::test::PlatformHandleFromFILE(fp1.Pass()).release());
     platform_handles->push_back(
         mojo::test::PlatformHandleFromFILE(fp2.Pass()).release());
 
-    scoped_ptr<MessageInTransit> message(
+    std::unique_ptr<MessageInTransit> message(
         new MessageInTransit(MessageInTransit::Type::ENDPOINT_CLIENT,
                              MessageInTransit::Subtype::ENDPOINT_CLIENT_DATA,
                              sizeof(kHello), kHello));
     message->SetTransportData(util::MakeUnique<TransportData>(
         platform_handles.Pass(), rc_write->GetSerializedPlatformHandleSize()));
-    EXPECT_TRUE(rc_write->WriteMessage(message.Pass()));
+    EXPECT_TRUE(rc_write->WriteMessage(std::move(message)));
   }
 
   read_delegate.Wait();
 
   io_thread()->PostTaskAndWait(
       FROM_HERE,
       base::Bind(&RawChannel::Shutdown, base::Unretained(rc_read.get())));
   io_thread()->PostTaskAndWait(
       FROM_HERE,
       base::Bind(&RawChannel::Shutdown, base::Unretained(rc_write.get())));
 }
 
 }  // namespace
 }  // namespace system
 }  // namespace mojo