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

mojo/edk/system/transport_data.h

 // 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.
 
 #ifndef MOJO_EDK_SYSTEM_TRANSPORT_DATA_H_
 #define MOJO_EDK_SYSTEM_TRANSPORT_DATA_H_
 
 #include <stdint.h>
 
 #include <memory>
 #include <vector>
 
 #include "base/memory/aligned_memory.h"
-#include "mojo/edk/embedder/platform_handle.h"
-#include "mojo/edk/embedder/platform_handle_vector.h"
+#include "mojo/edk/embedder/scoped_platform_handle.h"
 #include "mojo/edk/system/dispatcher.h"
 #include "mojo/public/cpp/system/macros.h"
 
 namespace mojo {
 namespace system {
 
 class Channel;
 
 // This class is used by |MessageInTransit| to represent handles (|Dispatcher|s)
 // in various stages of serialization.
@@ skipping 62 matching lines @@
   static size_t GetMaxPlatformHandles();
 
   TransportData(std::unique_ptr<DispatcherVector> dispatchers,
                 Channel* channel);
 
   // This is used for users of |MessageInTransit|/|TransportData|/|RawChannel|
   // that want to simply transport data and platform handles, and not
   // |Dispatcher|s. (|Header| will be present, and zero except for
   // |num_platform_handles|, and |platform_handle_table_offset| if necessary.)
   explicit TransportData(
-      embedder::ScopedPlatformHandleVectorPtr platform_handles,
+      std::unique_ptr<std::vector<embedder::ScopedPlatformHandle>>
+          platform_handles,
       size_t serialized_platform_handle_size);
 
   ~TransportData();
 
   const void* buffer() const { return buffer_.get(); }
   void* buffer() { return buffer_.get(); }
   size_t buffer_size() const { return buffer_size_; }
 
   uint32_t platform_handle_table_offset() const {
     return header()->platform_handle_table_offset;
   }
 
   // Gets attached platform-specific handles; this may return null if there are
   // none. Note that the caller may mutate the set of platform-specific handles.
-  const embedder::PlatformHandleVector* platform_handles() const {
+  const std::vector<embedder::ScopedPlatformHandle>* platform_handles() const {
     return platform_handles_.get();
   }
-  embedder::PlatformHandleVector* platform_handles() {
+  std::vector<embedder::ScopedPlatformHandle>* platform_handles() {
     return platform_handles_.get();
   }
 
   // Receive-side functions:
 
   // Checks if the given buffer (from the "wire") looks like a valid
   // |TransportData| buffer. (Should only be called if |buffer_size| is
   // nonzero.) Returns null if valid, and a pointer to a human-readable error
   // message (for debug/logging purposes) on error. Note: This checks the
   // validity of the handle table entries (i.e., does range checking), but does
   // not check that the validity of the actual serialized dispatcher
   // information.
   static const char* ValidateBuffer(size_t serialized_platform_handle_size,
                                     const void* buffer,
                                     size_t buffer_size);
 
   // Gets the platform handle table from a (valid) |TransportData| buffer (which
   // should have been validated using |ValidateBuffer()| first).
   static void GetPlatformHandleTable(const void* transport_data_buffer,
                                      size_t* num_platform_handles,
                                      const void** platform_handle_table);
 
   // Deserializes dispatchers from the given (serialized) transport data buffer
   // (typically from a |MessageInTransit::View|) and vector of platform handles.
   // |buffer| should be non-null and |buffer_size| should be nonzero.
   static std::unique_ptr<DispatcherVector> DeserializeDispatchers(
       const void* buffer,
       size_t buffer_size,
-      embedder::ScopedPlatformHandleVectorPtr platform_handles,
+      std::unique_ptr<std::vector<embedder::ScopedPlatformHandle>>
+          platform_handles,
       Channel* channel);
 
  private:
   // To allow us to make compile-assertions about |Header|, etc. in the .cc
   // file.
   struct PrivateStructForCompileAsserts;
 
   // Header for the "secondary buffer"/"transport data". Must be a multiple of
   // |MessageInTransit::kMessageAlignment| in size. Must be POD.
   struct Header {
@@ skipping 16 matching lines @@
     return reinterpret_cast<const Header*>(buffer_.get());
   }
 
   size_t buffer_size_;
   std::unique_ptr<char, base::AlignedFreeDeleter> buffer_;  // Never null.
 
   // Any platform-specific handles attached to this message (for inter-process
   // transport). The vector (if any) owns the handles that it contains (and is
   // responsible for closing them).
   // TODO(vtl): With C++11, change it to a vector of |ScopedPlatformHandle|s.
-  embedder::ScopedPlatformHandleVectorPtr platform_handles_;
+  std::unique_ptr<std::vector<embedder::ScopedPlatformHandle>>
+      platform_handles_;
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(TransportData);
 };
 
 }  // namespace system
 }  // namespace mojo
 
 #endif  // MOJO_EDK_SYSTEM_TRANSPORT_DATA_H_