diff options
| author | mseaborn <mseaborn@chromium.org> | 2015-05-23 00:58:43 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-05-23 07:59:11 +0000 |
| commit | b955d50ef7c0598baecc34ec7c4247c95e7819e5 (patch) | |
| tree | 9c8b2e412a09b87ec8d3939b606e27139f58e413 | |
| parent | 9510b7fcb9dd4312e67deed750ae22401073fec4 (diff) | |
| download | chromium_src-b955d50ef7c0598baecc34ec7c4247c95e7819e5.zip chromium_src-b955d50ef7c0598baecc34ec7c4247c95e7819e5.tar.gz chromium_src-b955d50ef7c0598baecc34ec7c4247c95e7819e5.tar.bz2 | |
NaCl cleanup: Use the version of nacl_desc_custom.h from src/public/
BUG=https://code.google.com/p/nativeclient/issues/detail?id=2832
TEST=build
Review URL: https://codereview.chromium.org/1157623002
Cr-Commit-Position: refs/heads/master@{#331234}
| -rw-r--r-- | components/nacl/loader/nacl_ipc_adapter.cc | 2 | ||||
| -rw-r--r-- | components/nacl/loader/nacl_ipc_adapter_unittest.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/components/nacl/loader/nacl_ipc_adapter.cc b/components/nacl/loader/nacl_ipc_adapter.cc index 61625e0..e0312a9 100644 --- a/components/nacl/loader/nacl_ipc_adapter.cc +++ b/components/nacl/loader/nacl_ipc_adapter.cc @@ -18,8 +18,8 @@ #include "ipc/ipc_channel.h" #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_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" diff --git a/components/nacl/loader/nacl_ipc_adapter_unittest.cc b/components/nacl/loader/nacl_ipc_adapter_unittest.cc index 826b41d..7be72c7 100644 --- a/components/nacl/loader/nacl_ipc_adapter_unittest.cc +++ b/components/nacl/loader/nacl_ipc_adapter_unittest.cc @@ -12,7 +12,7 @@ #include "base/threading/platform_thread.h" #include "base/threading/simple_thread.h" #include "ipc/ipc_test_sink.h" -#include "native_client/src/trusted/desc/nacl_desc_custom.h" +#include "native_client/src/public/nacl_desc_custom.h" #include "native_client/src/trusted/service_runtime/include/sys/fcntl.h" #include "ppapi/c/ppb_file_io.h" #include "testing/gtest/include/gtest/gtest.h" |