--- chromium-71.0.3578.10/third_party/widevine/cdm/widevine_cdm_version.h.bak 2018-10-17 21:14:39.000000000 +0200 +++ chromium-71.0.3578.10/third_party/widevine/cdm/widevine_cdm_version.h 2018-10-19 22:44:05.559940108 +0200 @@ -2,14 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// This is a stand-in for a generated file that is available when the -// Widevine CDM is available. - #ifndef WIDEVINE_CDM_VERSION_H_ #define WIDEVINE_CDM_VERSION_H_ -// If the Widevine CDM is available define the following: -// - WIDEVINE_CDM_VERSION_STRING (with the version of the CDM that's available -// as a string, e.g., "1.0.123.456"). +#include "third_party/widevine/cdm/widevine_cdm_common.h" + +#define WIDEVINE_CDM_VERSION_STRING "unknown" +#define WIDEVINE_CDM_AVAILABLE #endif // WIDEVINE_CDM_VERSION_H_ --- a/chrome/common/chrome_content_client.cc +++ b/chrome/common/chrome_content_client.cc @@ -99,7 +99,7 @@ // Registers Widevine CDM if Widevine is enabled, the Widevine CDM is // bundled and not a component. When the Widevine CDM is a component, it is // registered in widevine_cdm_component_installer.cc. -#if BUILDFLAG(BUNDLE_WIDEVINE_CDM) && !BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT) +#if BUILDFLAG(ENABLE_WIDEVINE) && !BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT) #define REGISTER_BUNDLED_WIDEVINE_CDM #include "third_party/widevine/cdm/widevine_cdm_common.h" // nogncheck // TODO(crbug.com/663554): Needed for WIDEVINE_CDM_VERSION_STRING. Support