| 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 71f4b14794af7f85597f6364d56b33959a4a4904..13effc0208b272cbc3745db591d78f846f16b4b0 100644
|
| --- a/chrome/browser/plugins/plugin_info_message_filter.cc
|
| +++ b/chrome/browser/plugins/plugin_info_message_filter.cc
|
| @@ -62,13 +62,13 @@ bool ShouldUseJavaScriptSettingForPlugin(const WebPluginInfo& plugin) {
|
| return true;
|
| #endif
|
|
|
| -#if defined(WIDEVINE_CDM_AVAILABLE) && defined(ENABLE_PEPPER_CDMS)
|
| +#if defined(ENABLE_WIDEVINE) && 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) && defined(ENABLE_PEPPER_CDMS)
|
|
|
| return false;
|
| }
|
| @@ -84,14 +84,14 @@ enum PluginAvailabilityStatusForUMA {
|
|
|
| static void SendPluginAvailabilityUMA(const std::string& mime_type,
|
| PluginAvailabilityStatusForUMA status) {
|
| -#if defined(WIDEVINE_CDM_AVAILABLE)
|
| +#if defined(ENABLE_WIDEVINE)
|
| // 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)
|
| }
|
|
|
| #endif // defined(ENABLE_PEPPER_CDMS)
|
|
|