Factor out duplicated GioMemoryFileSnapshotCtor() + NaClAppLoadFile() calls

tests/signal_handler_single_step/step_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 <stdarg.h>
 #include <signal.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_app_thread.h"
 #include "native_client/src/trusted/service_runtime/nacl_copy.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_syscall_handlers.h"
-#include "native_client/src/trusted/service_runtime/nacl_valgrind_hooks.h"
 #include "native_client/src/trusted/service_runtime/sel_ldr.h"
 #include "native_client/tests/signal_handler_single_step/step_test_common.h"
 #include "native_client/tests/signal_handler_single_step/step_test_syscalls.h"
 
 
 /*
  * This test case checks that NaCl's Linux signal handler can be
  * entered at any point during the context switches between trusted
  * and untrusted code.
  *
@@ skipping 116 matching lines @@
 }
 
 static const struct NaClDebugCallbacks debug_callbacks = {
   ThreadCreateHook,
   ThreadExitHook,
   ProcessExitHook
 };
 
 int main(int argc, char **argv) {
   struct NaClApp app;
-  struct GioMemoryFileSnapshot gio_file;
   struct NaClSyscallTableEntry syscall_table[NACL_MAX_SYSCALLS] = {{0}};
   int index;
   for (index = 0; index < NACL_MAX_SYSCALLS; index++) {
     syscall_table[index].handler = NaClSysNotImplementedDecoder;
   }
   syscall_table[SINGLE_STEP_TEST_SYSCALL].handler = TestSyscall;
 
   NaClAllModulesInit();
 
   if (argc != 2) {
     NaClLog(LOG_FATAL, "Expected 1 argument: executable filename\n");
   }
 
-  NaClFileNameForValgrind(argv[1]);
-  CHECK(GioMemoryFileSnapshotCtor(&gio_file, argv[1]));
   CHECK(NaClAppWithSyscallTableCtor(&app, syscall_table));
 
   app.debug_stub_callbacks = &debug_callbacks;
   NaClSignalHandlerInit();
   NaClSignalHandlerAdd(TrapSignalHandler);
 
-  CHECK(NaClAppLoadFile((struct Gio *) &gio_file, &app) == LOAD_OK);
+  CHECK(NaClAppLoadFileFromFilename(&app, argv[1]) == LOAD_OK);
   CHECK(NaClAppPrepareToLaunch(&app) == LOAD_OK);
   CHECK(NaClCreateMainThread(&app, 0, NULL, NULL));
   CHECK(NaClWaitForMainThreadToExit(&app) == 0);
 
   CHECK(!g_in_untrusted_code);
   CHECK(g_context_switch_count == kNumberOfCallsToTest * 2);
 
   /*
    * Avoid calling exit() because it runs process-global destructors
    * which might break code that is running in our unjoined threads.
    */
   NaClExit(0);
   return 0;
 }