| Index: chrome/browser/chrome_content_browser_client.cc
|
| diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
|
| index 26ef33ca8937daf2b118d89a856999b3ede84329..24ad9142aa438cfe43d6938dd7cf647579802cea 100644
|
| --- a/chrome/browser/chrome_content_browser_client.cc
|
| +++ b/chrome/browser/chrome_content_browser_client.cc
|
| @@ -193,6 +193,7 @@
|
| #include "gpu/config/gpu_switches.h"
|
| #include "media/audio/audio_manager.h"
|
| #include "media/media_features.h"
|
| +#include "media/mojo/features.h"
|
| #include "net/base/mime_util.h"
|
| #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
|
| #include "net/cookies/canonical_cookie.h"
|
| @@ -382,14 +383,14 @@
|
| #include "chrome/browser/chrome_browser_main_extra_parts_exo.h"
|
| #endif
|
|
|
| -#if defined(ENABLE_MOJO_MEDIA)
|
| +#if BUILDFLAG(ENABLE_MOJO_MEDIA)
|
| #include "chrome/browser/media/output_protection_impl.h"
|
| -#if defined(ENABLE_MOJO_CDM) && defined(OS_ANDROID)
|
| +#if BUILDFLAG(ENABLE_MOJO_CDM) && defined(OS_ANDROID)
|
| #include "chrome/browser/media/android/cdm/media_drm_storage_factory.h"
|
| #endif
|
| #endif
|
|
|
| -#if defined(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS)
|
| +#if BUILDFLAG(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS)
|
| #include "media/mojo/services/media_service_factory.h" // nogncheck
|
| #endif
|
|
|
| @@ -3150,14 +3151,14 @@ void ChromeContentBrowserClient::ExposeInterfacesToMediaService(
|
| render_frame_host));
|
| #endif // defined(OS_CHROMEOS)
|
|
|
| -#if defined(ENABLE_MOJO_MEDIA)
|
| +#if BUILDFLAG(ENABLE_MOJO_MEDIA)
|
| registry->AddInterface(
|
| base::Bind(&OutputProtectionImpl::Create, render_frame_host));
|
| -#if defined(ENABLE_MOJO_CDM) && defined(OS_ANDROID)
|
| +#if BUILDFLAG(ENABLE_MOJO_CDM) && defined(OS_ANDROID)
|
| registry->AddInterface(
|
| base::Bind(&chrome::CreateMediaDrmStorage, render_frame_host));
|
| #endif
|
| -#endif // defined(ENABLE_MOJO_MEDIA)
|
| +#endif // BUILDFLAG(ENABLE_MOJO_MEDIA)
|
| }
|
|
|
| void ChromeContentBrowserClient::ExposeInterfacesToFrame(
|
| @@ -3248,7 +3249,7 @@ void ChromeContentBrowserClient::BindInterfaceRequest(
|
|
|
| void ChromeContentBrowserClient::RegisterInProcessServices(
|
| StaticServiceMap* services) {
|
| -#if defined(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS)
|
| +#if BUILDFLAG(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS)
|
| content::ServiceInfo info;
|
| info.factory = base::Bind(&media::CreateMediaService);
|
| services->insert(std::make_pair("media", info));
|
| @@ -3283,7 +3284,7 @@ void ChromeContentBrowserClient::RegisterInProcessServices(
|
|
|
| void ChromeContentBrowserClient::RegisterOutOfProcessServices(
|
| OutOfProcessServiceMap* services) {
|
| -#if defined(ENABLE_MOJO_MEDIA_IN_UTILITY_PROCESS)
|
| +#if BUILDFLAG(ENABLE_MOJO_MEDIA_IN_UTILITY_PROCESS)
|
| services->insert(std::make_pair("media",
|
| base::ASCIIToUTF16("Media Service")));
|
| #endif
|
|
|