Mark EmbeddedServiceInfo::ServiceFactory as a RepeatingCallback.

BUG=714018

Change-Id: Ia17a1dc5f1d06ea6d0af1301489526c9030d1d53
Reviewed-on: https://chromium-review.googlesource.com/1054779
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Jay Civelli <jcivelli@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Reviewed-by: Ken Rockot <rockot@chromium.org>
Cr-Commit-Position: refs/heads/master@{#558487}

chrome/utility/chrome_content_utility_client.cc

@@ -92,7 +92,7 @@ void RegisterRemovableStorageWriterService(
     ChromeContentUtilityClient::StaticServiceMap* services) {
   service_manager::EmbeddedServiceInfo service_info;
   service_info.factory =
-      base::Bind(&RemovableStorageWriterService::CreateService);
+      base::BindRepeating(&RemovableStorageWriterService::CreateService);
   services->emplace(chrome::mojom::kRemovableStorageWriterServiceName,
                     service_info);
 }
@@ -136,7 +136,7 @@ void ChromeContentUtilityClient::UtilityThreadStarted() {
     // TODO(crbug.com/798782): remove when the Cloud print chrome/service is
     // removed.
     registry->AddInterface(
-        base::Bind(printing::PdfToEmfConverterFactory::Create),
+        base::BindRepeating(printing::PdfToEmfConverterFactory::Create),
         base::ThreadTaskRunnerHandle::Get());
 #endif
   }
@@ -162,7 +162,8 @@ void ChromeContentUtilityClient::RegisterServices(
   if (utility_process_running_elevated_) {
 #if defined(OS_WIN) && BUILDFLAG(ENABLE_EXTENSIONS)
     service_manager::EmbeddedServiceInfo service_info;
-    service_info.factory = base::Bind(&WifiUtilWinService::CreateService);
+    service_info.factory =
+        base::BindRepeating(&WifiUtilWinService::CreateService);
     services->emplace(chrome::mojom::kWifiUtilWinServiceName, service_info);
 
     RegisterRemovableStorageWriterService(services);
@@ -172,62 +173,60 @@ void ChromeContentUtilityClient::RegisterServices(
 
 #if BUILDFLAG(ENABLE_PRINTING)
   service_manager::EmbeddedServiceInfo pdf_compositor_info;
-  pdf_compositor_info.factory =
-      base::Bind(&printing::CreatePdfCompositorService, GetUserAgent());
+  pdf_compositor_info.factory = base::BindRepeating(
+      &printing::CreatePdfCompositorService, GetUserAgent());
   services->emplace(printing::mojom::kServiceName, pdf_compositor_info);
 #endif
 
 #if BUILDFLAG(ENABLE_PRINT_PREVIEW)
-  {
-    service_manager::EmbeddedServiceInfo printing_info;
-    printing_info.factory =
-        base::Bind(&printing::PrintingService::CreateService);
-    services->emplace(printing::mojom::kChromePrintingServiceName,
-                      printing_info);
-  }
+  service_manager::EmbeddedServiceInfo printing_info;
+  printing_info.factory =
+      base::BindRepeating(&printing::PrintingService::CreateService);
+  services->emplace(printing::mojom::kChromePrintingServiceName, printing_info);
 #endif
 
   service_manager::EmbeddedServiceInfo profiling_info;
   profiling_info.task_runner = content::ChildThread::Get()->GetIOTaskRunner();
   profiling_info.factory =
-      base::Bind(&heap_profiling::HeapProfilingService::CreateService);
+      base::BindRepeating(&heap_profiling::HeapProfilingService::CreateService);
   services->emplace(heap_profiling::mojom::kServiceName, profiling_info);
 
 #if !defined(OS_ANDROID)
   service_manager::EmbeddedServiceInfo proxy_resolver_info;
   proxy_resolver_info.task_runner =
       content::ChildThread::Get()->GetIOTaskRunner();
   proxy_resolver_info.factory =
-      base::Bind(&proxy_resolver::ProxyResolverService::CreateService);
+      base::BindRepeating(&proxy_resolver::ProxyResolverService::CreateService);
   services->emplace(proxy_resolver::mojom::kProxyResolverServiceName,
                     proxy_resolver_info);
 
   service_manager::EmbeddedServiceInfo profile_import_info;
   profile_import_info.factory =
-      base::Bind(&ProfileImportService::CreateService);
+      base::BindRepeating(&ProfileImportService::CreateService);
   services->emplace(chrome::mojom::kProfileImportServiceName,
                     profile_import_info);
 #endif
 
 #if defined(OS_WIN)
   {
     service_manager::EmbeddedServiceInfo service_info;
-    service_info.factory = base::Bind(&UtilWinService::CreateService);
+    service_info.factory = base::BindRepeating(&UtilWinService::CreateService);
     services->emplace(chrome::mojom::kUtilWinServiceName, service_info);
   }
 #endif
 
 #if defined(FULL_SAFE_BROWSING) || defined(OS_CHROMEOS)
   {
     service_manager::EmbeddedServiceInfo service_info;
-    service_info.factory = base::Bind(&FileUtilService::CreateService);
+    service_info.factory = base::BindRepeating(&FileUtilService::CreateService);
     services->emplace(chrome::mojom::kFileUtilServiceName, service_info);
   }
 #endif
 
   {
     service_manager::EmbeddedServiceInfo service_info;
-    service_info.factory = base::Bind(&patch::PatchService::CreateService);
+    service_info.factory =
+        base::BindRepeating(&patch::PatchService::CreateService);
     services->emplace(patch::mojom::kServiceName, service_info);
   }
 
@@ -246,7 +245,8 @@ void ChromeContentUtilityClient::RegisterServices(
 #if BUILDFLAG(ENABLE_EXTENSIONS) || defined(OS_ANDROID)
   {
     service_manager::EmbeddedServiceInfo service_info;
-    service_info.factory = base::Bind(&MediaGalleryUtilService::CreateService);
+    service_info.factory =
+        base::BindRepeating(&MediaGalleryUtilService::CreateService);
     services->emplace(chrome::mojom::kMediaGalleryUtilServiceName,
                       service_info);
   }

services/service_manager/embedder/embedded_service_info.h

@@ -23,7 +23,7 @@ class Service;
 // instances of embedded services.
 struct SERVICE_MANAGER_EMBEDDER_EXPORT EmbeddedServiceInfo {
   using ServiceFactory =
-      base::Callback<std::unique_ptr<service_manager::Service>()>;
+      base::RepeatingCallback<std::unique_ptr<service_manager::Service>()>;
 
   EmbeddedServiceInfo();
   EmbeddedServiceInfo(const EmbeddedServiceInfo& other);