| Index: chrome/browser/plugins/plugin_info_message_filter.cc
|
| diff --git a/chrome/browser/plugins/plugin_info_message_filter.cc b/chrome/browser/plugins/plugin_info_message_filter.cc
|
| index 31817cd8b907a06960a2d7f3716a976d66dc3e22..2409c5912cbeacd1cf377ee04a2e8fe3713a2e91 100644
|
| --- a/chrome/browser/plugins/plugin_info_message_filter.cc
|
| +++ b/chrome/browser/plugins/plugin_info_message_filter.cc
|
| @@ -41,6 +41,7 @@
|
| #include "content/public/browser/plugin_service_filter.h"
|
| #include "content/public/common/content_constants.h"
|
| #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
|
| +#include "ppapi/features/features.h"
|
| #include "url/gurl.h"
|
| #include "url/origin.h"
|
| #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR.
|
| @@ -63,7 +64,7 @@ using content::WebPluginInfo;
|
|
|
| namespace {
|
|
|
| -#if defined(ENABLE_PEPPER_CDMS)
|
| +#if BUILDFLAG(ENABLE_PEPPER_CDMS)
|
|
|
| enum PluginAvailabilityStatusForUMA {
|
| PLUGIN_NOT_REGISTERED,
|
| @@ -84,7 +85,7 @@ static void SendPluginAvailabilityUMA(const std::string& mime_type,
|
| #endif // defined(WIDEVINE_CDM_AVAILABLE)
|
| }
|
|
|
| -#endif // defined(ENABLE_PEPPER_CDMS)
|
| +#endif // BUILDFLAG(ENABLE_PEPPER_CDMS)
|
|
|
| // Report usage metrics for Silverlight and Flash plugin instantiations to the
|
| // RAPPOR service.
|
| @@ -187,7 +188,7 @@ bool PluginInfoMessageFilter::OnMessageReceived(const IPC::Message& message) {
|
| IPC_BEGIN_MESSAGE_MAP(PluginInfoMessageFilter, message)
|
| IPC_MESSAGE_HANDLER_DELAY_REPLY(ChromeViewHostMsg_GetPluginInfo,
|
| OnGetPluginInfo)
|
| -#if defined(ENABLE_PEPPER_CDMS)
|
| +#if BUILDFLAG(ENABLE_PEPPER_CDMS)
|
| IPC_MESSAGE_HANDLER(
|
| ChromeViewHostMsg_IsInternalPluginAvailableForMimeType,
|
| OnIsInternalPluginAvailableForMimeType)
|
| @@ -261,7 +262,7 @@ void PluginInfoMessageFilter::PluginsLoaded(
|
| }
|
| }
|
|
|
| -#if defined(ENABLE_PEPPER_CDMS)
|
| +#if BUILDFLAG(ENABLE_PEPPER_CDMS)
|
|
|
| void PluginInfoMessageFilter::OnIsInternalPluginAvailableForMimeType(
|
| const std::string& mime_type,
|
| @@ -297,7 +298,7 @@ void PluginInfoMessageFilter::OnIsInternalPluginAvailableForMimeType(
|
| mime_type, is_plugin_disabled ? PLUGIN_DISABLED : PLUGIN_NOT_REGISTERED);
|
| }
|
|
|
| -#endif // defined(ENABLE_PEPPER_CDMS)
|
| +#endif // BUILDFLAG(ENABLE_PEPPER_CDMS)
|
|
|
| void PluginInfoMessageFilter::Context::DecidePluginStatus(
|
| const GetPluginInfo_Params& params,
|
|
|