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

mojo/edk/system/dispatcher.h

 // 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.
 
 #ifndef MOJO_EDK_SYSTEM_DISPATCHER_H_
 #define MOJO_EDK_SYSTEM_DISPATCHER_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <memory>
 #include <ostream>
 #include <vector>
 
-#include "mojo/edk/embedder/platform_handle_vector.h"
+#include "mojo/edk/embedder/scoped_platform_handle.h"
 #include "mojo/edk/system/handle_signals_state.h"
 #include "mojo/edk/system/memory.h"
 #include "mojo/edk/util/mutex.h"
 #include "mojo/edk/util/ref_counted.h"
 #include "mojo/edk/util/ref_ptr.h"
 #include "mojo/edk/util/thread_annotations.h"
 #include "mojo/public/c/system/buffer.h"
 #include "mojo/public/c/system/data_pipe.h"
 #include "mojo/public/c/system/message_pipe.h"
 #include "mojo/public/c/system/types.h"
@@ skipping 167 matching lines @@
     // details.
     static void StartSerialize(Dispatcher* dispatcher,
                                Channel* channel,
                                size_t* max_size,
                                size_t* max_platform_handles);
     static bool EndSerializeAndClose(
         Dispatcher* dispatcher,
         Channel* channel,
         void* destination,
         size_t* actual_size,
-        embedder::PlatformHandleVector* platform_handles);
+        std::vector<embedder::ScopedPlatformHandle>* platform_handles);
 
     // Deserialization API.
     // Note: This "clears" (i.e., reset to the invalid handle) any platform
     // handles that it takes ownership of.
     static util::RefPtr<Dispatcher> Deserialize(
         Channel* channel,
         int32_t type,
         const void* source,
         size_t size,
-        embedder::PlatformHandleVector* platform_handles);
+        std::vector<embedder::ScopedPlatformHandle>* platform_handles);
   };
 
  protected:
   Dispatcher();
   virtual ~Dispatcher();
 
   // These are to be overridden by subclasses (if necessary). They are called
   // exactly once (first |CancelAllAwakablesNoLock()|, then |CloseImplNoLock()|)
   // when the dispatcher is being closed.
   virtual void CancelAllAwakablesNoLock() MOJO_EXCLUSIVE_LOCKS_REQUIRED(mutex_);
@@ skipping 73 matching lines @@
   // TODO(vtl): Consider making these pure virtual once most things support
   // being passed over a message pipe.
   virtual void StartSerializeImplNoLock(Channel* channel,
                                         size_t* max_size,
                                         size_t* max_platform_handles)
       MOJO_NOT_THREAD_SAFE;
   virtual bool EndSerializeAndCloseImplNoLock(
       Channel* channel,
       void* destination,
       size_t* actual_size,
-      embedder::PlatformHandleVector* platform_handles) MOJO_NOT_THREAD_SAFE;
+      std::vector<embedder::ScopedPlatformHandle>* platform_handles)
+      MOJO_NOT_THREAD_SAFE;
 
   // This should be overridden to return true if/when there's an ongoing
   // operation (e.g., two-phase read/writes on data pipes) that should prevent a
   // handle from being sent over a message pipe (with status "busy").
   virtual bool IsBusyNoLock() const MOJO_SHARED_LOCKS_REQUIRED(mutex_);
 
   util::Mutex& mutex() const MOJO_LOCK_RETURNED(mutex_) { return mutex_; }
 
  private:
   FRIEND_REF_COUNTED_THREAD_SAFE(Dispatcher);
@@ skipping 46 matching lines @@
   // |platform_handles| (which may be null if no platform handles were indicated
   // to be required to |StartSerialize()|). This may write no more than the
   // amount indicated by |StartSerialize()|. (WARNING: Beware of races, e.g., if
   // something can be mutated between the two calls!) Returns true on success,
   // in which case |*actual_size| is set to the amount it actually wrote to
   // |destination|. On failure, |*actual_size| should not be modified; however,
   // the dispatcher will still be closed.
   bool EndSerializeAndClose(Channel* channel,
                             void* destination,
                             size_t* actual_size,
-                            embedder::PlatformHandleVector* platform_handles)
-      MOJO_NOT_THREAD_SAFE;
+                            std::vector<embedder::ScopedPlatformHandle>*
+                                platform_handles) MOJO_NOT_THREAD_SAFE;
 
   // This protects the following members as well as any state added by
   // subclasses.
   mutable util::Mutex mutex_;
   bool is_closed_ MOJO_GUARDED_BY(mutex_);
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(Dispatcher);
 };
 
 // Wrapper around a |Dispatcher| pointer, while it's being processed to be
@@ skipping 36 matching lines @@
 
 // So logging macros and |DCHECK_EQ()|, etc. work.
 inline std::ostream& operator<<(std::ostream& out, Dispatcher::Type type) {
   return out << static_cast<int>(type);
 }
 
 }  // namespace system
 }  // namespace mojo
 
 #endif  // MOJO_EDK_SYSTEM_DISPATCHER_H_