| Index: chrome/browser/media/encrypted_media_browsertest.cc
|
| diff --git a/chrome/browser/media/encrypted_media_browsertest.cc b/chrome/browser/media/encrypted_media_browsertest.cc
|
| index 4b197757f7165c0702fbe1fbb525186dd3f2fc67..42c8e9dcf246d8b44ac2e63975c0f7c213b4b3bb 100644
|
| --- a/chrome/browser/media/encrypted_media_browsertest.cc
|
| +++ b/chrome/browser/media/encrypted_media_browsertest.cc
|
| @@ -40,6 +40,8 @@ const char kExternalClearKeyKeySystem[] = "org.chromium.externalclearkey";
|
| // - media/test/data/eme_player_js/globals.js
|
| // - AddExternalClearKey() in chrome_key_systems.cc
|
| // - CreateCdmInstance() in clear_key_cdm.cc
|
| +const char kExternalClearKeyRenewalKeySystem[] =
|
| + "org.chromium.externalclearkey.renewal";
|
| const char kExternalClearKeyFileIOTestKeySystem[] =
|
| "org.chromium.externalclearkey.fileiotest";
|
| const char kExternalClearKeyInitializeFailKeySystem[] =
|
| @@ -292,12 +294,12 @@ class ECKEncryptedMediaTest : public EncryptedMediaTestBase {
|
| false, PlayTwice::NO, expected_title);
|
| }
|
|
|
| - void TestPlaybackCase(const std::string& session_to_load,
|
| + void TestPlaybackCase(const std::string& key_system,
|
| + const std::string& session_to_load,
|
| const std::string& expected_title) {
|
| RunEncryptedMediaTest(kDefaultEmePlayer, "bear-320x240-v_enc-v.webm",
|
| - kWebMVideoOnly, kExternalClearKeyKeySystem, SRC,
|
| - session_to_load, false, PlayTwice::NO,
|
| - expected_title);
|
| + kWebMVideoOnly, key_system, SRC, session_to_load,
|
| + false, PlayTwice::NO, expected_title);
|
| }
|
|
|
| protected:
|
| @@ -643,12 +645,17 @@ IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, OutputProtectionTest) {
|
| kUnitTestSuccess);
|
| }
|
|
|
| +IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, Renewal) {
|
| + TestPlaybackCase(kExternalClearKeyRenewalKeySystem, kNoSessionToLoad, kEnded);
|
| +}
|
| +
|
| IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, LoadLoadableSession) {
|
| - TestPlaybackCase(kLoadableSession, kEnded);
|
| + TestPlaybackCase(kExternalClearKeyKeySystem, kLoadableSession, kEnded);
|
| }
|
|
|
| IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, LoadUnknownSession) {
|
| - TestPlaybackCase(kUnknownSession, kEmeSessionNotFound);
|
| + TestPlaybackCase(kExternalClearKeyKeySystem, kUnknownSession,
|
| + kEmeSessionNotFound);
|
| }
|
|
|
| #endif // defined(ENABLE_PEPPER_CDMS)
|
|
|