Make PlatformFileForTransit a class on Windows.

components/nacl/loader/nacl_ipc_adapter.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 "components/nacl/loader/nacl_ipc_adapter.h"
 
 #include <limits.h>
 #include <string.h>
 #include <tuple>
 #include <utility>
@@ skipping 552 matching lines @@
       scoped_ptr<NaClDescWrapper> nacl_desc;
       switch (iter->type()) {
         case ppapi::proxy::SerializedHandle::SHARED_MEMORY: {
           nacl_desc =
               MakeShmNaClDesc(iter->shmem(), static_cast<size_t>(iter->size()));
           break;
         }
         case ppapi::proxy::SerializedHandle::SOCKET: {
           nacl_desc.reset(new NaClDescWrapper(NaClDescSyncSocketMake(
 #if defined(OS_WIN)
-              iter->descriptor()
+              iter->descriptor().GetHandle()
 #else
               iter->descriptor().fd
 #endif
-          )));
+                  )));

[Mark Seaborn, 2016/03/29 19:24:09]

Nit: should line up with iter->descriptor() args above

[erikchen, 2016/03/29 20:57:42]

Done.

           break;
         }
         case ppapi::proxy::SerializedHandle::FILE: {
           // Create the NaClDesc for the file descriptor. If quota checking is
           // required, wrap it in a NaClDescQuota.
           NaClDesc* desc = NaClDescIoMakeFromHandle(
 #if defined(OS_WIN)
-              iter->descriptor(),
+              iter->descriptor().GetHandle(),
 #else
               iter->descriptor().fd,
 #endif
               TranslatePepperFileReadWriteOpenFlags(iter->open_flags()));
           if (desc && iter->file_io()) {
             desc = MakeNaClDescQuota(
                 locked_data_.nacl_msg_scanner_.GetFile(iter->file_io()),
                 desc);
           }
           if (desc)
@@ skipping 56 matching lines @@
     // original FD to the client without making a validated NaClDesc.
     // However, we must rewrite the message to clear the file tokens.
     base::PickleIterator iter = IPC::SyncMessage::GetDataIterator(&orig_msg);
     ppapi::proxy::SerializedHandle sh;
 
     // We know that this can be read safely; see the original read in
     // OnMessageReceived().
     CHECK(IPC::ReadParam(&orig_msg, &iter, &sh));
     scoped_ptr<IPC::Message> new_msg = CreateOpenResourceReply(orig_msg, sh);
 
-    scoped_ptr<NaClDescWrapper> desc_wrapper(new NaClDescWrapper(
-        NaClDescIoMakeFromHandle(
+    scoped_ptr<NaClDescWrapper> desc_wrapper(
+        new NaClDescWrapper(NaClDescIoMakeFromHandle(
 #if defined(OS_WIN)
-            sh.descriptor(),
+            sh.descriptor().GetHandle(),
 #else
             sh.descriptor().fd,
 #endif
             NACL_ABI_O_RDONLY)));
 
     scoped_refptr<RewrittenMessage> rewritten_msg(new RewrittenMessage);
     rewritten_msg->AddDescriptor(desc_wrapper.release());
     {
       base::AutoLock lock(lock_);
       SaveMessage(*new_msg, rewritten_msg.get());
@@ skipping 165 matching lines @@
   header.flags = msg.flags();
   header.num_fds = static_cast<uint16_t>(rewritten_msg->desc_count());
 
   rewritten_msg->SetData(header, msg.payload(), msg.payload_size());
   locked_data_.to_be_received_.push(rewritten_msg);
 }
 
 int TranslatePepperFileReadWriteOpenFlagsForTesting(int32_t pp_open_flags) {
   return TranslatePepperFileReadWriteOpenFlags(pp_open_flags);
 }