| 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 abd690b4ed8f9ad1bbf6d8bd23486fe761c4f76c..3c41a3c23bc8113fbabd1f0d6c01b7b768462f35 100644
|
| --- a/chrome/browser/plugins/plugin_info_message_filter.cc
|
| +++ b/chrome/browser/plugins/plugin_info_message_filter.cc
|
| @@ -66,13 +66,13 @@ bool ShouldUseJavaScriptSettingForPlugin(const WebPluginInfo& plugin) {
|
| return true;
|
| #endif
|
|
|
| -#if defined(WIDEVINE_CDM_AVAILABLE) && defined(ENABLE_PEPPER_CDMS)
|
| +#if defined(ENABLE_WIDEVINE_CDM) && defined(ENABLE_PEPPER_CDMS)
|
| // Treat CDM invocations like JavaScript.
|
| if (plugin.name == base::ASCIIToUTF16(kWidevineCdmDisplayName)) {
|
| DCHECK(plugin.type == WebPluginInfo::PLUGIN_TYPE_PEPPER_OUT_OF_PROCESS);
|
| return true;
|
| }
|
| -#endif // defined(WIDEVINE_CDM_AVAILABLE) && defined(ENABLE_PEPPER_CDMS)
|
| +#endif // defined(ENABLE_WIDEVINE_CDM) && defined(ENABLE_PEPPER_CDMS)
|
|
|
| return false;
|
| }
|
| @@ -88,14 +88,14 @@ enum PluginAvailabilityStatusForUMA {
|
|
|
| static void SendPluginAvailabilityUMA(const std::string& mime_type,
|
| PluginAvailabilityStatusForUMA status) {
|
| -#if defined(WIDEVINE_CDM_AVAILABLE)
|
| +#if defined(ENABLE_WIDEVINE_CDM)
|
| // Only report results for Widevine CDM.
|
| if (mime_type != kWidevineCdmPluginMimeType)
|
| return;
|
|
|
| UMA_HISTOGRAM_ENUMERATION("Plugin.AvailabilityStatus.WidevineCdm",
|
| status, PLUGIN_AVAILABILITY_STATUS_MAX);
|
| -#endif // defined(WIDEVINE_CDM_AVAILABLE)
|
| +#endif // defined(ENABLE_WIDEVINE_CDM)
|
| }
|
|
|
| #endif // defined(ENABLE_PEPPER_CDMS)
|
|
|