| Index: content/common/service_manager/child_connection.cc
|
| diff --git a/content/common/service_manager/child_connection.cc b/content/common/service_manager/child_connection.cc
|
| index 58cca53960fae04781cad0cda99d5b9e71f808e6..d80789bd539449a81b84972564b8d1f79972b51a 100644
|
| --- a/content/common/service_manager/child_connection.cc
|
| +++ b/content/common/service_manager/child_connection.cc
|
| @@ -123,20 +123,16 @@ class ChildConnection::IOThreadContext
|
| ChildConnection::ChildConnection(
|
| const std::string& service_name,
|
| const std::string& instance_id,
|
| - const std::string& child_token,
|
| + const mojo::edk::PendingProcessConnection& process_connection,
|
| service_manager::Connector* connector,
|
| scoped_refptr<base::SequencedTaskRunner> io_task_runner)
|
| - : child_token_(child_token),
|
| - context_(new IOThreadContext),
|
| + : context_(new IOThreadContext),
|
| child_identity_(service_name,
|
| service_manager::mojom::kInheritUserID,
|
| instance_id),
|
| - service_token_(mojo::edk::GenerateRandomToken()),
|
| weak_factory_(this) {
|
| - mojo::ScopedMessagePipeHandle service_pipe =
|
| - mojo::edk::CreateParentMessagePipe(service_token_, child_token_);
|
| -
|
| - context_->Initialize(child_identity_, connector, std::move(service_pipe),
|
| + context_->Initialize(child_identity_, connector,
|
| + process_connection.CreateMessagePipe(&service_token_),
|
| io_task_runner);
|
| remote_interfaces_.Forward(
|
| base::Bind(&CallBinderOnTaskRunner,
|
| @@ -146,14 +142,6 @@ ChildConnection::ChildConnection(
|
|
|
| ChildConnection::~ChildConnection() {
|
| context_->ShutDown();
|
| -
|
| - if (process_handle_ == base::kNullProcessHandle) {
|
| - // The process handle was never set, so we have to assume the process was
|
| - // not successfully launched. Note that ChildProcessLauncher may also call
|
| - // call ChildProcessLaunchFailed for the same token, so this is (harmlessly)
|
| - // redundant in some cases.
|
| - mojo::edk::ChildProcessLaunchFailed(child_token_);
|
| - }
|
| }
|
|
|
| void ChildConnection::SetProcessHandle(base::ProcessHandle handle) {
|
|
|