| Index: services/service_manager/runner/common/client_util.cc
|
| diff --git a/services/service_manager/runner/common/client_util.cc b/services/service_manager/runner/common/client_util.cc
|
| index 082d30696606b49d5cc21662419d11cc4204f040..f613598b608154e424bc04885f8af5b67028825e 100644
|
| --- a/services/service_manager/runner/common/client_util.cc
|
| +++ b/services/service_manager/runner/common/client_util.cc
|
| @@ -8,19 +8,18 @@
|
|
|
| #include "base/command_line.h"
|
| #include "mojo/edk/embedder/embedder.h"
|
| +#include "mojo/edk/embedder/pending_process_connection.h"
|
| #include "services/service_manager/runner/common/switches.h"
|
|
|
| namespace service_manager {
|
|
|
| mojom::ServicePtr PassServiceRequestOnCommandLine(
|
| - base::CommandLine* command_line, const std::string& child_token) {
|
| - std::string token = mojo::edk::GenerateRandomToken();
|
| - command_line->AppendSwitchASCII(switches::kPrimordialPipeToken, token);
|
| -
|
| + const mojo::edk::PendingProcessConnection& connection,
|
| + base::CommandLine* command_line) {
|
| + std::string token;
|
| mojom::ServicePtr client;
|
| - client.Bind(
|
| - mojom::ServicePtrInfo(
|
| - mojo::edk::CreateParentMessagePipe(token, child_token), 0));
|
| + client.Bind(mojom::ServicePtrInfo(connection.CreateMessagePipe(&token), 0));
|
| + command_line->AppendSwitchASCII(switches::kPrimordialPipeToken, token);
|
| return client;
|
| }
|
|
|
|
|