NaCl: Simpler validation for main nexe.

components/nacl/common/nacl_messages.h

Index: components/nacl/common/nacl_messages.h
diff --git a/components/nacl/common/nacl_messages.h b/components/nacl/common/nacl_messages.h
index 0b2237f68f1764dcdc58296fa408753cdaba9995..1aba366b2574bd19d13dcd8e3f57e1d6e1079dfc 100644
--- a/components/nacl/common/nacl_messages.h
+++ b/components/nacl/common/nacl_messages.h
@@ -16,8 +16,7 @@
 
 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)
@@ -90,18 +89,10 @@ IPC_MESSAGE_CONTROL1(NaClProcessMsg_SetKnownToValidate,
 // 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 */