| Index: content/browser/mojo/mojo_application_host.cc
|
| diff --git a/content/browser/mojo/mojo_application_host.cc b/content/browser/mojo/mojo_application_host.cc
|
| index f2b110e71b197d24f4c04d417489b3619ff26a96..2a7062618d8aa29c4a91d47d3ce642b67764e22e 100644
|
| --- a/content/browser/mojo/mojo_application_host.cc
|
| +++ b/content/browser/mojo/mojo_application_host.cc
|
| @@ -38,7 +38,7 @@ class ApplicationSetupImpl : public mojom::ApplicationSetup {
|
|
|
| } // namespace
|
|
|
| -MojoApplicationHost::MojoApplicationHost()
|
| +MojoApplicationHost::MojoApplicationHost(const std::string& child_token)
|
| : token_(mojo::edk::GenerateRandomToken()) {
|
| #if defined(OS_ANDROID)
|
| service_registry_android_ =
|
| @@ -46,7 +46,7 @@ MojoApplicationHost::MojoApplicationHost()
|
| #endif
|
|
|
| mojo::ScopedMessagePipeHandle pipe =
|
| - mojo::edk::CreateParentMessagePipe(token_);
|
| + mojo::edk::CreateParentMessagePipe(token_, child_token);
|
| DCHECK(pipe.is_valid());
|
| application_setup_.reset(new ApplicationSetupImpl(
|
| &service_registry_,
|
|
|