Commit 933cb840 authored by Alex St-Onge's avatar Alex St-Onge Committed by Commit Bot

Rename LoadableSession to PersistentLicense for ClearKeyCdm tests

Bug: 1091502
Change-Id: Ic6d77a89e54c8c0b7db729509005fcb9731584e9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2261395Reviewed-by: default avatarXiaohan Wang <xhwang@chromium.org>
Commit-Queue: Alex St-Onge <alstonge@chromium.org>
Cr-Commit-Position: refs/heads/master@{#781600}
parent f35f0efd
...@@ -78,7 +78,7 @@ const char kExternalClearKeyStorageIdTestKeySystem[] = ...@@ -78,7 +78,7 @@ const char kExternalClearKeyStorageIdTestKeySystem[] =
// Sessions to load. // Sessions to load.
const char kNoSessionToLoad[] = ""; const char kNoSessionToLoad[] = "";
#if BUILDFLAG(ENABLE_LIBRARY_CDMS) #if BUILDFLAG(ENABLE_LIBRARY_CDMS)
const char kLoadableSession[] = "LoadableSession"; const char kPersistentLicense[] = "PersistentLicense";
const char kUnknownSession[] = "UnknownSession"; const char kUnknownSession[] = "UnknownSession";
#endif #endif
...@@ -859,8 +859,9 @@ IN_PROC_BROWSER_TEST_P(ECKEncryptedMediaTest, MAYBE_MessageTypeTest) { ...@@ -859,8 +859,9 @@ IN_PROC_BROWSER_TEST_P(ECKEncryptedMediaTest, MAYBE_MessageTypeTest) {
EXPECT_EQ(3, num_received_message_types); EXPECT_EQ(3, num_received_message_types);
} }
IN_PROC_BROWSER_TEST_P(ECKEncryptedMediaTest, LoadLoadableSession) { IN_PROC_BROWSER_TEST_P(ECKEncryptedMediaTest, LoadPersistentLicense) {
TestPlaybackCase(kExternalClearKeyKeySystem, kLoadableSession, media::kEnded); TestPlaybackCase(kExternalClearKeyKeySystem, kPersistentLicense,
media::kEnded);
} }
IN_PROC_BROWSER_TEST_P(ECKEncryptedMediaTest, LoadUnknownSession) { IN_PROC_BROWSER_TEST_P(ECKEncryptedMediaTest, LoadUnknownSession) {
......
...@@ -148,11 +148,11 @@ PlayerUtils.registerEMEEventListeners = function(player) { ...@@ -148,11 +148,11 @@ PlayerUtils.registerEMEEventListeners = function(player) {
// As the tests run with a different origin every time, there is // As the tests run with a different origin every time, there is
// no way currently to create a session in one test and then load // no way currently to create a session in one test and then load
// it in a subsequent test (https://crbug.com/715349). // it in a subsequent test (https://crbug.com/715349).
// So if |sessionToLoad| is 'LoadableSession', create a session // So if |sessionToLoad| is 'PersistentLicense', create a session
// that can be loaded and use that session to load. Otherwise // that can be loaded and use that session to load. Otherwise
// use the name provided (which allows for testing load() on a // use the name provided (which allows for testing load() on a
// session which doesn't exist). // session which doesn't exist).
if (player.testConfig.sessionToLoad == 'LoadableSession') { if (player.testConfig.sessionToLoad == 'PersistentLicense') {
return Utils.createSessionToLoad( return Utils.createSessionToLoad(
mediaKeys, player.testConfig.sessionToLoad); mediaKeys, player.testConfig.sessionToLoad);
} else { } else {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment