NaCl: Simpler validation for main nexe.

components/nacl/browser/nacl_process_host.h

Index: components/nacl/browser/nacl_process_host.h
diff --git a/components/nacl/browser/nacl_process_host.h b/components/nacl/browser/nacl_process_host.h
index 1bb5288cf6966445b7ed7a9c9616d904129626ac..b244301f3007162d360233f1d480aefea07a6aae 100644
--- a/components/nacl/browser/nacl_process_host.h
+++ b/components/nacl/browser/nacl_process_host.h
@@ -144,6 +144,11 @@ class NaClProcessHost : public content::BrowserChildProcessHostDelegate {
   // 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.
   //
@@ -153,12 +158,7 @@ class NaClProcessHost : public content::BrowserChildProcessHostDelegate {
   // 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,
-                    base::File file);
   void FileResolvedAsync(uint64_t file_token_lo,
                          uint64_t file_token_hi,
                          const base::FilePath& file_path,