NaCl: Simpler validation for main nexe.

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_token_lo)
-  IPC_STRUCT_TRAITS_MEMBER(nexe_token_hi)
+  IPC_STRUCT_TRAITS_MEMBER(nexe_file_path_metadata)
   IPC_STRUCT_TRAITS_MEMBER(handles)
   IPC_STRUCT_TRAITS_MEMBER(debug_stub_server_bound_socket)
   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()
@@ skipping 52 matching lines @@
                             bool /* Can validation be skipped? */)
 
 // Used by the NaCl process to add a validation signature to the validation
 // database in the browser.
 IPC_MESSAGE_CONTROL1(NaClProcessMsg_SetKnownToValidate,
                      std::string /* A validation signature */)
 
 // Used by the NaCl process to acquire trusted information about a file directly
 // from the browser, including the file's path as well as a fresh version of the
 // file handle.
-// TODO(teravest): Remove the synchronous version of this message once initial
-// nexe validation caching stops using this.
-IPC_SYNC_MESSAGE_CONTROL2_2(NaClProcessMsg_ResolveFileToken,
-                            uint64, /* file_token_lo */
-                            uint64, /* file_token_hi */
-                            IPC::PlatformFileForTransit, /* fd */
-                            base::FilePath /* Path opened to get fd */)
-
-IPC_MESSAGE_CONTROL2(NaClProcessMsg_ResolveFileTokenAsync,
+IPC_MESSAGE_CONTROL2(NaClProcessMsg_ResolveFileToken,
                      uint64, /* file_token_lo */
                      uint64 /* file_token_hi */)
-IPC_MESSAGE_CONTROL4(NaClProcessMsg_ResolveFileTokenAsyncReply,
+IPC_MESSAGE_CONTROL4(NaClProcessMsg_ResolveFileTokenReply,
                      uint64, /* file_token_lo */
                      uint64, /* file_token_hi */
                      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 */)