Factor out duplicated GioMemoryFileSnapshotCtor() + NaClAppLoadFile() calls

tests/signal_handler_single_step/regs_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 <signal.h>
 #include <string.h>
 
 #include "native_client/src/include/nacl_assert.h"
 #include "native_client/src/include/portability_io.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/mman.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/src/trusted/service_runtime/thread_suspension_unwind.h"
 #include "native_client/tests/common/register_set.h"
 #include "native_client/tests/signal_handler_single_step/step_test_common.h"
 
 
 /*
  * This test case checks that NaCl thread suspension reports the
  * correct untrusted register values for a thread at all points during
  * the context switches between trusted and untrusted code for
@@ skipping 113 matching lines @@
     SignalSafeWrite(str, strlen(str));
     SignalSafeLogStringLiteral("\n");
 
     RegsAssertEqual(&context, expected_regs);
   }
   return NACL_SIGNAL_RETURN;
 }
 
 int main(int argc, char **argv) {
   struct NaClApp app;
-  struct GioMemoryFileSnapshot gio_file;
   uint32_t mmap_addr;
   char arg_string[32];
   char *args[] = {"prog_name", arg_string};
 
   NaClAllModulesInit();
 
   if (argc != 2) {
     NaClLog(LOG_FATAL, "Expected 1 argument: executable filename\n");
   }
 
   NaClAddSyscall(NACL_sys_test_syscall_1, TestSyscall);
 
-  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);
 
   NaClSignalHandlerInit();
   NaClSignalHandlerAdd(TrapSignalHandler);
 
   /*
    * Allocate some space in untrusted address space.  We pass the
    * address to the guest program so that it can write a register
    * snapshot for us to compare against.
@@ skipping 11 matching lines @@
   CHECK(!g_in_untrusted_code);
   ASSERT_EQ(g_context_switch_count, (kNumberOfCallsToTest - 1) * 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;
 }