NaCl: Stop sending resource FDs with NaClProcessMsg_Start

components/nacl/common/nacl_messages.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.
 
 // Defines messages between the browser and NaCl process.
 
 // Multiply-included message file, no traditional include guard.
 #include "base/process/process.h"
 #include "components/nacl/common/nacl_types.h"
 #include "components/nacl/common/nacl_types_param_traits.h"
 #include "ipc/ipc_channel_handle.h"
 #include "ipc/ipc_message_macros.h"
 #include "ipc/ipc_platform_file.h"
 
 #define IPC_MESSAGE_START NaClMsgStart
 
 IPC_STRUCT_TRAITS_BEGIN(nacl::NaClStartParams)
   IPC_STRUCT_TRAITS_MEMBER(nexe_file)
   IPC_STRUCT_TRAITS_MEMBER(nexe_file_path_metadata)
-  IPC_STRUCT_TRAITS_MEMBER(prefetched_resource_files)
   IPC_STRUCT_TRAITS_MEMBER(imc_bootstrap_handle)
   IPC_STRUCT_TRAITS_MEMBER(irt_handle)
 #if defined(OS_MACOSX)
   IPC_STRUCT_TRAITS_MEMBER(mac_shm_fd)
 #endif
 #if defined(OS_POSIX)
   IPC_STRUCT_TRAITS_MEMBER(debug_stub_server_bound_socket)
 #endif
   IPC_STRUCT_TRAITS_MEMBER(validation_cache_enabled)
   IPC_STRUCT_TRAITS_MEMBER(validation_cache_key)
   IPC_STRUCT_TRAITS_MEMBER(version)
   IPC_STRUCT_TRAITS_MEMBER(enable_debug_stub)
   IPC_STRUCT_TRAITS_MEMBER(enable_ipc_proxy)
   IPC_STRUCT_TRAITS_MEMBER(process_type)
   IPC_STRUCT_TRAITS_MEMBER(crash_info_shmem_handle)
 IPC_STRUCT_TRAITS_END()
 
 IPC_STRUCT_TRAITS_BEGIN(nacl::NaClResourcePrefetchResult)
   IPC_STRUCT_TRAITS_MEMBER(file)
   IPC_STRUCT_TRAITS_MEMBER(file_path_metadata)
   IPC_STRUCT_TRAITS_MEMBER(file_key)
 IPC_STRUCT_TRAITS_END()
 
 //-----------------------------------------------------------------------------
 // NaClProcess messages
 // These are messages sent between the browser and the NaCl process.
-// Tells the NaCl process to start.
+
+// Sends a prefetched resource file to a NaCl loader process. This message
+// can be sent multiple times, but all of them must be done before sending
+// NaClProcessMsg_Start.
+IPC_MESSAGE_CONTROL1(NaClProcessMsg_AddPrefetchedResource,
+                     nacl::NaClResourcePrefetchResult)
+
+// Tells the NaCl process to start. This message can be sent only once.
 IPC_MESSAGE_CONTROL1(NaClProcessMsg_Start,
                      nacl::NaClStartParams /* params */)
 
 #if defined(OS_WIN)
 // Tells the NaCl broker to launch a NaCl loader process.
 IPC_MESSAGE_CONTROL1(NaClProcessMsg_LaunchLoaderThroughBroker,
                      std::string /* channel ID for the loader */)
 
 // Notify the browser process that the loader was launched successfully.
 IPC_MESSAGE_CONTROL2(NaClProcessMsg_LoaderLaunched,
@@ skipping 53 matching lines @@
                      IPC::PlatformFileForTransit, /* fd */
                      base::FilePath /* Path opened to get fd */)
 
 // Notify the browser process that the server side of the PPAPI channel was
 // created successfully.
 IPC_MESSAGE_CONTROL4(NaClProcessHostMsg_PpapiChannelsCreated,
                      IPC::ChannelHandle, /* browser_channel_handle */
                      IPC::ChannelHandle, /* ppapi_renderer_channel_handle */
                      IPC::ChannelHandle, /* trusted_renderer_channel_handle */
                      IPC::ChannelHandle /* manifest_service_channel_handle */)