[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: Scott Violet <sky@chromium.org> Reviewed-by: Ken Rockot <rockot@google.com> Cr-Commit-Position: refs/heads/master@{#612190}
This commit is contained in:
chrome/browser
chromecast/browser
content
browser
service_manager
gpu
shell
services/service_manager/public/cpp
@ -3874,14 +3874,14 @@ void ChromeContentBrowserClient::HandleServiceRequest(
|
||||
if (!g_browser_process || !g_browser_process->pref_service_factory())
|
||||
return;
|
||||
|
||||
service_manager::Service::RunUntilTermination(
|
||||
service_manager::Service::RunAsyncUntilTermination(
|
||||
g_browser_process->pref_service_factory()->CreatePrefService(
|
||||
std::move(request)));
|
||||
}
|
||||
|
||||
#if BUILDFLAG(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS)
|
||||
if (service_name == media::mojom::kMediaServiceName) {
|
||||
service_manager::Service::RunUntilTermination(
|
||||
service_manager::Service::RunAsyncUntilTermination(
|
||||
media::CreateMediaService(std::move(request)));
|
||||
}
|
||||
#endif
|
||||
|
@ -146,7 +146,7 @@ static void CreateMediaService(CastContentBrowserClient* browser_client,
|
||||
std::move(mojo_media_client), std::move(request));
|
||||
#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)
|
||||
|
||||
|
@ -424,7 +424,7 @@ void CreateInProcessAudioService(
|
||||
FROM_HERE, base::BindOnce(
|
||||
[](media::AudioManager* audio_manager,
|
||||
service_manager::mojom::ServiceRequest request) {
|
||||
service_manager::Service::RunUntilTermination(
|
||||
service_manager::Service::RunAsyncUntilTermination(
|
||||
audio::CreateEmbeddedService(audio_manager,
|
||||
std::move(request)));
|
||||
},
|
||||
@ -634,7 +634,7 @@ ServiceManagerContext::ServiceManagerContext(
|
||||
packaged_services_connection_->AddServiceRequestHandler(
|
||||
resource_coordinator::mojom::kServiceName,
|
||||
base::BindRepeating([](service_manager::mojom::ServiceRequest request) {
|
||||
service_manager::Service::RunUntilTermination(
|
||||
service_manager::Service::RunAsyncUntilTermination(
|
||||
std::make_unique<resource_coordinator::ResourceCoordinatorService>(
|
||||
std::move(request)));
|
||||
}));
|
||||
@ -650,7 +650,7 @@ ServiceManagerContext::ServiceManagerContext(
|
||||
packaged_services_connection_->AddServiceRequestHandler(
|
||||
tracing::mojom::kServiceName,
|
||||
base::BindRepeating([](service_manager::mojom::ServiceRequest request) {
|
||||
service_manager::Service::RunUntilTermination(
|
||||
service_manager::Service::RunAsyncUntilTermination(
|
||||
std::make_unique<tracing::TracingService>(std::move(request)));
|
||||
}));
|
||||
|
||||
@ -716,7 +716,7 @@ ServiceManagerContext::ServiceManagerContext(
|
||||
mojom::kNetworkServiceName,
|
||||
base::BindRepeating(
|
||||
[](service_manager::mojom::ServiceRequest request) {
|
||||
service_manager::Service::RunUntilTermination(
|
||||
service_manager::Service::RunAsyncUntilTermination(
|
||||
CreateNetworkService(std::move(request)));
|
||||
}));
|
||||
} else {
|
||||
@ -885,7 +885,7 @@ void ServiceManagerContext::OnUnhandledServiceRequest(
|
||||
base::Unretained(GetContentClient()->browser())),
|
||||
std::move(request));
|
||||
#endif
|
||||
service_manager::Service::RunUntilTermination(std::move(service));
|
||||
service_manager::Service::RunAsyncUntilTermination(std::move(service));
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -73,19 +73,19 @@ bool GpuServiceFactory::HandleServiceRequest(
|
||||
gpu_workarounds_, gpu_feature_info_, task_runner_,
|
||||
media_gpu_channel_manager_, android_overlay_factory_cb_,
|
||||
std::move(cdm_proxy_factory_cb));
|
||||
task_runner->PostTask(FROM_HERE,
|
||||
base::BindOnce(
|
||||
[](FactoryCallback factory) {
|
||||
service_manager::Service::RunUntilTermination(
|
||||
std::move(factory).Run());
|
||||
},
|
||||
std::move(factory)));
|
||||
task_runner->PostTask(
|
||||
FROM_HERE, base::BindOnce(
|
||||
[](FactoryCallback factory) {
|
||||
service_manager::Service::RunAsyncUntilTermination(
|
||||
std::move(factory).Run());
|
||||
},
|
||||
std::move(factory)));
|
||||
return true;
|
||||
}
|
||||
#endif // BUILDFLAG(ENABLE_MOJO_MEDIA_IN_GPU_PROCESS)
|
||||
|
||||
if (service_name == shape_detection::mojom::kServiceName) {
|
||||
service_manager::Service::RunUntilTermination(
|
||||
service_manager::Service::RunAsyncUntilTermination(
|
||||
std::make_unique<shape_detection::ShapeDetectionService>(
|
||||
std::move(request)));
|
||||
return true;
|
||||
|
@ -231,7 +231,7 @@ void ShellContentBrowserClient::HandleServiceRequest(
|
||||
service_manager::mojom::ServiceRequest request) {
|
||||
#if BUILDFLAG(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS)
|
||||
if (service_name == media::mojom::kMediaServiceName) {
|
||||
service_manager::Service::RunUntilTermination(
|
||||
service_manager::Service::RunAsyncUntilTermination(
|
||||
media::CreateMediaServiceForTesting(std::move(request)));
|
||||
}
|
||||
#endif
|
||||
|
@ -14,7 +14,7 @@ Service::Service() = default;
|
||||
Service::~Service() = default;
|
||||
|
||||
// static
|
||||
void Service::RunUntilTermination(std::unique_ptr<Service> service) {
|
||||
void Service::RunAsyncUntilTermination(std::unique_ptr<Service> service) {
|
||||
auto* raw_service = service.get();
|
||||
raw_service->set_termination_closure(base::BindOnce(
|
||||
[](std::unique_ptr<Service> service) {}, std::move(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
|
||||
// connection to the Service Manager, e.g. a functioning ServiceBinding. If
|
||||
// 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
|
||||
// used by whomever created the Service instance in order to clean up
|
||||
|
Reference in New Issue
Block a user