NaCl: Clean up to use the public API for creating validation-cacheable descs

components/nacl/loader/nacl_ipc_adapter.cc

 // Copyright 2013 The Chromium 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 "components/nacl/loader/nacl_ipc_adapter.h"
 
 #include <limits.h>
 #include <string.h>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/shared_memory.h"
 #include "base/task_runner_util.h"
 #include "build/build_config.h"
 #include "ipc/ipc_channel.h"
 #include "ipc/ipc_platform_file.h"
+#include "native_client/src/public/nacl_desc.h"
 #include "native_client/src/trusted/desc/nacl_desc_base.h"
 #include "native_client/src/trusted/desc/nacl_desc_custom.h"
 #include "native_client/src/trusted/desc/nacl_desc_imc_shm.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_quota_interface.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/service_runtime/include/sys/fcntl.h"
-#include "native_client/src/trusted/validator/rich_file_info.h"
 #include "ppapi/c/ppb_file_io.h"
 #include "ppapi/proxy/ppapi_messages.h"
 #include "ppapi/proxy/serialized_handle.h"
 
 using ppapi::proxy::NaClMessageScanner;
 
 namespace {
 
 enum BufferSizeStatus {
   // The buffer contains a full message with no extra bytes.
@@ skipping 619 matching lines @@
       SaveMessage(*new_msg, rewritten_msg.get());
       cond_var_.Signal();
     }
     return;
   }
 
   // The file token was sucessfully resolved.
   std::string file_path_str = file_path.AsUTF8Unsafe();
   base::PlatformFile handle =
       IPC::PlatformFileForTransitToPlatformFile(ipc_fd);
-  // The file token was resolved successfully, so we populate the new
-  // NaClDesc with that information.
-  char* alloc_file_path = static_cast<char*>(
-      malloc(file_path_str.length() + 1));
-  strcpy(alloc_file_path, file_path_str.c_str());
-  scoped_ptr<NaClDescWrapper> desc_wrapper(new NaClDescWrapper(
-      NaClDescIoDescFromHandleAllocCtor(handle, NACL_ABI_O_RDONLY)));
-
-  // Mark the desc as OK for mapping as executable memory.
-  NaClDescMarkSafeForMmap(desc_wrapper->desc());
-
-  // Provide metadata for validation.
-  struct NaClRichFileInfo info;
-  NaClRichFileInfoCtor(&info);
-  info.known_file = 1;
-  info.file_path = alloc_file_path;  // Takes ownership.
-  info.file_path_length =
-      static_cast<uint32_t>(file_path_str.length());
-  NaClSetFileOriginInfo(desc_wrapper->desc(), &info);
-  NaClRichFileInfoDtor(&info);
 
   ppapi::proxy::SerializedHandle sh;
   sh.set_file_handle(ipc_fd, PP_FILEOPENFLAG_READ, 0);
   scoped_ptr<IPC::Message> new_msg = CreateOpenResourceReply(orig_msg, sh);
   scoped_refptr<RewrittenMessage> rewritten_msg(new RewrittenMessage);
 
-  rewritten_msg->AddDescriptor(desc_wrapper.release());
+  struct NaClDesc* desc =
+      NaClDescCreateWithFilePathMetadata(handle, file_path_str.c_str());
+  rewritten_msg->AddDescriptor(new NaClDescWrapper(desc));
   {
     base::AutoLock lock(lock_);
     SaveMessage(*new_msg, rewritten_msg.get());
     cond_var_.Signal();
   }
 }
 
 void NaClIPCAdapter::OnChannelConnected(int32 peer_pid) {
 }
 
@@ skipping 121 matching lines @@
   header.flags = msg.flags();
   header.num_fds = static_cast<uint16>(rewritten_msg->desc_count());
 
   rewritten_msg->SetData(header, msg.payload(), msg.payload_size());
   locked_data_.to_be_received_.push(rewritten_msg);
 }
 
 int TranslatePepperFileReadWriteOpenFlagsForTesting(int32_t pp_open_flags) {
   return TranslatePepperFileReadWriteOpenFlags(pp_open_flags);
 }