Factor out duplicated GioMemoryFileSnapshotCtor() + NaClAppLoadFile() calls

tests/thread_suspension/suspend_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 "native_client/tests/thread_suspension/suspend_test.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/shared/platform/nacl_sync_checked.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_valgrind_hooks.h"
 #include "native_client/src/trusted/service_runtime/sel_ldr.h"
 #include "native_client/src/trusted/service_runtime/thread_suspension.h"
 #include "native_client/tests/common/register_set.h"
 
 
 /*
  * These tests mirror thread_suspension_test.cc, but they operate on
  * threads running real untrusted code rather than on mock untrusted
  * threads.
  */
@@ skipping 331 matching lines @@
   NaClAppThreadGetSuspendedRegisters(natp, &regs);
   NaClUntrustedThreadsResumeAll(nap);
   test_shm->should_exit = 1;
   CHECK(NaClWaitForMainThreadToExit(nap) == 0);
 
   RegsAssertEqual(&regs, &test_shm->expected_regs);
 }
 
 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 NACL_LINUX
   NaClSignalHandlerInit();
 #endif
 
   if (argc != 2) {
     NaClLog(LOG_FATAL, "Expected 1 argument: executable filename\n");
   }
 
-  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, SuspendTestSyscall);
 
   /*
    * We reuse the same sandbox for both tests.
    *
    * TODO(mseaborn): It would be cleaner to create a new sandbox for
    * each test, but if we are to do that in a single process without
@@ skipping 20 matching lines @@
 
   printf("Running TestGettingRegisterSnapshotInSyscall...\n");
   TestGettingRegisterSnapshotInSyscall(&app);
 
   /*
    * Avoid calling exit() because it runs process-global destructors
    * which might break code that is running in our unjoined threads.
    */
   NaClExit(0);
 }