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

mojo/edk/system/data_pipe_impl.h

 // 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.
 
 #ifndef MOJO_EDK_SYSTEM_DATA_PIPE_IMPL_H_
 #define MOJO_EDK_SYSTEM_DATA_PIPE_IMPL_H_
 
 #include <stdint.h>
 
 #include <utility>
+#include <vector>
 
-#include "mojo/edk/embedder/platform_handle_vector.h"
+#include "mojo/edk/embedder/scoped_platform_handle.h"
 #include "mojo/edk/system/data_pipe.h"
 #include "mojo/edk/system/handle_signals_state.h"
 #include "mojo/edk/system/memory.h"
 #include "mojo/edk/util/thread_annotations.h"
 #include "mojo/public/c/system/data_pipe.h"
 #include "mojo/public/c/system/macros.h"
 #include "mojo/public/c/system/types.h"
 
 namespace mojo {
 namespace system {
@@ skipping 45 matching lines @@
   virtual MojoResult ProducerEndWriteData(uint32_t num_bytes_written) = 0;
   // Note: A producer should not be writable during a two-phase write.
   virtual HandleSignalsState ProducerGetHandleSignalsState() const = 0;
   virtual void ProducerStartSerialize(Channel* channel,
                                       size_t* max_size,
                                       size_t* max_platform_handles) = 0;
   virtual bool ProducerEndSerialize(
       Channel* channel,
       void* destination,
       size_t* actual_size,
-      embedder::PlatformHandleVector* platform_handles) = 0;
+      std::vector<embedder::ScopedPlatformHandle>* platform_handles) = 0;
 
   virtual void ConsumerClose() = 0;
   // |num_bytes.Get()| will be a nonzero multiple of |element_num_bytes()|.
   virtual MojoResult ConsumerReadData(UserPointer<void> elements,
                                       UserPointer<uint32_t> num_bytes,
                                       uint32_t max_num_bytes_to_read,
                                       uint32_t min_num_bytes_to_read,
                                       bool peek) = 0;
   virtual MojoResult ConsumerDiscardData(UserPointer<uint32_t> num_bytes,
                                          uint32_t max_num_bytes_to_discard,
                                          uint32_t min_num_bytes_to_discard) = 0;
   // |num_bytes.Get()| will be a nonzero multiple of |element_num_bytes()|.
   virtual MojoResult ConsumerQueryData(UserPointer<uint32_t> num_bytes) = 0;
   virtual MojoResult ConsumerBeginReadData(
       UserPointer<const void*> buffer,
       UserPointer<uint32_t> buffer_num_bytes) = 0;
   virtual MojoResult ConsumerEndReadData(uint32_t num_bytes_read) = 0;
   // Note: A consumer should not be writable during a two-phase read.
   virtual HandleSignalsState ConsumerGetHandleSignalsState() const = 0;
   virtual void ConsumerStartSerialize(Channel* channel,
                                       size_t* max_size,
                                       size_t* max_platform_handles) = 0;
   virtual bool ConsumerEndSerialize(
       Channel* channel,
       void* destination,
       size_t* actual_size,
-      embedder::PlatformHandleVector* platform_handles) = 0;
+      std::vector<embedder::ScopedPlatformHandle>* platform_handles) = 0;
 
   virtual bool OnReadMessage(unsigned port, MessageInTransit* message) = 0;
   virtual void OnDetachFromChannel(unsigned port) = 0;
 
  protected:
   DataPipeImpl() : owner_() {}
 
   // Helper to convert the given circular buffer into messages. The input is a
   // circular buffer |buffer| (with appropriate element size and capacity), with
   // current contents starting at |start_index| of length |current_num_bytes|.
@@ skipping 76 matching lines @@
 struct MOJO_ALIGNAS(8) SerializedDataPipeConsumerDispatcher {
   // Only validated (and thus canonicalized) options should be serialized.
   // However, the deserializer must revalidate (as with everything received).
   MojoCreateDataPipeOptions validated_options;
 };
 
 }  // namespace system
 }  // namespace mojo
 
 #endif  // MOJO_EDK_SYSTEM_DATA_PIPE_IMPL_H_