Update to Chromium version 92.0.4515.0 (#885287)

This commit is contained in:
Marshall Greenblatt
2021-06-03 21:34:56 -04:00
parent f2f52c1e2c
commit 00dca9601e
190 changed files with 1234 additions and 1309 deletions

View File

@@ -104,7 +104,7 @@ const char kCdmSupportedEncryptionSchemeCbcs[] = "cbcs";
struct CdmInfoArgs {
base::FilePath path;
std::string version;
content::CdmCapability capability;
media::CdmCapability capability;
};
std::unique_ptr<base::DictionaryValue> ParseManifestFile(
@@ -389,10 +389,11 @@ void DeliverWidevineCdmCallback(cef_cdm_registration_error_t result,
}
content::CdmInfo MakeCdmInfo(const CdmInfoArgs& args) {
return content::CdmInfo(kWidevineCdmDisplayName, kWidevineCdmGuid,
base::Version(args.version), args.path,
kWidevineCdmFileSystemId, args.capability,
kWidevineKeySystem, false);
return content::CdmInfo(
kWidevineKeySystem, content::CdmInfo::Robustness::kSoftwareSecure,
std::move(args.capability), /*supports_sub_key_systems=*/false,
kWidevineCdmDisplayName, kWidevineCdmGuid, base::Version(args.version),
args.path, kWidevineCdmFileSystemId);
}
void RegisterWidevineCdmOnUIThread(std::unique_ptr<CdmInfoArgs> args,