Factor out duplicated GioMemoryFileSnapshotCtor() + NaClAppLoadFile() calls

tests/custom_desc/desc_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/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/desc/nacl_desc_custom.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_valgrind_hooks.h"
 #include "native_client/src/trusted/service_runtime/sel_ldr.h"
 
 
 static struct NaClDesc *MakeExampleDesc(void);
 
 static void *g_handle = (void *) 0x1234;
 static int g_object_count = 0;
 static struct NaClApp *g_nap;
 static struct NaClDesc *g_expected_desc;
 
@@ skipping 145 matching lines @@
   funcs.Destroy = ExampleDescDestroy;
   funcs.SendMsg = ExampleDescSendMsg;
   funcs.RecvMsg = ExampleDescRecvMsg;
   g_object_count++;
   return NaClDescMakeCustomDesc(g_handle, &funcs);
 }
 
 
 int main(int argc, char **argv) {
   struct NaClApp app;
-  struct GioMemoryFileSnapshot gio_file;
 
   NaClHandleBootstrapArgs(&argc, &argv);
 
   if (argc != 2) {
     NaClLog(LOG_FATAL, "Expected 1 argument: executable filename\n");
   }
 
   NaClAllModulesInit();
 
-  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);
 
   g_nap = &app;
   g_expected_desc = MakeExampleDesc();
   NaClSetDesc(&app, 10, g_expected_desc);
 
   CHECK(NaClAppPrepareToLaunch(&app) == LOAD_OK);
   CHECK(NaClCreateMainThread(&app, 0, NULL, NULL));
   CHECK(NaClWaitForMainThreadToExit(&app) == 0);
 
   /* Check for leaks. */
   CHECK(g_object_count == 0);
 
   /*
    * Avoid calling exit() because it runs process-global destructors
    * which might break code that is running in our unjoined threads.
    */
   NaClExit(0);
   return 0;
 }