NaCl: Clean up some uses of native_client/src/trusted/desc/

Switch to using the definitions from src/public/ where possible.

Change DEPS to remove blanket allowances of src/trusted/desc/, and
only whitelist some remaining required headers.

BUG=https://code.google.com/p/nativeclient/issues/detail?id=2832
TEST=build

Review URL: https://codereview.chromium.org/1171493003

Cr-Commit-Position: refs/heads/master@{#333057}

components/nacl/loader/DEPS

@@ -14,7 +14,8 @@ include_rules = [
 
   "+native_client/src/include",
   "+native_client/src/public",
-  "+native_client/src/trusted/desc",
+  "+native_client/src/trusted/desc/nacl_desc_quota.h",
+  "+native_client/src/trusted/desc/nacl_desc_quota_interface.h",
   "+native_client/src/trusted/service_runtime/include",
   "+native_client/src/trusted/service_runtime/nacl_error_code.h",
   "+native_client/src/untrusted/irt/irt.h",

components/nacl/loader/nacl_ipc_adapter.cc

@@ -19,12 +19,8 @@
 #include "ipc/ipc_platform_file.h"
 #include "native_client/src/public/nacl_desc.h"
 #include "native_client/src/public/nacl_desc_custom.h"
-#include "native_client/src/trusted/desc/nacl_desc_base.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/service_runtime/include/sys/fcntl.h"
 #include "ppapi/c/ppb_file_io.h"
 #include "ppapi/proxy/ppapi_messages.h"
@@ -569,7 +565,7 @@ bool NaClIPCAdapter::RewriteMessage(const IPC::Message& msg, uint32_t type) {
         case ppapi::proxy::SerializedHandle::FILE: {
           // Create the NaClDesc for the file descriptor. If quota checking is
           // required, wrap it in a NaClDescQuota.
-          NaClDesc* desc = NaClDescIoDescFromHandleAllocCtor(
+          NaClDesc* desc = NaClDescIoMakeFromHandle(
 #if defined(OS_WIN)
               iter->descriptor(),
 #else
@@ -648,7 +644,7 @@ void NaClIPCAdapter::SaveOpenResourceMessage(
     scoped_ptr<IPC::Message> new_msg = CreateOpenResourceReply(orig_msg, sh);
 
     scoped_ptr<NaClDescWrapper> desc_wrapper(new NaClDescWrapper(
-        NaClDescIoDescFromHandleAllocCtor(
+        NaClDescIoMakeFromHandle(
 #if defined(OS_WIN)
             sh.descriptor(),
 #else

components/nacl/loader/nonsfi/DEPS

@@ -2,6 +2,8 @@ include_rules = [
   "+ppapi/nacl_irt",
   "+sandbox/linux/seccomp-bpf-helpers",
   "+native_client/src/shared/platform/nacl_log.h",
+  "+native_client/src/trusted/desc/nacl_desc_base.h",
+  "+native_client/src/trusted/desc/nacl_desc_effector_trusted_mem.h",
   "+native_client/src/trusted/service_runtime/nacl_exception.h",
   "+native_client/src/trusted/service_runtime/nacl_signal.h",
   "+third_party/lss/linux_syscall_support.h",  # for BPF policy tests

components/nacl/loader/nonsfi/nonsfi_main.cc

@@ -17,8 +17,7 @@
 #include "components/nacl/loader/nonsfi/elf_loader.h"
 #include "components/nacl/loader/nonsfi/irt_interfaces.h"
 #include "native_client/src/include/nacl_macros.h"
-#include "native_client/src/trusted/desc/nacl_desc_base.h"
-#include "native_client/src/trusted/desc/nacl_desc_io.h"
+#include "native_client/src/public/nacl_desc.h"
 #include "native_client/src/trusted/service_runtime/include/sys/fcntl.h"
 #endif
 
@@ -83,7 +82,7 @@ void MainStart(int nexe_file) {
       reinterpret_cast<EntryPointType>(NaClLoadElfFile(nexe_file));
 #else
   ::scoped_ptr<struct NaClDesc, NaClDescUnrefer> desc(
-       NaClDescIoDescFromDescAllocCtor(nexe_file, NACL_ABI_O_RDONLY));
+       NaClDescIoMakeFromHandle(nexe_file, NACL_ABI_O_RDONLY));
   ElfImage image;
   if (image.Read(desc.get()) != LOAD_OK) {
     LOG(ERROR) << "LoadModuleRpc: Failed to read binary.";

components/nacl/renderer/plugin/DEPS

@@ -4,7 +4,8 @@ include_rules = [
   "+native_client/src/shared/imc/nacl_imc_c.h",
   "+native_client/src/shared/platform",
   "+native_client/src/shared/srpc",
-  "+native_client/src/trusted/desc",
+  "+native_client/src/trusted/desc/nacl_desc_wrapper.h",
+  "+native_client/src/trusted/desc/nrd_all_modules.h",
   "+native_client/src/trusted/nonnacl_util/sel_ldr_launcher.h",
   "+native_client/src/trusted/service_runtime/include",
   "+native_client/src/trusted/service_runtime/nacl_error_code.h",