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

mojo/edk/system/transport_data.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/transport_data.h"
 
 #include <string.h>
 
 #include "base/logging.h"
 #include "mojo/edk/system/channel.h"
@@ skipping 42 matching lines @@
                         MessageInTransit::kMessageAlignment ==
                     0,
                 "kMaxSerializedDispatcherSize not a multiple of alignment");
   static_assert(sizeof(HandleTableEntry) %
                         MessageInTransit::kMessageAlignment ==
                     0,
                 "sizeof(MessageInTransit::HandleTableEntry) not a multiple of "
                 "alignment");
 };
 
-TransportData::TransportData(scoped_ptr<DispatcherVector> dispatchers,
+TransportData::TransportData(std::unique_ptr<DispatcherVector> dispatchers,
                              Channel* channel)
     : buffer_size_() {
   DCHECK(dispatchers);
   DCHECK(channel);
 
   const size_t num_handles = dispatchers->size();
   DCHECK_GT(num_handles, 0u);
 
   // The offset to the start of the (Mojo) handle table.
   const size_t handle_table_start_offset = sizeof(Header);
@@ skipping 225 matching lines @@
   DCHECK(num_platform_handles);
   DCHECK(platform_handle_table);
 
   const Header* header = static_cast<const Header*>(transport_data_buffer);
   *num_platform_handles = header->num_platform_handles;
   *platform_handle_table = static_cast<const char*>(transport_data_buffer) +
                            header->platform_handle_table_offset;
 }
 
 // static
-scoped_ptr<DispatcherVector> TransportData::DeserializeDispatchers(
+std::unique_ptr<DispatcherVector> TransportData::DeserializeDispatchers(
     const void* buffer,
     size_t buffer_size,
     embedder::ScopedPlatformHandleVectorPtr platform_handles,
     Channel* channel) {
   DCHECK(buffer);
   DCHECK_GT(buffer_size, 0u);
   DCHECK(channel);
 
   const Header* header = static_cast<const Header*>(buffer);
   const size_t num_handles = header->num_handles;
-  scoped_ptr<DispatcherVector> dispatchers(new DispatcherVector(num_handles));
+  std::unique_ptr<DispatcherVector> dispatchers(
+      new DispatcherVector(num_handles));
 
   const HandleTableEntry* handle_table =
       reinterpret_cast<const HandleTableEntry*>(
           static_cast<const char*>(buffer) + sizeof(Header));
   for (size_t i = 0; i < num_handles; i++) {
     size_t offset = handle_table[i].offset;
     size_t size = handle_table[i].size;
     // Should already have been checked by |ValidateBuffer()|:
     DCHECK_EQ(offset % MessageInTransit::kMessageAlignment, 0u);
     DCHECK_LE(offset, buffer_size);
     DCHECK_LE(offset + size, buffer_size);
 
     const void* source = static_cast<const char*>(buffer) + offset;
     (*dispatchers)[i] = Dispatcher::TransportDataAccess::Deserialize(
         channel, handle_table[i].type, source, size, platform_handles.get());
   }
 
-  return dispatchers.Pass();
+  return dispatchers;
 }
 
 }  // namespace system
 }  // namespace mojo