| Index: components/nacl/loader/nacl_ipc_adapter.cc
|
| diff --git a/components/nacl/loader/nacl_ipc_adapter.cc b/components/nacl/loader/nacl_ipc_adapter.cc
|
| index 261316826a67bd1b8153df8ac40957ca0685d4f6..42e8b5fa1422954fae943aa1028fb05cf07133dc 100644
|
| --- a/components/nacl/loader/nacl_ipc_adapter.cc
|
| +++ b/components/nacl/loader/nacl_ipc_adapter.cc
|
| @@ -233,13 +233,9 @@ scoped_ptr<NaClDescWrapper> MakeShmNaClDesc(
|
| const base::SharedMemoryHandle& handle,
|
| size_t size) {
|
| #if defined(OS_MACOSX)
|
| - if (handle.GetType() == base::SharedMemoryHandle::MACH) {
|
| - return scoped_ptr<NaClDescWrapper>(new NaClDescWrapper(
|
| - NaClDescImcShmMachMake(handle.GetMemoryObject(), size)));
|
| - }
|
| - CHECK_EQ(base::SharedMemoryHandle::POSIX, handle.GetType());
|
| -#endif
|
| -
|
| + return scoped_ptr<NaClDescWrapper>(new NaClDescWrapper(
|
| + NaClDescImcShmMachMake(handle.GetMemoryObject(), size)));
|
| +#else
|
| return scoped_ptr<NaClDescWrapper>(new NaClDescWrapper(NaClDescImcShmMake(
|
| #if defined(OS_WIN)
|
| handle.GetHandle(),
|
| @@ -247,6 +243,7 @@ scoped_ptr<NaClDescWrapper> MakeShmNaClDesc(
|
| base::SharedMemory::GetFdFromSharedMemoryHandle(handle),
|
| #endif
|
| size)));
|
| +#endif
|
| }
|
|
|
| } // namespace
|
|
|