From b8c7eff122326569ac1a5d4176ea9ca48eefa378 Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Mon, 12 Sep 2022 13:17:57 +0100 Subject: [PATCH] media::KeySystemProperties now KeySystemInfo Chromium change: https://chromium.googlesource.com/chromium/src/+/d2e5386def5cf7fa2d6fbaffb6cb4f4d32e28865 commit d2e5386def5cf7fa2d6fbaffb6cb4f4d32e28865 Author: Vikram Pasupathy Date: Fri Sep 2 17:32:25 2022 +0000 media: Rename KeySystemProperties to KeySystemInfo - file renaming This CL renames just the files *key_system_properties* to *key_system_info* as part of a greater effort to rename KeySystemProperties to KeySystemInfo. This renaming effort is due to KeySystemProperties being a plural noun, making it awkward and wordy to create vectors and maps. Replacing it with a singular noun was our (xhwang, jrummell, and vpasupathy) idea to simplify naming in Chromium. Bug: b/241047837 --- chromium_src/android_webview/renderer/aw_key_systems.cc | 2 +- chromium_src/chrome/renderer/DEPS | 2 +- chromium_src/chrome/renderer/media/chrome_key_systems.cc | 2 +- chromium_src/weblayer/renderer/DEPS | 2 +- chromium_src/weblayer/renderer/content_renderer_client_impl.cc | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/chromium_src/android_webview/renderer/aw_key_systems.cc b/chromium_src/android_webview/renderer/aw_key_systems.cc index f1c03ee5640..03d9501c0d1 100644 --- a/chromium_src/android_webview/renderer/aw_key_systems.cc +++ b/chromium_src/android_webview/renderer/aw_key_systems.cc @@ -6,7 +6,7 @@ #include #include -#include "media/base/key_system_properties.h" +#include "media/base/key_system_info.h" #include "third_party/widevine/cdm/buildflags.h" // In components/cdm/renderer/android_key_systems.h the declaration of diff --git a/chromium_src/chrome/renderer/DEPS b/chromium_src/chrome/renderer/DEPS index 608344ba300..eeff961a522 100644 --- a/chromium_src/chrome/renderer/DEPS +++ b/chromium_src/chrome/renderer/DEPS @@ -2,6 +2,6 @@ include_rules = [ "+brave/components/brave_shields/common", "+brave/components/content_settings/renderer", "+brave/renderer", - "+media/base/key_system_properties.h", + "+media/base/key_system_info.h", "+third_party/widevine/cdm/buildflags.h", ] diff --git a/chromium_src/chrome/renderer/media/chrome_key_systems.cc b/chromium_src/chrome/renderer/media/chrome_key_systems.cc index dd7077c688e..b2a95398721 100644 --- a/chromium_src/chrome/renderer/media/chrome_key_systems.cc +++ b/chromium_src/chrome/renderer/media/chrome_key_systems.cc @@ -6,7 +6,7 @@ #include #include "build/build_config.h" -#include "media/base/key_system_properties.h" +#include "media/base/key_system_info.h" #include "third_party/widevine/cdm/buildflags.h" #if BUILDFLAG(IS_ANDROID) && !BUILDFLAG(ENABLE_WIDEVINE) diff --git a/chromium_src/weblayer/renderer/DEPS b/chromium_src/weblayer/renderer/DEPS index 1bc86760712..87e63aa31d1 100644 --- a/chromium_src/weblayer/renderer/DEPS +++ b/chromium_src/weblayer/renderer/DEPS @@ -1,4 +1,4 @@ include_rules = [ - "+media/base/key_system_properties.h", + "+media/base/key_system_info.h", "+third_party/widevine/cdm/buildflags.h", ] diff --git a/chromium_src/weblayer/renderer/content_renderer_client_impl.cc b/chromium_src/weblayer/renderer/content_renderer_client_impl.cc index 790686e0e68..f21cd5914bb 100644 --- a/chromium_src/weblayer/renderer/content_renderer_client_impl.cc +++ b/chromium_src/weblayer/renderer/content_renderer_client_impl.cc @@ -6,7 +6,7 @@ #include #include -#include "media/base/key_system_properties.h" +#include "media/base/key_system_info.h" #include "third_party/widevine/cdm/buildflags.h" // In components/cdm/renderer/android_key_systems.h the declaration of