Index: content/utility/utility_service_factory.cc |
diff --git a/content/utility/utility_service_factory.cc b/content/utility/utility_service_factory.cc |
index 894bdbe02d16c186c805d2bb77c5a6578a67d813..2f95ab61a62d1c9a09d73429b3935e218d85ed29 100644 |
--- a/content/utility/utility_service_factory.cc |
+++ b/content/utility/utility_service_factory.cc |
@@ -14,6 +14,7 @@ |
#include "content/public/utility/content_utility_client.h" |
#include "content/public/utility/utility_thread.h" |
#include "content/utility/utility_thread_impl.h" |
+#include "media/mojo/features.h" |
#include "services/data_decoder/data_decoder_service.h" |
#include "services/data_decoder/public/interfaces/constants.mojom.h" |
#include "services/shape_detection/public/interfaces/constants.mojom.h" |
@@ -21,7 +22,7 @@ |
#include "services/video_capture/public/interfaces/constants.mojom.h" |
#include "services/video_capture/service_impl.h" |
-#if defined(ENABLE_MOJO_MEDIA_IN_UTILITY_PROCESS) |
+#if BUILDFLAG(ENABLE_MOJO_MEDIA_IN_UTILITY_PROCESS) |
#include "media/mojo/services/media_service_factory.h" // nogncheck |
#endif |
@@ -57,11 +58,12 @@ void UtilityServiceFactory::RegisterServices(ServiceMap* services) { |
services->insert( |
std::make_pair(video_capture::mojom::kServiceName, video_capture_info)); |
-#if defined(ENABLE_MOJO_MEDIA_IN_UTILITY_PROCESS) |
+#if BUILDFLAG(ENABLE_MOJO_MEDIA_IN_UTILITY_PROCESS) |
ServiceInfo info; |
info.factory = base::Bind(&media::CreateMediaService); |
services->insert(std::make_pair("media", info)); |
#endif |
+ |
ServiceInfo shape_detection_info; |
shape_detection_info.factory = |
base::Bind(&shape_detection::ShapeDetectionService::Create); |