Make a NaClDesc ctor for creating descs from NaClFileInfo.

tests/sel_main_chrome/sel_main_chrome_test.cc

 /*
  * 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 <fcntl.h>
 #include <cstring>
 
 #if NACL_WINDOWS
 # include <io.h>
 #endif
 
 #include "native_client/src/public/chrome_main.h"
 #include "native_client/src/public/nacl_app.h"
+#include "native_client/src/public/nacl_file_info.h"
 #include "native_client/src/shared/platform/nacl_check.h"
 #include "native_client/src/shared/platform/nacl_threads.h"
 #include "native_client/src/shared/srpc/nacl_srpc.h"
 #include "native_client/src/trusted/desc/nacl_desc_custom.h"
-#include "native_client/src/trusted/desc_cacheability/desc_cacheability.h"
+#include "native_client/src/trusted/desc/nacl_desc_file_info.h"
 #include "native_client/src/trusted/nonnacl_util/sel_ldr_launcher.h"
 #include "native_client/src/trusted/service_runtime/include/sys/fcntl.h"
 #include "native_client/src/trusted/service_runtime/nacl_all_modules.h"
 #include "native_client/src/trusted/service_runtime/nacl_config.h"
 #include "native_client/src/trusted/service_runtime/nacl_valgrind_hooks.h"
 #include "native_client/src/trusted/service_runtime/sel_addrspace.h"
 #include "native_client/src/trusted/service_runtime/sel_ldr.h"
-#include "native_client/src/trusted/validator/nacl_file_info.h"
 #include "native_client/src/trusted/validator/validation_cache.h"
 
 
 int OpenFileReadOnly(const char *filename) {
 #if NACL_WINDOWS
   return _open(filename, _O_RDONLY);
 #else
   return open(filename, O_RDONLY);
 #endif
 }
@@ skipping 78 matching lines @@
   CHECK(h->expected_token_lo == file_token->lo);
   CHECK(h->expected_token_hi == file_token->hi);
   *fd = h->expected_file_handle;
   *file_path = h->expected_file_path;
   *file_path_length = static_cast<uint32_t>(strlen(h->expected_file_path));
   return 1;
 }
 
 struct ThreadArgs {
   NaClHandle channel;
-  int nexe_fd;
-  NaClFileToken nexe_token;
+  NaClFileInfo file_info;
 };
 
 void WINAPI DummyRendererThread(void *thread_arg) {
   struct ThreadArgs *args = (struct ThreadArgs *) thread_arg;
 
   nacl::DescWrapperFactory desc_wrapper_factory;
-  nacl::DescWrapper *nexe_desc =
-      desc_wrapper_factory.MakeFileDesc(args->nexe_fd, NACL_ABI_O_RDONLY);
+  struct NaClDesc *desc = NaClDescIoFromFileInfo(args->file_info,
+                                                 NACL_ABI_O_RDONLY);
+  CHECK(desc != NULL);
+  nacl::DescWrapper *nexe_desc = desc_wrapper_factory.MakeGenericCleanup(desc);
   CHECK(nexe_desc != NULL);
-  if (args->nexe_token.lo != 0 && args->nexe_token.hi != 0) {
-    int token_res = NaClDescSetFileToken(nexe_desc->desc(), &args->nexe_token);
-    CHECK(token_res != 0);
-  }
-
   DummyLauncher launcher(args->channel);
   NaClSrpcChannel trusted_channel;
   NaClSrpcChannel untrusted_channel;
   CHECK(launcher.SetupCommandAndLoad(&trusted_channel, nexe_desc));
   CHECK(launcher.StartModuleAndSetupAppChannel(&trusted_channel,
                                                &untrusted_channel));
 }
 
 void ExampleDescDestroy(void *handle) {
   UNREFERENCED_PARAMETER(handle);
@@ skipping 40 matching lines @@
   NaClHandleBootstrapArgs(&argc, &argv);
 #if NACL_LINUX
   args->prereserved_sandbox_size = g_prereserved_sandbox_size;
 #endif
 
   CHECK(argc == 3 || argc == 4);
 
   args->irt_fd = OpenFileReadOnly(argv[1]);
   CHECK(args->irt_fd >= 0);
 
-  thread_args.nexe_fd = OpenFileReadOnly(argv[2]);
-  CHECK(thread_args.nexe_fd >= 0);
+  memset(&thread_args.file_info, 0, sizeof thread_args.file_info);
+  thread_args.file_info.desc = OpenFileReadOnly(argv[2]);
+  CHECK(thread_args.file_info.desc >= 0);
   NaClFileNameForValgrind(argv[2]);
 
   NaClHandle socketpair[2];
   CHECK(NaClSocketPair(socketpair) == 0);
   args->imc_bootstrap_handle = socketpair[0];
   thread_args.channel = socketpair[1];
 
   // Check that NaClDescMakeCustomDesc() works when called in this context.
   NaClAppSetDesc(nap, NACL_CHROME_DESC_BASE, MakeExampleDesc());
 
   // Set up mock validation cache.
   struct TestValidationHandle test_handle;
   struct NaClValidationCache test_cache;
   if (argc == 4) {
     CHECK(strcmp(argv[3], "-vcache") == 0);
     test_handle.expected_token_lo = 0xabcdef123456789LL;
     test_handle.expected_token_hi = 0x101010101010101LL;
     test_handle.expected_file_handle = OpenFileHandleReadExec(argv[2]);
     test_handle.expected_file_path = strdup(argv[2]);
     test_cache.handle = &test_handle;
     test_cache.CreateQuery = &TestCreateQuery;
     test_cache.AddData = &TestAddData;
     test_cache.QueryKnownToValidate = &TestQueryKnownToValidate;
     test_cache.SetKnownToValidate = &TestSetKnownToValidate;
     test_cache.DestroyQuery = &TestDestroyQuery;
     test_cache.CachingIsInexpensive = &TestCachingIsInexpensive;
     test_cache.ResolveFileToken = &TestResolveFileToken;
     args->validation_cache = &test_cache;
-    thread_args.nexe_token.lo = test_handle.expected_token_lo;
-    thread_args.nexe_token.hi = test_handle.expected_token_hi;
-  } else {
-    thread_args.nexe_token.lo = 0;
-    thread_args.nexe_token.hi = 0;
+    thread_args.file_info.file_token.lo = test_handle.expected_token_lo;
+    thread_args.file_info.file_token.hi = test_handle.expected_token_hi;
   }
 
   NaClThread thread;
   CHECK(NaClThreadCtor(&thread, DummyRendererThread, &thread_args,
                        NACL_KERN_STACK_SIZE));
 
   NaClChromeMainStartApp(nap, args);
   NaClLog(LOG_FATAL, "NaClChromeMainStartApp() should never return\n");
   return 1;
 }