| Index: ipc/ipc_channel_factory.cc
|
| diff --git a/ipc/ipc_channel_factory.cc b/ipc/ipc_channel_factory.cc
|
| index 50c00c05c88f01418724f74419b94def87e2fc4f..274989f0bc32f3d693e36d2e73b45ef6bad27f8f 100644
|
| --- a/ipc/ipc_channel_factory.cc
|
| +++ b/ipc/ipc_channel_factory.cc
|
| @@ -19,17 +19,17 @@ class PlatformChannelFactory : public ChannelFactory {
|
| const scoped_refptr<base::SingleThreadTaskRunner>& ipc_task_runner)
|
| : handle_(handle), mode_(mode), ipc_task_runner_(ipc_task_runner) {}
|
|
|
| - std::string GetName() const override {
|
| - return handle_.name;
|
| - }
|
| + std::string GetName() const override { return ""; }
|
|
|
| std::unique_ptr<Channel> BuildChannel(Listener* listener) override {
|
| - if (handle_.mojo_handle.is_valid()) {
|
| - return ChannelMojo::Create(
|
| - mojo::ScopedMessagePipeHandle(handle_.mojo_handle), mode_, listener,
|
| - ipc_task_runner_);
|
| - }
|
| +#if defined(OS_NACL_SFI)
|
| return Channel::Create(handle_, mode_, listener);
|
| +#else
|
| + DCHECK(handle_.is_mojo_channel_handle());
|
| + return ChannelMojo::Create(
|
| + mojo::ScopedMessagePipeHandle(handle_.mojo_handle), mode_, listener,
|
| + ipc_task_runner_);
|
| +#endif
|
| }
|
|
|
| scoped_refptr<base::SingleThreadTaskRunner> GetIPCTaskRunner() override {
|
|
|