Chromium Code Reviews| Index: mojo/edk/system/core.cc |
| diff --git a/mojo/edk/system/core.cc b/mojo/edk/system/core.cc |
| index 355c65f667a094dcc200a10f4201f47da14ea06c..1ce914d2250facbcf9f14966db4105b7e481d93a 100644 |
| --- a/mojo/edk/system/core.cc |
| +++ b/mojo/edk/system/core.cc |
| @@ -18,7 +18,6 @@ |
| #include "base/rand_util.h" |
| #include "base/threading/thread_task_runner_handle.h" |
| #include "base/time/time.h" |
| -#include "crypto/random.h" |
| #include "mojo/edk/embedder/embedder.h" |
| #include "mojo/edk/embedder/embedder_internal.h" |
| #include "mojo/edk/embedder/platform_shared_buffer.h" |
| @@ -316,6 +315,9 @@ void Core::RequestShutdown(const base::Closure& callback) { |
| ScopedMessagePipeHandle Core::CreateMessagePipe( |
| ScopedPlatformHandle platform_handle) { |
| +#if defined(OS_NACL) |
| + return ScopedMessagePipeHandle(); |
|
Ken Rockot(use gerrit already)
2016/06/06 02:58:34
NOTREACHED perhaps?
Anand Mistry (off Chromium)
2016/06/06 03:47:02
Done. I think the return is still necessary though
|
| +#else |
| ports::PortRef port0, port1; |
| GetNodeController()->node()->CreatePortPair(&port0, &port1); |
| MojoHandle handle = AddDispatcher( |
| @@ -324,6 +326,7 @@ ScopedMessagePipeHandle Core::CreateMessagePipe( |
| RemoteMessagePipeBootstrap::Create( |
| GetNodeController(), std::move(platform_handle), port1); |
| return ScopedMessagePipeHandle(MessagePipeHandle(handle)); |
| +#endif |
| } |
| ScopedMessagePipeHandle Core::CreateParentMessagePipe( |