Reland [Mojo Video Capture] Hook up video capture service behind a feature flag

content/utility/utility_service_factory.cc

Index: content/utility/utility_service_factory.cc
diff --git a/content/utility/utility_service_factory.cc b/content/utility/utility_service_factory.cc
index 2420c557e90ec0e888018b29ea514f760b6b9d09..2f95ab61a62d1c9a09d73429b3935e218d85ed29 100644
--- a/content/utility/utility_service_factory.cc
+++ b/content/utility/utility_service_factory.cc
@@ -19,11 +19,21 @@
 #include "services/data_decoder/public/interfaces/constants.mojom.h"
 #include "services/shape_detection/public/interfaces/constants.mojom.h"
 #include "services/shape_detection/shape_detection_service.h"
+#include "services/video_capture/public/interfaces/constants.mojom.h"
+#include "services/video_capture/service_impl.h"
 
 #if BUILDFLAG(ENABLE_MOJO_MEDIA_IN_UTILITY_PROCESS)
 #include "media/mojo/services/media_service_factory.h"  // nogncheck
 #endif
 
+namespace {
+
+std::unique_ptr<service_manager::Service> CreateVideoCaptureService() {
+  return base::MakeUnique<video_capture::ServiceImpl>();
+}
+
+}  // anonymous namespace
+
 namespace content {
 
 namespace {
@@ -43,6 +53,11 @@ UtilityServiceFactory::~UtilityServiceFactory() {}
 void UtilityServiceFactory::RegisterServices(ServiceMap* services) {
   GetContentClient()->utility()->RegisterServices(services);
 
+  ServiceInfo video_capture_info;
+  video_capture_info.factory = base::Bind(&CreateVideoCaptureService);
+  services->insert(
+      std::make_pair(video_capture::mojom::kServiceName, video_capture_info));
+
 #if BUILDFLAG(ENABLE_MOJO_MEDIA_IN_UTILITY_PROCESS)
   ServiceInfo info;
   info.factory = base::Bind(&media::CreateMediaService);