|
 |
4bca8d3 |
diff -up chromium-52.0.2743.82/chrome/common/chrome_content_client.cc.widevinefix chromium-52.0.2743.82/chrome/common/chrome_content_client.cc
|
|
|
4bca8d3 |
--- chromium-52.0.2743.82/chrome/common/chrome_content_client.cc.widevinefix 2016-07-22 12:18:49.505235856 -0400
|
|
|
4bca8d3 |
+++ chromium-52.0.2743.82/chrome/common/chrome_content_client.cc 2016-07-22 12:20:04.200789682 -0400
|
|
|
4bca8d3 |
@@ -203,10 +203,7 @@ void ComputeBuiltInPlugins(std::vector
|
|
|
4bca8d3 |
widevine_cdm.is_out_of_process = true;
|
|
|
4bca8d3 |
widevine_cdm.path = adapter_path;
|
|
|
4bca8d3 |
widevine_cdm.name = kWidevineCdmDisplayName;
|
|
|
4bca8d3 |
- widevine_cdm.description =
|
|
|
4bca8d3 |
- base::StringPrintf("%s (version: " WIDEVINE_CDM_VERSION_STRING ")",
|
|
|
4bca8d3 |
- kWidevineCdmDescription);
|
|
|
4bca8d3 |
- widevine_cdm.version = WIDEVINE_CDM_VERSION_STRING;
|
|
|
4bca8d3 |
+ widevine_cdm.description = kWidevineCdmDescription;
|
|
|
4bca8d3 |
content::WebPluginMimeType widevine_cdm_mime_type(
|
|
|
4bca8d3 |
kWidevineCdmPluginMimeType, kWidevineCdmPluginExtension,
|
|
|
4bca8d3 |
kWidevineCdmPluginMimeTypeDescription);
|
|
|
4bca8d3 |
@@ -555,8 +552,7 @@ void ChromeContentClient::AddContentDecr
|
|
|
4bca8d3 |
// CdmInfo needs |path| to be the actual Widevine library,
|
|
|
4bca8d3 |
// not the adapter, so adjust as necessary. It will be in the
|
|
|
4bca8d3 |
// same directory as the installed adapter.
|
|
|
4bca8d3 |
- const base::Version version(WIDEVINE_CDM_VERSION_STRING);
|
|
|
4bca8d3 |
- DCHECK(version.IsValid());
|
|
|
4bca8d3 |
+ const base::Version version;
|
|
|
4bca8d3 |
cdms->push_back(content::CdmInfo(kWidevineCdmType, version, cdm_path,
|
|
|
4bca8d3 |
codecs_supported));
|
|
|
4bca8d3 |
}
|