Refactor NaClProcessHost. Reduce chances to leak the resource.

components/nacl/common/nacl_types.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 COMPONENTS_NACL_COMMON_NACL_TYPES_H_
 #define COMPONENTS_NACL_COMMON_NACL_TYPES_H_
 
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/memory/shared_memory.h"
 #include "base/process/process_handle.h"
 #include "build/build_config.h"
 #include "ipc/ipc_channel.h"
 #include "ipc/ipc_platform_file.h"
 
-#if defined(OS_POSIX)
-#include "base/file_descriptor_posix.h"
-#endif
-
-#if defined(OS_WIN)
-#include <windows.h>   // for HANDLE
-#endif
-
 // TODO(gregoryd): add a Windows definition for base::FileDescriptor

[Mark Seaborn, 2015/05/06 21:24:53]

You can remove this comment too.

[hidehiko, 2015/05/07 01:29:07]

Done.

 namespace nacl {
 
-#if defined(OS_WIN)
-typedef HANDLE FileDescriptor;

[Mark Seaborn, 2015/05/06 21:24:53]

Thanks for removing this old stuff!

[hidehiko, 2015/05/07 01:29:07]

Acknowledged.

-inline HANDLE ToNativeHandle(const FileDescriptor& desc) {
-  return desc;
-}
-#elif defined(OS_POSIX)
-typedef base::FileDescriptor FileDescriptor;
-inline int ToNativeHandle(const FileDescriptor& desc) {
-  return desc.fd;
-}
-#endif
-
 // We allocate a page of shared memory for sharing crash information from
 // trusted code in the NaCl process to the renderer.
 static const int kNaClCrashInfoShmemSize = 4096;
 static const int kNaClCrashInfoMaxLogSize = 1024;
 
 // Types of untrusted NaCl processes.
 enum NaClAppProcessType {
   kUnknownNaClProcessType,
   // Runs user-provided *native* code. Enabled for Chrome Web Store apps.
   kNativeNaClProcessType,
@@ skipping 15 matching lines @@
   ~NaClResourcePrefetchRequest();
 
   std::string file_key;  // a key for open_resource.
   std::string resource_url;
 };
 
 // Represents a single prefetched file that's listed in the "files" section of
 // a NaCl manifest file.
 struct NaClResourcePrefetchResult {
   NaClResourcePrefetchResult();
-  NaClResourcePrefetchResult(IPC::PlatformFileForTransit file,
+  NaClResourcePrefetchResult(const IPC::PlatformFileForTransit& file,
                              const base::FilePath& file_path,
                              const std::string& file_key);
   ~NaClResourcePrefetchResult();
 
   IPC::PlatformFileForTransit file;
   base::FilePath file_path_metadata;  // a key for validation caching
   std::string file_key;  // a key for open_resource
 };
 
 // Parameters sent to the NaCl process when we start it.
@@ skipping 66 matching lines @@
   int render_view_id;
   uint32 permission_bits;
   bool uses_nonsfi_mode;
 
   NaClAppProcessType process_type;
 };
 
 struct NaClLaunchResult {
   NaClLaunchResult();
   NaClLaunchResult(
-      FileDescriptor imc_channel_handle,
+      const IPC::PlatformFileForTransit& imc_channel_handle,
       const IPC::ChannelHandle& ppapi_ipc_channel_handle,
       const IPC::ChannelHandle& trusted_ipc_channel_handle,
       const IPC::ChannelHandle& manifest_service_ipc_channel_handle,
       base::ProcessId plugin_pid,
       int plugin_child_id,
       base::SharedMemoryHandle crash_info_shmem_handle);
   ~NaClLaunchResult();
 
   // For plugin loader <-> renderer IMC communication.
-  FileDescriptor imc_channel_handle;
+  IPC::PlatformFileForTransit imc_channel_handle;
 
   // For plugin <-> renderer PPAPI communication.
   IPC::ChannelHandle ppapi_ipc_channel_handle;
 
   // For plugin loader <-> renderer control communication (loading and
   // starting nexe).
   IPC::ChannelHandle trusted_ipc_channel_handle;
 
   // For plugin <-> renderer ManifestService communication.
   IPC::ChannelHandle manifest_service_ipc_channel_handle;
 
   base::ProcessId plugin_pid;
   int plugin_child_id;
 
   // For NaCl <-> renderer crash information reporting.
   base::SharedMemoryHandle crash_info_shmem_handle;
 };
 
 }  // namespace nacl
 
 #endif  // COMPONENTS_NACL_COMMON_NACL_TYPES_H_