| 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 cc8e0b1b75b8b60cc86964512b42f57e18469662..491286bbc83d80f520dc21512137ef8555bc1ac9 100644
|
| --- a/content/common/service_manager/child_connection.cc
|
| +++ b/content/common/service_manager/child_connection.cc
|
| @@ -115,15 +115,12 @@ class ChildConnection::IOThreadContext
|
| };
|
|
|
| ChildConnection::ChildConnection(
|
| - const std::string& service_name,
|
| - const std::string& instance_id,
|
| + const service_manager::Identity& child_identity,
|
| mojo::edk::PendingProcessConnection* process_connection,
|
| service_manager::Connector* connector,
|
| scoped_refptr<base::SequencedTaskRunner> io_task_runner)
|
| : context_(new IOThreadContext),
|
| - child_identity_(service_name,
|
| - service_manager::mojom::kInheritUserID,
|
| - instance_id),
|
| + child_identity_(child_identity),
|
| weak_factory_(this) {
|
| context_->Initialize(child_identity_, connector,
|
| process_connection->CreateMessagePipe(&service_token_),
|
|
|