Commit ff96ea58 authored by tommycli's avatar tommycli Committed by Commit bot

[HBD] Fix Widevine breakage introduced by prior patch

Breakage introduced by prior patch here:
https://codereview.chromium.org/2208463002

We had split off GetPluginContentSetting into a utils file, but
forgot to add the widevine header file include.

This means that WIDEVINE_CDM_AVAILABLE is never defined, and the
Widevine-treated-as-JavaScript for content settings clause is
never activated, breaking Widevine on Corp machines.

BUG=641706

Review-Url: https://codereview.chromium.org/2295563002
Cr-Commit-Position: refs/heads/master@{#415339}
parent bc337a09
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
#include "base/values.h" #include "base/values.h"
#include "components/content_settings/core/browser/host_content_settings_map.h" #include "components/content_settings/core/browser/host_content_settings_map.h"
#include "content/public/common/webplugininfo.h" #include "content/public/common/webplugininfo.h"
#include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR.
#if !defined(DISABLE_NACL) #if !defined(DISABLE_NACL)
#include "components/nacl/common/nacl_constants.h" #include "components/nacl/common/nacl_constants.h"
...@@ -32,7 +33,8 @@ bool ShouldUseJavaScriptSettingForPlugin(const content::WebPluginInfo& plugin) { ...@@ -32,7 +33,8 @@ bool ShouldUseJavaScriptSettingForPlugin(const content::WebPluginInfo& plugin) {
#if defined(WIDEVINE_CDM_AVAILABLE) && defined(ENABLE_PEPPER_CDMS) #if defined(WIDEVINE_CDM_AVAILABLE) && defined(ENABLE_PEPPER_CDMS)
// Treat CDM invocations like JavaScript. // Treat CDM invocations like JavaScript.
if (plugin.name == base::ASCIIToUTF16(kWidevineCdmDisplayName)) { if (plugin.name == base::ASCIIToUTF16(kWidevineCdmDisplayName)) {
DCHECK_EQ(WebPluginInfo::PLUGIN_TYPE_PEPPER_OUT_OF_PROCESS, plugin.type); DCHECK_EQ(content::WebPluginInfo::PLUGIN_TYPE_PEPPER_OUT_OF_PROCESS,
plugin.type);
return true; return true;
} }
#endif // defined(WIDEVINE_CDM_AVAILABLE) && defined(ENABLE_PEPPER_CDMS) #endif // defined(WIDEVINE_CDM_AVAILABLE) && defined(ENABLE_PEPPER_CDMS)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment