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_channel_handle.h"
 #include "ipc/ipc_platform_file.h"
 

[Mark Seaborn, 2015/04/17 22:13:45]

Nit: remove 1 empty line so that there's only 1 between blocks

[hidehiko, 2015/04/30 16:33:02]

Done.

-#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
 namespace nacl {
 
-#if defined(OS_WIN)
-typedef HANDLE FileDescriptor;
-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 23 matching lines @@
 // Parameters sent to the NaCl process when we start it.
 struct NaClStartParams {
   NaClStartParams();
   ~NaClStartParams();
 
   IPC::PlatformFileForTransit nexe_file;
   // Used only as a key for validation caching.
   base::FilePath nexe_file_path_metadata;
 
   std::vector<NaClResourceFileInfo> prefetched_resource_files;
-  std::vector<FileDescriptor> handles;
-  FileDescriptor debug_stub_server_bound_socket;
+  std::vector<IPC::PlatformFileForTransit> handles;
+  IPC::PlatformFileForTransit debug_stub_server_bound_socket;
 
   bool validation_cache_enabled;
   std::string validation_cache_key;
   // Chrome version string. Sending the version string over IPC avoids linkage
   // issues in cases where NaCl is not compiled into the main Chromium
   // executable or DLL.
   std::string version;
 
   bool enable_debug_stub;
   bool enable_ipc_proxy;
@@ skipping 43 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_