BASELINE: Update Chromium to 80.0.3987.136

Change-Id: I98e1649aafae85ba3a83e67af00bb27ef301db7b
Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>

5 files changed, 18 insertions, 18 deletions

diff --git a/chromium/components/cdm/renderer/android_key_systems.cc b/chromium/components/cdm/renderer/android_key_systems.cc
index ccfcca05ac7..4065088b3ea 100644
--- a/chromium/components/cdm/renderer/android_key_systems.cc
+++ b/chromium/components/cdm/renderer/android_key_systems.cc
@@ -61,8 +61,8 @@ class AndroidPlatformKeySystemProperties : public KeySystemProperties {
   }
 
   EmeConfigRule GetEncryptionSchemeConfigRule(
-      media::EncryptionMode encryption_scheme) const override {
-    return encryption_scheme == media::EncryptionMode::kCenc
+      media::EncryptionScheme encryption_scheme) const override {
+    return encryption_scheme == media::EncryptionScheme::kCenc
                ? EmeConfigRule::SUPPORTED
                : EmeConfigRule::NOT_SUPPORTED;
   }
@@ -140,10 +140,10 @@ void AddAndroidWidevine(
   if (codecs != media::EME_CODEC_NONE) {
     DVLOG(3) << __func__ << " Widevine supported.";
 
-    base::flat_set<media::EncryptionMode> encryption_schemes = {
-        media::EncryptionMode::kCenc};
+    base::flat_set<media::EncryptionScheme> encryption_schemes = {
+        media::EncryptionScheme::kCenc};
     if (response.is_cbcs_encryption_supported) {
-      encryption_schemes.insert(media::EncryptionMode::kCbcs);
+      encryption_schemes.insert(media::EncryptionScheme::kCbcs);
     }
 
     concrete_key_systems->emplace_back(new WidevineKeySystemProperties(
diff --git a/chromium/components/cdm/renderer/external_clear_key_key_system_properties.cc b/chromium/components/cdm/renderer/external_clear_key_key_system_properties.cc
index 3a387196e50..0998dd54949 100644
--- a/chromium/components/cdm/renderer/external_clear_key_key_system_properties.cc
+++ b/chromium/components/cdm/renderer/external_clear_key_key_system_properties.cc
@@ -35,12 +35,12 @@ bool ExternalClearKeyProperties::IsSupportedInitDataType(
 }
 
 media::EmeConfigRule ExternalClearKeyProperties::GetEncryptionSchemeConfigRule(
-    media::EncryptionMode encryption_scheme) const {
+    media::EncryptionScheme encryption_scheme) const {
   switch (encryption_scheme) {
-    case media::EncryptionMode::kCenc:
-    case media::EncryptionMode::kCbcs:
+    case media::EncryptionScheme::kCenc:
+    case media::EncryptionScheme::kCbcs:
       return media::EmeConfigRule::SUPPORTED;
-    case media::EncryptionMode::kUnencrypted:
+    case media::EncryptionScheme::kUnencrypted:
       break;
   }
   NOTREACHED();
diff --git a/chromium/components/cdm/renderer/external_clear_key_key_system_properties.h b/chromium/components/cdm/renderer/external_clear_key_key_system_properties.h
index 6fe015f97f7..4e6389cad15 100644
--- a/chromium/components/cdm/renderer/external_clear_key_key_system_properties.h
+++ b/chromium/components/cdm/renderer/external_clear_key_key_system_properties.h
@@ -23,7 +23,7 @@ class ExternalClearKeyProperties : public media::KeySystemProperties {
   bool IsSupportedInitDataType(
       media::EmeInitDataType init_data_type) const override;
   media::EmeConfigRule GetEncryptionSchemeConfigRule(
-      media::EncryptionMode encryption_scheme) const override;
+      media::EncryptionScheme encryption_scheme) const override;
   media::SupportedCodecs GetSupportedCodecs() const override;
   media::EmeConfigRule GetRobustnessConfigRule(
       media::EmeMediaType media_type,
diff --git a/chromium/components/cdm/renderer/widevine_key_system_properties.cc b/chromium/components/cdm/renderer/widevine_key_system_properties.cc
index f316475cecf..553ac49258b 100644
--- a/chromium/components/cdm/renderer/widevine_key_system_properties.cc
+++ b/chromium/components/cdm/renderer/widevine_key_system_properties.cc
@@ -44,9 +44,9 @@ Robustness ConvertRobustness(const std::string& robustness) {
 
 WidevineKeySystemProperties::WidevineKeySystemProperties(
     media::SupportedCodecs codecs,
-    base::flat_set<media::EncryptionMode> encryption_schemes,
+    base::flat_set<media::EncryptionScheme> encryption_schemes,
     media::SupportedCodecs hw_secure_codecs,
-    base::flat_set<media::EncryptionMode> hw_secure_encryption_schemes,
+    base::flat_set<media::EncryptionScheme> hw_secure_encryption_schemes,
     Robustness max_audio_robustness,
     Robustness max_video_robustness,
     media::EmeSessionTypeSupport persistent_license_support,
@@ -84,7 +84,7 @@ bool WidevineKeySystemProperties::IsSupportedInitDataType(
 }
 
 EmeConfigRule WidevineKeySystemProperties::GetEncryptionSchemeConfigRule(
-    media::EncryptionMode encryption_scheme) const {
+    media::EncryptionScheme encryption_scheme) const {
   bool is_supported = encryption_schemes_.count(encryption_scheme);
   bool is_hw_secure_supported =
       hw_secure_encryption_schemes_.count(encryption_scheme);
diff --git a/chromium/components/cdm/renderer/widevine_key_system_properties.h b/chromium/components/cdm/renderer/widevine_key_system_properties.h
index fa5163896b8..cc29ee95c38 100644
--- a/chromium/components/cdm/renderer/widevine_key_system_properties.h
+++ b/chromium/components/cdm/renderer/widevine_key_system_properties.h
@@ -30,9 +30,9 @@ class WidevineKeySystemProperties : public media::KeySystemProperties {
 
   WidevineKeySystemProperties(
       media::SupportedCodecs codecs,
-      base::flat_set<media::EncryptionMode> encryption_schemes,
+      base::flat_set<media::EncryptionScheme> encryption_schemes,
       media::SupportedCodecs hw_secure_codecs,
-      base::flat_set<media::EncryptionMode> hw_secure_encryption_schemes,
+      base::flat_set<media::EncryptionScheme> hw_secure_encryption_schemes,
       Robustness max_audio_robustness,
       Robustness max_video_robustness,
       media::EmeSessionTypeSupport persistent_license_support,
@@ -45,7 +45,7 @@ class WidevineKeySystemProperties : public media::KeySystemProperties {
   bool IsSupportedInitDataType(
       media::EmeInitDataType init_data_type) const override;
   media::EmeConfigRule GetEncryptionSchemeConfigRule(
-      media::EncryptionMode encryption_scheme) const override;
+      media::EncryptionScheme encryption_scheme) const override;
   media::SupportedCodecs GetSupportedCodecs() const override;
   media::SupportedCodecs GetSupportedHwSecureCodecs() const override;
   media::EmeConfigRule GetRobustnessConfigRule(
@@ -60,9 +60,9 @@ class WidevineKeySystemProperties : public media::KeySystemProperties {
 
  private:
   const media::SupportedCodecs codecs_;
-  const base::flat_set<media::EncryptionMode> encryption_schemes_;
+  const base::flat_set<media::EncryptionScheme> encryption_schemes_;
   const media::SupportedCodecs hw_secure_codecs_;
-  const base::flat_set<media::EncryptionMode> hw_secure_encryption_schemes_;
+  const base::flat_set<media::EncryptionScheme> hw_secure_encryption_schemes_;
   const Robustness max_audio_robustness_;
   const Robustness max_video_robustness_;
   const media::EmeSessionTypeSupport persistent_license_support_;