EDK: Convert most uses of PlatformHandleVector to std::vector<ScopedPlatformHandle>.

mojo/edk/system/raw_channel.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 <string.h>
 
 #include <algorithm>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "mojo/edk/system/message_in_transit.h"
 #include "mojo/edk/system/transport_data.h"
 
+using mojo::embedder::ScopedPlatformHandle;
 using mojo::util::MutexLocker;
 
 namespace mojo {
 namespace system {
 
 const size_t kReadSize = 4096;
 
 // RawChannel::ReadBuffer ------------------------------------------------------
 
 RawChannel::ReadBuffer::ReadBuffer() : buffer_(kReadSize), num_valid_bytes_(0) {
@@ skipping 22 matching lines @@
 
 bool RawChannel::WriteBuffer::HavePlatformHandlesToSend() const {
   if (message_queue_.IsEmpty())
     return false;
 
   const TransportData* transport_data =
       message_queue_.PeekMessage()->transport_data();
   if (!transport_data)
     return false;
 
-  const embedder::PlatformHandleVector* all_platform_handles =
+  const std::vector<ScopedPlatformHandle>* all_platform_handles =
       transport_data->platform_handles();
   if (!all_platform_handles) {
     DCHECK_EQ(platform_handles_offset_, 0u);
     return false;
   }
   if (platform_handles_offset_ >= all_platform_handles->size()) {
     DCHECK_EQ(platform_handles_offset_, all_platform_handles->size());
     return false;
   }
 
   return true;
 }
 
 void RawChannel::WriteBuffer::GetPlatformHandlesToSend(
     size_t* num_platform_handles,
     embedder::PlatformHandle** platform_handles,
     void** serialization_data) {
   DCHECK(HavePlatformHandlesToSend());
 
   MessageInTransit* message = message_queue_.PeekMessage();
   TransportData* transport_data = message->transport_data();
-  embedder::PlatformHandleVector* all_platform_handles =
+  std::vector<ScopedPlatformHandle>* all_platform_handles =
       transport_data->platform_handles();
   *num_platform_handles =
       all_platform_handles->size() - platform_handles_offset_;
-  *platform_handles = &(*all_platform_handles)[platform_handles_offset_];
+  *platform_handles = reinterpret_cast<embedder::PlatformHandle*>(
+      &(*all_platform_handles)[platform_handles_offset_]);
 
   if (serialized_platform_handle_size_ > 0) {
     size_t serialization_data_offset =
         transport_data->platform_handle_table_offset();
     serialization_data_offset +=
         platform_handles_offset_ * serialized_platform_handle_size_;
     *serialization_data = static_cast<char*>(transport_data->buffer()) +
                           serialization_data_offset;
   } else {
     *serialization_data = nullptr;
@@ skipping 221 matching lines @@
         CallOnError(Delegate::ERROR_READ_BAD_MESSAGE);
         return;  // |this| may have been destroyed in |CallOnError()|.
       }
 
       if (message_view.type() == MessageInTransit::Type::RAW_CHANNEL) {
         if (!OnReadMessageForRawChannel(message_view)) {
           CallOnError(Delegate::ERROR_READ_BAD_MESSAGE);
           return;  // |this| may have been destroyed in |CallOnError()|.
         }
       } else {
-        embedder::ScopedPlatformHandleVectorPtr platform_handles;
+        std::unique_ptr<std::vector<ScopedPlatformHandle>> platform_handles;
         if (message_view.transport_data_buffer()) {
           size_t num_platform_handles;
           const void* platform_handle_table;
           TransportData::GetPlatformHandleTable(
               message_view.transport_data_buffer(), &num_platform_handles,
               &platform_handle_table);
 
           if (num_platform_handles > 0) {
             platform_handles = GetReadPlatformHandles(num_platform_handles,
                                                       platform_handle_table);
@@ skipping 166 matching lines @@
 
   write_stopped_ = true;
   write_buffer_->message_queue_.Clear();
   write_buffer_->platform_handles_offset_ = 0;
   write_buffer_->data_offset_ = 0;
   return false;
 }
 
 }  // namespace system
 }  // namespace mojo