Factor out duplicated GioMemoryFileSnapshotCtor() + NaClAppLoadFile() calls

tests/trusted_crash/crash_in_syscall/test_host.c

 /*
  * Copyright (c) 2012 The Native Client Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include <string.h>
 
 #include "native_client/src/include/nacl_macros.h"
-#include "native_client/src/shared/gio/gio.h"
 #include "native_client/src/shared/platform/nacl_check.h"
 #include "native_client/src/shared/platform/nacl_exit.h"
 #include "native_client/src/shared/platform/nacl_log.h"
 #include "native_client/src/trusted/service_runtime/include/bits/nacl_syscalls.h"
+#include "native_client/src/trusted/service_runtime/load_file.h"
 #include "native_client/src/trusted/service_runtime/nacl_all_modules.h"
 #include "native_client/src/trusted/service_runtime/nacl_app.h"
 #include "native_client/src/trusted/service_runtime/nacl_signal.h"
 #include "native_client/src/trusted/service_runtime/nacl_syscall_common.h"
-#include "native_client/src/trusted/service_runtime/nacl_valgrind_hooks.h"
 #include "native_client/src/trusted/service_runtime/sel_ldr.h"
 
 #if NACL_WINDOWS
 # include <windows.h>
 # include <dbghelp.h>
 #elif NACL_LINUX
 # include <signal.h>
 #endif
 
 /*
@@ skipping 215 matching lines @@
   UNREFERENCED_PARAMETER(natp);
 
   null_func_ptr();
 
   NaClLog(LOG_FATAL, "JumpToZeroCrashSyscall: Should not reach here\n");
   return 1;
 }
 
 int main(int argc, char **argv) {
   struct NaClApp app;
-  struct GioMemoryFileSnapshot gio_file;
 
   NaClHandleBootstrapArgs(&argc, &argv);
 
   /* Turn off buffering to aid debugging. */
   setvbuf(stdout, NULL, _IONBF, 0);
   setvbuf(stderr, NULL, _IONBF, 0);
 
   NaClAllModulesInit();
 
   if (argc != 3) {
     NaClLog(LOG_FATAL,
             "Expected 2 arguments: <executable-filename> <crash-type>\n");
   }
 
   g_crash_type = argv[2];
 
-  NaClFileNameForValgrind(argv[1]);
-  CHECK(GioMemoryFileSnapshotCtor(&gio_file, argv[1]));
   CHECK(NaClAppCtor(&app));
-  CHECK(NaClAppLoadFile((struct Gio *) &gio_file, &app) == LOAD_OK);
+  CHECK(NaClAppLoadFileFromFilename(&app, argv[1]) == LOAD_OK);
   NaClAppInitialDescriptorHookup(&app);
   CHECK(NaClAppPrepareToLaunch(&app) == LOAD_OK);
 
   NaClAddSyscall(NACL_sys_test_syscall_1, JumpToZeroCrashSyscall);
 
   RegisterHandlers();
 
   CHECK(NaClCreateMainThread(&app, argc - 1, argv + 1, NULL));
   NaClWaitForMainThreadToExit(&app);
 
   NaClLog(LOG_ERROR, "We did not expect the test program to exit cleanly\n");
   return 1;
 }