Make a NaClDesc ctor for creating descs from NaClFileInfo.

src/trusted/desc/nacl_desc_wrapper.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 <limits>
 #include <new>
 #include "native_client/src/include/portability.h"
 #include "native_client/src/include/portability_string.h"
 #include "native_client/src/public/imc_types.h"
 #include "native_client/src/shared/imc/nacl_imc_c.h"
 #include "native_client/src/shared/platform/nacl_check.h"
 #include "native_client/src/shared/platform/nacl_log.h"
 #include "native_client/src/shared/platform/nacl_sync_checked.h"
 #if defined(NACL_LINUX)
 #include "native_client/src/trusted/desc/linux/nacl_desc_sysv_shm.h"
 #endif  // defined(NACL_LINUX)
 #include "native_client/src/trusted/desc/nacl_desc_base.h"
 #include "native_client/src/trusted/desc/nacl_desc_conn_cap.h"
+#include "native_client/src/trusted/desc/nacl_desc_file_info.h"
 #include "native_client/src/trusted/desc/nacl_desc_imc.h"
 #include "native_client/src/trusted/desc/nacl_desc_imc_shm.h"
 #include "native_client/src/trusted/desc/nacl_desc_invalid.h"
 #include "native_client/src/trusted/desc/nacl_desc_io.h"
 #include "native_client/src/trusted/desc/nacl_desc_quota.h"
 #include "native_client/src/trusted/desc/nacl_desc_rng.h"
 #include "native_client/src/trusted/desc/nacl_desc_sync_socket.h"
 #include "native_client/src/trusted/desc/nacl_desc_wrapper.h"
 #include "native_client/src/trusted/desc/nrd_xfer.h"
 #include "native_client/src/trusted/nacl_base/nacl_refcount.h"
@@ skipping 279 matching lines @@
 }
 
 DescWrapper* DescWrapperFactory::MakeFileDesc(int host_os_desc, int mode) {
   struct NaClDesc* desc = ImportHostDescCommon(host_os_desc, mode);
   if (NULL == desc) {
     return NULL;
   }
   return MakeGenericCleanup(desc);
 }
 
+DescWrapper* DescWrapperFactory::MakeFileDescFileInfo(struct NaClFileInfo info,

[Mark Seaborn, 2014/05/15 00:36:10]

Since DescWrapper is deprecated, can you avoid adding more interface surface to
it, please?  Can you have the Chromium-side code call NaClDescIoFromFileInfo() +
MakeGenericCleanup() instead of adding this method?

[jvoung (off chromium), 2014/05/16 18:02:05]

Okay. The intention was to have a single call that hands off the info's desc and
metadata, and that should still work with NaClDescIoFromFileInfo.

+                                                      int mode) {
+  struct NaClDesc* desc = NaClDescIoFromFileInfo(info, mode);
+  if (NULL == desc) {
+    return NULL;
+  }
+  return MakeGenericCleanup(desc);
+}
+
 DescWrapper* DescWrapperFactory::MakeFileDescQuota(int host_os_desc,
                                                    int mode,
                                                    const uint8_t* file_id) {
   struct NaClDesc* desc = ImportHostDescCommon(host_os_desc, mode);
   if (NULL == desc) {
     return NULL;
   }
   struct NaClDesc* desc_quota = MakeQuotaCommon(file_id, desc);
   if (desc_quota == NULL) {
     NaClDescSafeUnref(desc);
@@ skipping 302 matching lines @@
   return reinterpret_cast<struct NaClDescVtbl const *>(desc_->base.vtbl)->
       SemWait(desc_);
 }
 
 int DescWrapper::GetValue() {
   return reinterpret_cast<struct NaClDescVtbl const *>(desc_->base.vtbl)->
       GetValue(desc_);
 }
 
 }  // namespace nacl