[mojo-edk] Explicitly serialise HANDLEs into messages instead of PlatformHandles.

mojo/edk/system/node_controller.cc

 // Copyright 2016 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/node_controller.h"
 
 #include <algorithm>
 #include <limits>
 
 #include "base/bind.h"
@@ skipping 925 matching lines @@
 #if defined(OS_WIN)
   // Rewrite the handles to this (the parent) process. If the message is
   // destined for another child process, the handles will be rewritten to that
   // process before going out (see NodeChannel::WriteChannelMessage).
   //
   // TODO: We could avoid double-duplication.
   //
   // Note that we explicitly mark the handles as being owned by the sending
   // process before rewriting them, in order to accommodate RewriteHandles'
   // internal sanity checks.
-  for (size_t i = 0; i < message->num_handles(); ++i)
-    message->handles()[i].owning_process = from_process;
+  ScopedPlatformHandleVectorPtr handles = message->TakeHandles();
+  for (size_t i = 0; i < handles->size(); ++i)
+    (*handles)[i].owning_process = from_process;
   if (!Channel::Message::RewriteHandles(from_process,
                                         base::GetCurrentProcessHandle(),
-                                        message->handles(),
-                                        message->num_handles())) {
+                                        handles.get())) {
     DLOG(ERROR) << "Failed to relay one or more handles.";
   }
+  message->SetHandles(std::move(handles));
 #else
   MachPortRelay* relay = GetMachPortRelay();
   if (!relay) {
     LOG(ERROR) << "Receiving Mach ports without a port relay from "
                << from_node << ". Dropping message.";
     return;
   }
   if (!relay->ExtractPortRights(message.get(), from_process)) {
     // NodeChannel should ensure that MachPortRelay is ready for the remote
     // process. At this point, if the port extraction failed, either something
@@ skipping 66 matching lines @@
     shutdown_callback_flag_.Set(false);
   }
 
   DCHECK(!callback.is_null());
 
   callback.Run();
 }
 
 }  // namespace edk
 }  // namespace mojo