Commit d80eb10d authored by Ken Rockot's avatar Ken Rockot Committed by Commit Bot

[service-manager] Rename RunUntilTermination

Renames RunUntilTermination to RunAsyncUntilTermination to
(hopefully) clarify that the call does not block the caller until
the service terminates.

TBR=sky@chromium.org

Bug: None
Change-Id: I04e059a0332b76d565625059baf11dd077275aa3
Reviewed-on: https://chromium-review.googlesource.com/c/1351537
Commit-Queue: Ken Rockot <rockot@google.com>
Reviewed-by: default avatarScott Violet <sky@chromium.org>
Reviewed-by: default avatarKen Rockot <rockot@google.com>
Cr-Commit-Position: refs/heads/master@{#612190}
parent ffba3781
...@@ -3874,14 +3874,14 @@ void ChromeContentBrowserClient::HandleServiceRequest( ...@@ -3874,14 +3874,14 @@ void ChromeContentBrowserClient::HandleServiceRequest(
if (!g_browser_process || !g_browser_process->pref_service_factory()) if (!g_browser_process || !g_browser_process->pref_service_factory())
return; return;
service_manager::Service::RunUntilTermination( service_manager::Service::RunAsyncUntilTermination(
g_browser_process->pref_service_factory()->CreatePrefService( g_browser_process->pref_service_factory()->CreatePrefService(
std::move(request))); std::move(request)));
} }
#if BUILDFLAG(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS) #if BUILDFLAG(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS)
if (service_name == media::mojom::kMediaServiceName) { if (service_name == media::mojom::kMediaServiceName) {
service_manager::Service::RunUntilTermination( service_manager::Service::RunAsyncUntilTermination(
media::CreateMediaService(std::move(request))); media::CreateMediaService(std::move(request)));
} }
#endif #endif
......
...@@ -146,7 +146,7 @@ static void CreateMediaService(CastContentBrowserClient* browser_client, ...@@ -146,7 +146,7 @@ static void CreateMediaService(CastContentBrowserClient* browser_client,
std::move(mojo_media_client), std::move(request)); std::move(mojo_media_client), std::move(request));
#endif // defined(OS_ANDROID) #endif // defined(OS_ANDROID)
service_manager::Service::RunUntilTermination(std::move(service)); service_manager::Service::RunAsyncUntilTermination(std::move(service));
} }
#endif // BUILDFLAG(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS) #endif // BUILDFLAG(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS)
......
...@@ -424,7 +424,7 @@ void CreateInProcessAudioService( ...@@ -424,7 +424,7 @@ void CreateInProcessAudioService(
FROM_HERE, base::BindOnce( FROM_HERE, base::BindOnce(
[](media::AudioManager* audio_manager, [](media::AudioManager* audio_manager,
service_manager::mojom::ServiceRequest request) { service_manager::mojom::ServiceRequest request) {
service_manager::Service::RunUntilTermination( service_manager::Service::RunAsyncUntilTermination(
audio::CreateEmbeddedService(audio_manager, audio::CreateEmbeddedService(audio_manager,
std::move(request))); std::move(request)));
}, },
...@@ -634,7 +634,7 @@ ServiceManagerContext::ServiceManagerContext( ...@@ -634,7 +634,7 @@ ServiceManagerContext::ServiceManagerContext(
packaged_services_connection_->AddServiceRequestHandler( packaged_services_connection_->AddServiceRequestHandler(
resource_coordinator::mojom::kServiceName, resource_coordinator::mojom::kServiceName,
base::BindRepeating([](service_manager::mojom::ServiceRequest request) { base::BindRepeating([](service_manager::mojom::ServiceRequest request) {
service_manager::Service::RunUntilTermination( service_manager::Service::RunAsyncUntilTermination(
std::make_unique<resource_coordinator::ResourceCoordinatorService>( std::make_unique<resource_coordinator::ResourceCoordinatorService>(
std::move(request))); std::move(request)));
})); }));
...@@ -650,7 +650,7 @@ ServiceManagerContext::ServiceManagerContext( ...@@ -650,7 +650,7 @@ ServiceManagerContext::ServiceManagerContext(
packaged_services_connection_->AddServiceRequestHandler( packaged_services_connection_->AddServiceRequestHandler(
tracing::mojom::kServiceName, tracing::mojom::kServiceName,
base::BindRepeating([](service_manager::mojom::ServiceRequest request) { base::BindRepeating([](service_manager::mojom::ServiceRequest request) {
service_manager::Service::RunUntilTermination( service_manager::Service::RunAsyncUntilTermination(
std::make_unique<tracing::TracingService>(std::move(request))); std::make_unique<tracing::TracingService>(std::move(request)));
})); }));
...@@ -716,7 +716,7 @@ ServiceManagerContext::ServiceManagerContext( ...@@ -716,7 +716,7 @@ ServiceManagerContext::ServiceManagerContext(
mojom::kNetworkServiceName, mojom::kNetworkServiceName,
base::BindRepeating( base::BindRepeating(
[](service_manager::mojom::ServiceRequest request) { [](service_manager::mojom::ServiceRequest request) {
service_manager::Service::RunUntilTermination( service_manager::Service::RunAsyncUntilTermination(
CreateNetworkService(std::move(request))); CreateNetworkService(std::move(request)));
})); }));
} else { } else {
...@@ -885,7 +885,7 @@ void ServiceManagerContext::OnUnhandledServiceRequest( ...@@ -885,7 +885,7 @@ void ServiceManagerContext::OnUnhandledServiceRequest(
base::Unretained(GetContentClient()->browser())), base::Unretained(GetContentClient()->browser())),
std::move(request)); std::move(request));
#endif #endif
service_manager::Service::RunUntilTermination(std::move(service)); service_manager::Service::RunAsyncUntilTermination(std::move(service));
return; return;
} }
......
...@@ -73,19 +73,19 @@ bool GpuServiceFactory::HandleServiceRequest( ...@@ -73,19 +73,19 @@ bool GpuServiceFactory::HandleServiceRequest(
gpu_workarounds_, gpu_feature_info_, task_runner_, gpu_workarounds_, gpu_feature_info_, task_runner_,
media_gpu_channel_manager_, android_overlay_factory_cb_, media_gpu_channel_manager_, android_overlay_factory_cb_,
std::move(cdm_proxy_factory_cb)); std::move(cdm_proxy_factory_cb));
task_runner->PostTask(FROM_HERE, task_runner->PostTask(
base::BindOnce( FROM_HERE, base::BindOnce(
[](FactoryCallback factory) { [](FactoryCallback factory) {
service_manager::Service::RunUntilTermination( service_manager::Service::RunAsyncUntilTermination(
std::move(factory).Run()); std::move(factory).Run());
}, },
std::move(factory))); std::move(factory)));
return true; return true;
} }
#endif // BUILDFLAG(ENABLE_MOJO_MEDIA_IN_GPU_PROCESS) #endif // BUILDFLAG(ENABLE_MOJO_MEDIA_IN_GPU_PROCESS)
if (service_name == shape_detection::mojom::kServiceName) { if (service_name == shape_detection::mojom::kServiceName) {
service_manager::Service::RunUntilTermination( service_manager::Service::RunAsyncUntilTermination(
std::make_unique<shape_detection::ShapeDetectionService>( std::make_unique<shape_detection::ShapeDetectionService>(
std::move(request))); std::move(request)));
return true; return true;
......
...@@ -231,7 +231,7 @@ void ShellContentBrowserClient::HandleServiceRequest( ...@@ -231,7 +231,7 @@ void ShellContentBrowserClient::HandleServiceRequest(
service_manager::mojom::ServiceRequest request) { service_manager::mojom::ServiceRequest request) {
#if BUILDFLAG(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS) #if BUILDFLAG(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS)
if (service_name == media::mojom::kMediaServiceName) { if (service_name == media::mojom::kMediaServiceName) {
service_manager::Service::RunUntilTermination( service_manager::Service::RunAsyncUntilTermination(
media::CreateMediaServiceForTesting(std::move(request))); media::CreateMediaServiceForTesting(std::move(request)));
} }
#endif #endif
......
...@@ -14,7 +14,7 @@ Service::Service() = default; ...@@ -14,7 +14,7 @@ Service::Service() = default;
Service::~Service() = default; Service::~Service() = default;
// static // static
void Service::RunUntilTermination(std::unique_ptr<Service> service) { void Service::RunAsyncUntilTermination(std::unique_ptr<Service> service) {
auto* raw_service = service.get(); auto* raw_service = service.get();
raw_service->set_termination_closure(base::BindOnce( raw_service->set_termination_closure(base::BindOnce(
[](std::unique_ptr<Service> service) {}, std::move(service))); [](std::unique_ptr<Service> service) {}, std::move(service)));
......
...@@ -32,7 +32,7 @@ class COMPONENT_EXPORT(SERVICE_MANAGER_CPP) Service { ...@@ -32,7 +32,7 @@ class COMPONENT_EXPORT(SERVICE_MANAGER_CPP) Service {
// This should really only be called on a Service instance that has a bound // This should really only be called on a Service instance that has a bound
// connection to the Service Manager, e.g. a functioning ServiceBinding. If // connection to the Service Manager, e.g. a functioning ServiceBinding. If
// the service never calls |Terminate()|, it will effectively leak. // the service never calls |Terminate()|, it will effectively leak.
static void RunUntilTermination(std::unique_ptr<Service> service); static void RunAsyncUntilTermination(std::unique_ptr<Service> service);
// Sets a closure to run when the service wants to self-terminate. This may be // Sets a closure to run when the service wants to self-terminate. This may be
// used by whomever created the Service instance in order to clean up // used by whomever created the Service instance in order to clean up
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment