| Index: content/child/child_thread_impl.cc
|
| diff --git a/content/child/child_thread_impl.cc b/content/child/child_thread_impl.cc
|
| index d9b02b2769ae7eacce85a7490a4436613cabd478..98a9ed1c18bd2c541cce74ae0a51dc2efa5299e1 100644
|
| --- a/content/child/child_thread_impl.cc
|
| +++ b/content/child/child_thread_impl.cc
|
| @@ -64,7 +64,7 @@
|
| #include "ipc/ipc_sync_channel.h"
|
| #include "ipc/ipc_sync_message_filter.h"
|
| #include "ipc/mojo/ipc_channel_mojo.h"
|
| -#include "third_party/mojo/src/mojo/edk/embedder/embedder.h"
|
| +#include "mojo/edk/embedder/embedder.h"
|
|
|
| #if defined(TCMALLOC_TRACE_MEMORY_SUPPORTED)
|
| #include "third_party/tcmalloc/chromium/src/gperftools/heap-profiler.h"
|
| @@ -701,8 +701,8 @@ void ChildThreadImpl::OnBindExternalMojoShellHandle(
|
|
|
| void ChildThreadImpl::OnSetMojoParentPipeHandle(
|
| const IPC::PlatformFileForTransit& file) {
|
| - mojo::embedder::SetParentPipeHandle(
|
| - mojo::embedder::ScopedPlatformHandle(mojo::embedder::PlatformHandle(
|
| + mojo::edk::SetParentPipeHandle(
|
| + mojo::edk::ScopedPlatformHandle(mojo::edk::PlatformHandle(
|
| IPC::PlatformFileForTransitToPlatformFile(file))));
|
| }
|
|
|
|
|