| Index: components/nacl/loader/nacl_listener.cc
|
| diff --git a/components/nacl/loader/nacl_listener.cc b/components/nacl/loader/nacl_listener.cc
|
| index f527191c9ff9fc48a0efb1cf9cd9d54fe332c0f2..5056f0f70e986d08e2d45396fb77acd210c744e2 100644
|
| --- a/components/nacl/loader/nacl_listener.cc
|
| +++ b/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();
|
|
|