BASELINE: Update Chromium to 100.0.4896.167

Change-Id: I98cbeb5d7543d966ffe04d8cefded0c493a11333
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

4 files changed, 23 insertions, 26 deletions

diff --git a/chromium/third_party/widevine/cdm/BUILD.gn b/chromium/third_party/widevine/cdm/BUILD.gn
index 91bcefa2f06..be63a998f15 100644
--- a/chromium/third_party/widevine/cdm/BUILD.gn
+++ b/chromium/third_party/widevine/cdm/BUILD.gn
@@ -32,9 +32,6 @@ widevine_cdm_manifest_and_license_files = []
 # so we don't need to copy it in most cases.
 if (bundle_widevine_cdm) {
   widevine_arch = target_cpu
-  if (widevine_arch == "x86") {
-    widevine_arch = "ia32"
-  }
 
   widevine_cdm_root = "${widevine_root}/${target_os}/${widevine_arch}"
   cdm_file_name = "${shlib_prefix}widevinecdm${shlib_extension}"
@@ -52,11 +49,6 @@ if (bundle_widevine_cdm) {
   }
 }
 
-# For ChromeOS Ash build, the CDM is not component updated hence no manifest.
-if (is_chromeos_ash) {
-  widevine_cdm_manifest_and_license_files = []
-}
-
 copy("version_h") {
   visibility = [ ":*" ]  # Depend on ":headers" instead.
   sources = [ widevine_cdm_version_h_file ]
diff --git a/chromium/third_party/widevine/cdm/DEPS b/chromium/third_party/widevine/cdm/DEPS
index 0d6a1d5785b..12390aebca0 100644
--- a/chromium/third_party/widevine/cdm/DEPS
+++ b/chromium/third_party/widevine/cdm/DEPS
@@ -1,4 +1,5 @@
 include_rules = [
   "+base/token.h",
   "+build/build_config.h",
+  "+media/cdm/cdm_type.h"
 ]
diff --git a/chromium/third_party/widevine/cdm/widevine.gni b/chromium/third_party/widevine/cdm/widevine.gni
index 1a833ae5758..8c2d16bd54c 100644
--- a/chromium/third_party/widevine/cdm/widevine.gni
+++ b/chromium/third_party/widevine/cdm/widevine.gni
@@ -24,9 +24,8 @@ if (is_chromeos && !is_chromeos_device) {
 # architectures. Notably on Android library CDM is not used and Widevine is
 # supported via Android MediaDrm API.
 library_widevine_cdm_available =
-    (is_chromeos_ash && (target_cpu == "x64" || target_cpu == "arm")) ||
-    ((target_os == "linux" || is_chromeos_lacros) &&
-     (target_cpu == "x86" || target_cpu == "x64")) ||
+    (is_chromeos && (target_cpu == "x64" || target_cpu == "arm")) ||
+    (target_os == "linux" && target_cpu == "x64") ||
     (target_os == "mac" && (target_cpu == "x64" || target_cpu == "arm64")) ||
     (target_os == "win" && (target_cpu == "x86" || target_cpu == "x64"))
 
diff --git a/chromium/third_party/widevine/cdm/widevine_cdm_common.h b/chromium/third_party/widevine/cdm/widevine_cdm_common.h
index eacd2dcfb6c..c15f0925764 100644
--- a/chromium/third_party/widevine/cdm/widevine_cdm_common.h
+++ b/chromium/third_party/widevine/cdm/widevine_cdm_common.h
@@ -7,16 +7,17 @@
 
 #include "base/token.h"
 #include "build/build_config.h"
+#include "media/cdm/cdm_type.h"  // nogncheck
 
 // Default constants common to all Widevine CDMs.
 
 // "alpha" is a temporary name until a convention is defined.
 const char kWidevineKeySystem[] = "com.widevine.alpha";
 
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 // An sub key system of `kWidevineKeySystem` only used in experiments.
 const char kWidevineExperimentKeySystem[] = "com.widevine.alpha.experiment";
-#endif  // defined(OS_WIN)
+#endif  // BUILDFLAG(IS_WIN)
 
 // Widevine CDM files are in a directory with this name. This path is also
 // hardcoded in some build files and changing it requires changing the build
@@ -35,23 +36,27 @@ const char kWidevineCdmLibraryName[] = "widevinecdm";
 
 const char kWidevineCdmDisplayName[] = "Widevine Content Decryption Module";
 
-const base::Token kWidevineCdmType{0x05d908e5dcca9960ull,
-                                   0xcd92d30eac98157aull};
-
-// Identifier used by the PluginPrivateFileSystem to identify the files stored
-// for the Widevine CDM. This is used to store persistent files. As the files
-// were initially used by the CDM running as a pepper plugin, this ID is based
-// on the pepper plugin MIME type. Changing this will result in any existing
-// saved files becoming inaccessible.
-const char kWidevineCdmFileSystemId[] = "application_x-ppapi-widevine-cdm";
+// TODO(crbug.com/1231162): Remove the string identifier once we've migrated off
+// of the PluginPrivateFileSystem.
+// Identifier used for both CDM process site isolation and by the
+// PluginPrivateFileSystem to identify the files stored for the Widevine CDM.
+// This is used to store persistent files. As the files were initially used by
+// the CDM running as a pepper plugin, this ID is based on the pepper plugin
+// MIME type. Changing this will result in any existing saved files becoming
+// inaccessible.
+const media::CdmType kWidevineCdmType{
+    base::Token{0x05d908e5dcca9960ull, 0xcd92d30eac98157aull},
+    "application_x-ppapi-widevine-cdm"};
 
 // Constants specific to Windows MediaFoundation-based Widevine CDM library.
-#if defined(OS_WIN)
+#if BUILDFLAG(IS_WIN)
 const char kMediaFoundationWidevineCdmLibraryName[] = "Google.Widevine.CDM";
 const char kMediaFoundationWidevineCdmDisplayName[] =
     "Google Widevine Windows CDM";
-const base::Token kMediaFoundationWidevineCdmType{0x8e73dec793bf5adcull,
-                                                  0x27e572c9a1fd930eull};
-#endif  // defined(OS_WIN)
+// TODO(crbug.com/1231162): Remove the string identifier once we've migrated off
+// of the PluginPrivateFileSystem.
+const media::CdmType kMediaFoundationWidevineCdmType{
+    base::Token{0x8e73dec793bf5adcull, 0x27e572c9a1fd930eull}, ""};
+#endif  // BUILDFLAG(IS_WIN)
 
 #endif  // WIDEVINE_CDM_WIDEVINE_CDM_COMMON_H_