Update External Clear Key related constants

One of them changed and now they are defined in clear_key_cdm_common.h.

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

2 files changed, 5 insertions, 14 deletions

diff --git a/src/core/content_client_qt.cpp b/src/core/content_client_qt.cpp
index 08db0920a..a18560283 100644
--- a/src/core/content_client_qt.cpp
+++ b/src/core/content_client_qt.cpp
@@ -355,31 +355,23 @@ void ContentClientQt::AddContentDecryptionModules(std::vector<content::CdmInfo>
         base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
         base::FilePath clear_key_cdm_path = command_line->GetSwitchValuePath(switches::kClearKeyCdmPathForTesting);
         if (!clear_key_cdm_path.empty() && base::PathExists(clear_key_cdm_path)) {
-            // TODO(crbug.com/764480): Remove these after we have a central place for
-            // External Clear Key (ECK) related information.
-            // Normal External Clear Key key system.
-            const char kExternalClearKeyKeySystem[] = "org.chromium.externalclearkey";
-            // A variant of ECK key system that has a different GUID.
-            const char kExternalClearKeyDifferentGuidTestKeySystem[] =
-                    "org.chromium.externalclearkey.differentguid";
-
             // Supported codecs are hard-coded in ExternalClearKeyProperties.
             media::CdmCapability capability(
                 {}, {}, {media::EncryptionScheme::kCenc, media::EncryptionScheme::kCbcs},
                 {media::CdmSessionType::kTemporary,
                  media::CdmSessionType::kPersistentLicense});
 
-            // Register kExternalClearKeyDifferentGuidTestKeySystem first separately.
+            // Register media::kExternalClearKeyDifferentCdmTypeTestKeySystem first separately.
             // Otherwise, it'll be treated as a sub-key-system of normal
             // kExternalClearKeyKeySystem. See MultipleCdmTypes test in
             // ECKEncryptedMediaTest.
-            cdms->push_back(content::CdmInfo(kExternalClearKeyDifferentGuidTestKeySystem,
+            cdms->push_back(content::CdmInfo(media::kExternalClearKeyDifferentCdmTypeTestKeySystem,
                                              Robustness::kSoftwareSecure, capability,
                                              /*supports_sub_key_systems=*/false, media::kClearKeyCdmDisplayName,
                                              media::kClearKeyCdmDifferentCdmType, base::Version("0.1.0.0"),
                                              clear_key_cdm_path));
 
-            cdms->push_back(content::CdmInfo(kExternalClearKeyKeySystem,
+            cdms->push_back(content::CdmInfo(media::kExternalClearKeyKeySystem,
                                              Robustness::kSoftwareSecure, capability,
                                              /*supports_sub_key_systems=*/true, media::kClearKeyCdmDisplayName,
                                              media::kClearKeyCdmType, base::Version("0.1.0.0"),
diff --git a/src/core/renderer/content_renderer_client_qt.cpp b/src/core/renderer/content_renderer_client_qt.cpp
index 6b3df4a27..cc127e55f 100644
--- a/src/core/renderer/content_renderer_client_qt.cpp
+++ b/src/core/renderer/content_renderer_client_qt.cpp
@@ -76,6 +76,7 @@
 #include "content/public/renderer/key_system_support.h"
 #include "media/base/media_switches.h"
 #include "media/base/video_codecs.h"
+#include "media/cdm/clear_key_cdm_common.h"
 #include "third_party/widevine/cdm/buildflags.h"
 #if BUILDFLAG(ENABLE_WIDEVINE)
 #include "third_party/widevine/cdm/widevine_cdm_common.h"
@@ -472,8 +473,6 @@ void ContentRendererClientQt::GetInterface(const std::string &interface_name, mo
 // found in the LICENSE.Chromium file.
 
 #if BUILDFLAG(ENABLE_LIBRARY_CDMS)
-static const char kExternalClearKeyKeySystem[] = "org.chromium.externalclearkey";
-
 // External Clear Key (used for testing).
 static void AddExternalClearKey(const media::mojom::KeySystemCapabilityPtr &capability,
                                 media::KeySystemInfos* key_systems)
@@ -669,7 +668,7 @@ void OnKeySystemSupportUpdated(media::GetSupportedKeySystemsCB cb,
         }
 #endif // BUILDFLAG(ENABLE_WIDEVINE)
 
-        if (key_system == kExternalClearKeyKeySystem) {
+        if (key_system == media::kExternalClearKeyKeySystem) {
             AddExternalClearKey(capability, &key_systems);
             continue;
         }