NaCl: Simpler validation for main nexe.

components/nacl/browser/nacl_process_host.h

 // Copyright (c) 2012 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_BROWSER_NACL_PROCESS_HOST_H_
 #define COMPONENTS_NACL_BROWSER_NACL_PROCESS_HOST_H_
 
 #include "build/build_config.h"
 
 #include "base/files/file.h"
@@ skipping 126 matching lines @@
 
   // Sends the reply message to the renderer. Either result or
   // error message must be empty.
   void SendMessageToRenderer(const NaClLaunchResult& result,
                              const std::string& error_message);
 
   // Sends the message to the NaCl process to load the plugin. Returns true
   // on success.
   bool StartNaClExecution();
 
+  void StartNaClFileResolved(
+      NaClStartParams params,
+      const base::FilePath& file_path,
+      base::File nexe_file);
+
   // Does post-process-launching tasks for starting the NaCl process once
   // we have a connection.
   //
   // Returns false on failure.
   bool StartWithLaunchedProcess();
 
   // Message handlers for validation caching.
   void OnQueryKnownToValidate(const std::string& signature, bool* result);
   void OnSetKnownToValidate(const std::string& signature);
-  void OnResolveFileToken(uint64 file_token_lo, uint64 file_token_hi,
-                          IPC::Message* reply_msg);
-  void OnResolveFileTokenAsync(uint64 file_token_lo, uint64 file_token_hi);
-  void FileResolved(const base::FilePath& file_path,
-                    IPC::Message* reply_msg,
+  void OnResolveFileToken(uint64 file_token_lo, uint64 file_token_hi);
+  void FileResolved(uint64_t file_token_lo,
+                    uint64_t file_token_hi,
+                    const base::FilePath& file_path,
                     base::File file);
-  void FileResolvedAsync(uint64_t file_token_lo,
-                         uint64_t file_token_hi,
-                         const base::FilePath& file_path,
-                         base::File file);
 #if defined(OS_WIN)
   // Message handler for Windows hardware exception handling.
   void OnAttachDebugExceptionHandler(const std::string& info,
                                      IPC::Message* reply_msg);
   bool AttachDebugExceptionHandler(const std::string& info,
                                    IPC::Message* reply_msg);
 #endif
 
   // Called when the PPAPI IPC channels to the browser/renderer have been
   // created.
@@ skipping 60 matching lines @@
   base::File socket_for_sel_ldr_;
 
   base::WeakPtrFactory<NaClProcessHost> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(NaClProcessHost);
 };
 
 }  // namespace nacl
 
 #endif  // COMPONENTS_NACL_BROWSER_NACL_PROCESS_HOST_H_