EDK: More scoped_ptr -> std::unique_ptr conversions.

mojo/edk/system/message_in_transit.cc

 // Copyright 2013 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/message_in_transit.h"
 
 #include <string.h>
 
-#include <ostream>
+#include <utility>
 
 #include "base/logging.h"
 #include "mojo/edk/system/configuration.h"
 #include "mojo/edk/system/transport_data.h"
 
 namespace mojo {
 namespace system {
 
 MOJO_STATIC_CONST_MEMBER_DEFINITION const size_t
     MessageInTransit::kMessageAlignment;
@@ skipping 117 matching lines @@
   if (buffer_size < sizeof(Header))
     return false;
 
   const Header* header = static_cast<const Header*>(buffer);
   *next_message_size = header->total_size;
   DCHECK_EQ(*next_message_size % kMessageAlignment, 0u);
   return true;
 }
 
 void MessageInTransit::SetDispatchers(
-    scoped_ptr<DispatcherVector> dispatchers) {
+    std::unique_ptr<DispatcherVector> dispatchers) {
   DCHECK(dispatchers);
   DCHECK(!dispatchers_);
   DCHECK(!transport_data_);
 
-  dispatchers_ = dispatchers.Pass();
+  dispatchers_ = std::move(dispatchers);
 #ifndef NDEBUG
   for (size_t i = 0; i < dispatchers_->size(); i++)
     DCHECK(!(*dispatchers_)[i] || (*dispatchers_)[i]->HasOneRef());
 #endif
 }
 
 void MessageInTransit::SetTransportData(
-    scoped_ptr<TransportData> transport_data) {
+    std::unique_ptr<TransportData> transport_data) {
   DCHECK(transport_data);
   DCHECK(!transport_data_);
   DCHECK(!dispatchers_);
 
-  transport_data_ = transport_data.Pass();
+  transport_data_ = std::move(transport_data);
   UpdateTotalSize();
 }
 
 void MessageInTransit::SerializeAndCloseDispatchers(Channel* channel) {
   DCHECK(channel);
   DCHECK(!transport_data_);
 
   if (!dispatchers_ || !dispatchers_->size())
     return;
 
-  transport_data_.reset(new TransportData(dispatchers_.Pass(), channel));
+  transport_data_.reset(new TransportData(std::move(dispatchers_), channel));
 
   // Update the sizes in the message header.
   UpdateTotalSize();
 }
 
 void MessageInTransit::ConstructorHelper(Type type,
                                          Subtype subtype,
                                          uint32_t num_bytes) {
   DCHECK_LE(num_bytes, GetConfiguration().max_message_num_bytes);
 
@@ skipping 13 matching lines @@
   DCHECK_EQ(main_buffer_size_ % kMessageAlignment, 0u);
   header()->total_size = static_cast<uint32_t>(main_buffer_size_);
   if (transport_data_) {
     header()->total_size +=
         static_cast<uint32_t>(transport_data_->buffer_size());
   }
 }
 
 }  // namespace system
 }  // namespace mojo