Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(366)

Unified Diff: services/service_manager/runner/child/test_native_main.cc

Issue 2476063002: Service Manager: Rework Service and ServiceContext lifetime (Closed)
Patch Set: . Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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;
« no previous file with comments | « services/service_manager/runner/child/test_native_main.h ('k') | services/service_manager/service_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698