| Index: services/service_manager/runner/child/test_native_main.cc
|
| diff --git a/services/service_manager/runner/child/test_native_main.cc b/services/service_manager/runner/child/test_native_main.cc
|
| index 4bac06c3fb2e8dae59bd8c8ffc2fb90c7dc449b3..75806ccdf3f76ef56347ec834d4929751ff229bf 100644
|
| --- a/services/service_manager/runner/child/test_native_main.cc
|
| +++ b/services/service_manager/runner/child/test_native_main.cc
|
| @@ -36,7 +36,7 @@ class ProcessDelegate : public mojo::edk::ProcessDelegate {
|
|
|
| } // namespace
|
|
|
| -int TestNativeMain(service_manager::Service* service) {
|
| +int TestNativeMain(std::unique_ptr<service_manager::Service> service) {
|
| service_manager::WaitForDebuggerIfNecessary();
|
|
|
| #if !defined(OFFICIAL_BUILD)
|
| @@ -58,13 +58,11 @@ int TestNativeMain(service_manager::Service* service) {
|
| mojo::edk::SetParentPipeHandleFromCommandLine();
|
|
|
| base::MessageLoop loop;
|
| - service->set_context(base::MakeUnique<service_manager::ServiceContext>(
|
| - service, service_manager::GetServiceRequestFromCommandLine()));
|
| + service_manager::ServiceContext context(
|
| + std::move(service),
|
| + service_manager::GetServiceRequestFromCommandLine());
|
| base::RunLoop().Run();
|
| -
|
| mojo::edk::ShutdownIPCSupport();
|
| -
|
| - service->set_context(std::unique_ptr<ServiceContext>());
|
| }
|
|
|
| return 0;
|
|
|