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

mojo/edk/system/dispatcher.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/dispatcher.h"
 
 #include "base/logging.h"
 #include "mojo/edk/system/configuration.h"
 #include "mojo/edk/system/data_pipe_consumer_dispatcher.h"
 #include "mojo/edk/system/data_pipe_producer_dispatcher.h"
 #include "mojo/edk/system/message_pipe_dispatcher.h"
 #include "mojo/edk/system/platform_handle_dispatcher.h"
 #include "mojo/edk/system/shared_buffer_dispatcher.h"
 
+using mojo::embedder::ScopedPlatformHandle;
 using mojo::util::MutexLocker;
 using mojo::util::RefPtr;
 
 namespace mojo {
 namespace system {
 
 namespace test {
 
 // TODO(vtl): Maybe this should be defined in a test-only file instead.
 DispatcherTransport DispatcherTryStartTransport(Dispatcher* dispatcher) {
@@ skipping 31 matching lines @@
   DCHECK(dispatcher);
   dispatcher->StartSerialize(channel, max_size, max_platform_handles);
 }
 
 // static
 bool Dispatcher::TransportDataAccess::EndSerializeAndClose(
     Dispatcher* dispatcher,
     Channel* channel,
     void* destination,
     size_t* actual_size,
-    embedder::PlatformHandleVector* platform_handles) {
+    std::vector<ScopedPlatformHandle>* platform_handles) {
   DCHECK(dispatcher);
   return dispatcher->EndSerializeAndClose(channel, destination, actual_size,
                                           platform_handles);
 }
 
 // static
 RefPtr<Dispatcher> Dispatcher::TransportDataAccess::Deserialize(
     Channel* channel,
     int32_t type,
     const void* source,
     size_t size,
-    embedder::PlatformHandleVector* platform_handles) {
+    std::vector<ScopedPlatformHandle>* platform_handles) {
   switch (static_cast<Dispatcher::Type>(type)) {
     case Type::UNKNOWN:
       DVLOG(2) << "Deserializing invalid handle";
       return nullptr;
     case Type::MESSAGE_PIPE:
       return MessagePipeDispatcher::Deserialize(channel, source, size);
     case Type::DATA_PIPE_PRODUCER:
       return DataPipeProducerDispatcher::Deserialize(channel, source, size);
     case Type::DATA_PIPE_CONSUMER:
       return DataPipeConsumerDispatcher::Deserialize(channel, source, size);
@@ skipping 316 matching lines @@
   AssertHasOneRef();  // Only one ref => no need to take the lock.
   DCHECK(!is_closed_);
   *max_size = 0;
   *max_platform_handles = 0;
 }
 
 bool Dispatcher::EndSerializeAndCloseImplNoLock(
     Channel* /*channel*/,
     void* /*destination*/,
     size_t* /*actual_size*/,
-    embedder::PlatformHandleVector* /*platform_handles*/) {
+    std::vector<ScopedPlatformHandle>* /*platform_handles*/) {
   AssertHasOneRef();  // Only one ref => no need to take the lock.
   DCHECK(is_closed_);
   // By default, serializing isn't supported, so just close.
   CloseImplNoLock();
   return false;
 }
 
 bool Dispatcher::IsBusyNoLock() const {
   mutex_.AssertHeld();
   DCHECK(!is_closed_);
@@ skipping 28 matching lines @@
   DCHECK(max_platform_handles);
   AssertHasOneRef();  // Only one ref => no need to take the lock.
   DCHECK(!is_closed_);
   StartSerializeImplNoLock(channel, max_size, max_platform_handles);
 }
 
 bool Dispatcher::EndSerializeAndClose(
     Channel* channel,
     void* destination,
     size_t* actual_size,
-    embedder::PlatformHandleVector* platform_handles) {
+    std::vector<ScopedPlatformHandle>* platform_handles) {
   DCHECK(channel);
   DCHECK(actual_size);
   AssertHasOneRef();  // Only one ref => no need to take the lock.
   DCHECK(!is_closed_);
 
   // Like other |...Close()| methods, we mark ourselves as closed before calling
   // the impl. But there's no need to cancel waiters: we shouldn't have any (and
   // shouldn't be in |Core|'s handle table.
   is_closed_ = true;
 
@@ skipping 11 matching lines @@
 // DispatcherTransport ---------------------------------------------------------
 
 void DispatcherTransport::End() {
   DCHECK(dispatcher_);
   dispatcher_->mutex_.Unlock();
   dispatcher_ = nullptr;
 }
 
 }  // namespace system
 }  // namespace mojo