| Index: mojo/edk/system/node_controller.cc
|
| diff --git a/mojo/edk/system/node_controller.cc b/mojo/edk/system/node_controller.cc
|
| index 1472f03fd5a161e867f45409b6fe32b0a23e60e4..45079413fec275ee12f8e171c34931c9da96c665 100644
|
| --- a/mojo/edk/system/node_controller.cc
|
| +++ b/mojo/edk/system/node_controller.cc
|
| @@ -127,7 +127,7 @@ void NodeController::ConnectToChild(base::ProcessHandle process_handle,
|
|
|
| void NodeController::ConnectToParent(ScopedPlatformHandle platform_handle) {
|
| // TODO(amistry): Consider the need for a broker on Windows.
|
| -#if defined(OS_POSIX)
|
| +#if defined(OS_POSIX) && !defined(OS_MACOSX)
|
| // On posix, use the bootstrap channel for the broker and receive the node's
|
| // channel synchronously as the first message from the broker.
|
| broker_.reset(new Broker(std::move(platform_handle)));
|
| @@ -245,7 +245,7 @@ void NodeController::ConnectToChildOnIOThread(
|
| ScopedPlatformHandle platform_handle) {
|
| DCHECK(io_task_runner_->RunsTasksOnCurrentThread());
|
|
|
| -#if defined(OS_POSIX)
|
| +#if defined(OS_POSIX) && !defined(OS_MACOSX)
|
| PlatformChannelPair node_channel;
|
| // BrokerHost owns itself.
|
| BrokerHost* broker_host = new BrokerHost(std::move(platform_handle));
|
|
|