Make a NaClDesc ctor for creating descs from NaClFileInfo.

src/trusted/sel_universal/reverse_emulate.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 "native_client/src/trusted/sel_universal/reverse_emulate.h"
 #include <stdio.h>
 #include <cstring>
 #include <map>
 #include <set>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "native_client/src/include/portability_io.h"
+#include "native_client/src/public/nacl_file_info.h"
 #include "native_client/src/public/secure_service.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.h"
 #include "native_client/src/shared/platform/nacl_sync_checked.h"
 #include "native_client/src/shared/platform/nacl_sync_raii.h"
 #include "native_client/src/shared/platform/nacl_threads.h"
 #include "native_client/src/shared/platform/scoped_ptr_refcount.h"
 #include "native_client/src/shared/srpc/nacl_srpc.h"
 #include "native_client/src/trusted/desc/nacl_desc_wrapper.h"
 #include "native_client/src/trusted/nonnacl_util/launcher_factory.h"
 #include "native_client/src/trusted/nonnacl_util/sel_ldr_launcher.h"
 #include "native_client/src/trusted/reverse_service/reverse_service.h"
 #include "native_client/src/trusted/sel_universal/rpc_universal.h"
 #include "native_client/src/trusted/sel_universal/srpc_helper.h"
-#include "native_client/src/trusted/validator/nacl_file_info.h"
 
 
 // Mock of ReverseInterface for use by nexes.
 class ReverseEmulate : public nacl::ReverseInterface {
  public:
   ReverseEmulate(
       nacl::SelLdrLauncherStandaloneFactory* factory,
       const vector<nacl::string>& prefix,
       const vector<nacl::string>& sel_ldr_argv);
   virtual ~ReverseEmulate();
@@ skipping 394 matching lines @@
     return false;
   }
   if (!subprocesses_[pid].first || subprocesses_[pid].second == NULL) {
     return false;
   }
   subprocesses_[pid].first = false;
   delete subprocesses_[pid].second;
   subprocesses_[pid].second = NULL;
   return true;
 }