Change to using nacl_file_info.h from src/public instead.

Attempting to move the header from src/trusted/validator into src/public:
https://codereview.chromium.org/261683002/diff/310001/src/trusted/validator/nacl_file_info.h

BUG=https://code.google.com/p/nativeclient/issues/detail?id=3421

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@271771 0039d316-1c4b-4281-b951-d872f2087c98

components/nacl/loader/DEPS

@@ -15,7 +15,6 @@ include_rules = [
   "+native_client/src/trusted/desc",
   "+native_client/src/trusted/service_runtime/include",
   "+native_client/src/trusted/service_runtime/nacl_error_code.h",
-  "+native_client/src/trusted/validator/nacl_file_info.h",
   "+native_client/src/trusted/validator/validation_cache.h",
   "+native_client/src/untrusted/irt/irt.h",
 

components/nacl/loader/nacl_listener.cc

@@ -26,7 +26,7 @@
 #include "ipc/ipc_sync_message_filter.h"
 #include "native_client/src/public/chrome_main.h"
 #include "native_client/src/public/nacl_app.h"
-#include "native_client/src/trusted/validator/nacl_file_info.h"
+#include "native_client/src/public/nacl_file_info.h"
 
 #if defined(OS_POSIX)
 #include "base/file_descriptor_posix.h"
@@ -169,7 +169,7 @@ class BrowserValidationDBProxy : public NaClValidationDB {
                                 int32* fd, std::string* path) OVERRIDE {
     *fd = -1;
     *path = "";
-    if (file_token->lo == 0 && file_token->hi == 0) {
+    if (!NaClFileTokenIsValid(file_token)) {
       return false;
     }
     IPC::PlatformFileForTransit ipc_fd = IPC::InvalidPlatformFileForTransit();

components/nacl/loader/nacl_validation_query.cc

@@ -8,7 +8,7 @@
 #include "components/nacl/loader/nacl_validation_db.h"
 #include "crypto/nss_util.h"
 #include "native_client/src/include/portability.h"
-#include "native_client/src/trusted/validator/nacl_file_info.h"
+#include "native_client/src/public/nacl_file_info.h"
 #include "native_client/src/trusted/validator/validation_cache.h"
 
 NaClValidationQueryContext::NaClValidationQueryContext(

ppapi/native_client/src/trusted/plugin/DEPS

@@ -6,6 +6,5 @@ include_rules = [
   "+native_client/src/trusted/reverse_service/reverse_service.h",
   "+native_client/src/trusted/service_runtime/include",
   "+native_client/src/trusted/service_runtime/nacl_error_code.h",
-  "+native_client/src/trusted/validator/nacl_file_info.h",
   "+third_party/jsoncpp",
 ]

ppapi/native_client/src/trusted/plugin/file_downloader.h

@@ -9,7 +9,7 @@
 
 #include "native_client/src/include/nacl_macros.h"
 #include "native_client/src/include/nacl_string.h"
-#include "native_client/src/trusted/validator/nacl_file_info.h"
+#include "native_client/src/public/nacl_file_info.h"
 #include "ppapi/c/private/pp_file_handle.h"
 #include "ppapi/c/private/ppb_file_io_private.h"
 #include "ppapi/c/private/ppb_nacl_private.h"

ppapi/native_client/src/trusted/plugin/plugin.h

@@ -19,7 +19,7 @@
 #include "native_client/src/include/nacl_macros.h"
 #include "native_client/src/include/nacl_scoped_ptr.h"
 #include "native_client/src/include/nacl_string.h"
-#include "native_client/src/trusted/validator/nacl_file_info.h"
+#include "native_client/src/public/nacl_file_info.h"
 
 #include "ppapi/c/private/ppb_nacl_private.h"
 #include "ppapi/cpp/instance.h"

ppapi/native_client/src/trusted/plugin/service_runtime.cc

@@ -34,8 +34,8 @@
 #include "native_client/src/trusted/nonnacl_util/sel_ldr_launcher.h"
 
 #include "native_client/src/public/imc_types.h"
+#include "native_client/src/public/nacl_file_info.h"
 #include "native_client/src/trusted/service_runtime/nacl_error_code.h"
-#include "native_client/src/trusted/validator/nacl_file_info.h"
 
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/cpp/core.h"