Factor out duplicated GioMemoryFileSnapshotCtor() + NaClAppLoadFile() calls

tests/signal_handler_single_step/step_test_host.c

Index: tests/signal_handler_single_step/step_test_host.c
diff --git a/tests/signal_handler_single_step/step_test_host.c b/tests/signal_handler_single_step/step_test_host.c
index 2b0c25173e26da964ac9b5c4114023c22b225c9d..a48fc81d7a53bd436f1d8cfb0f8f52ac0b8b693c 100644
--- a/tests/signal_handler_single_step/step_test_host.c
+++ b/tests/signal_handler_single_step/step_test_host.c
@@ -7,11 +7,11 @@
 #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"
@@ -19,7 +19,6 @@
 #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"
@@ -156,7 +155,6 @@ static const struct NaClDebugCallbacks debug_callbacks = {
 
 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++) {
@@ -170,15 +168,13 @@ int main(int argc, char **argv) {
     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);