Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6300)

Unified Diff: chrome/browser/media/encrypted_media_browsertest.cc

Issue 1224053003: Clear Key CDM should resolve the promise if session not found (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: changes Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | media/cdm/ppapi/external_clear_key/clear_key_cdm.cc » ('j') | media/cdm/proxy_decryptor.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 ce901a7f8960d6915651723bad42195ac241e289..7ac65e7b6db09caa3be670b0fef8a02d85fe5b6c 100644
--- a/chrome/browser/media/encrypted_media_browsertest.cc
+++ b/chrome/browser/media/encrypted_media_browsertest.cc
@@ -67,6 +67,7 @@ const char kUnknownSession[] = "UnknownSession";
const char kFileIOTestSuccess[] = "FILE_IO_TEST_SUCCESS";
const char kEmeNotSupportedError[] = "NOTSUPPORTEDERROR";
const char kEmeGenerateRequestFailed[] = "EME_GENERATEREQUEST_FAILED";
+const char kEmeSessionNotFound[] = "EME_SESSION_NOT_FOUND";
const char kEmeLoadFailed[] = "EME_LOAD_FAILED";
const char kEmeUpdateFailed[] = "EME_UPDATE_FAILED";
const char kEmeErrorEvent[] = "EME_ERROR_EVENT";
@@ -243,6 +244,7 @@ class EncryptedMediaTestBase : public MediaBrowserTest {
title_watcher->AlsoWaitForTitle(base::ASCIIToUTF16(kEmeNotSupportedError));
title_watcher->AlsoWaitForTitle(
base::ASCIIToUTF16(kEmeGenerateRequestFailed));
+ title_watcher->AlsoWaitForTitle(base::ASCIIToUTF16(kEmeSessionNotFound));
title_watcher->AlsoWaitForTitle(base::ASCIIToUTF16(kEmeLoadFailed));
title_watcher->AlsoWaitForTitle(base::ASCIIToUTF16(kEmeUpdateFailed));
title_watcher->AlsoWaitForTitle(base::ASCIIToUTF16(kEmeErrorEvent));
@@ -706,9 +708,7 @@ IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, LoadLoadableSession) {
}
IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, LoadUnknownSession) {
- // TODO(jrummell): Load should not fail -- it should return false instead.
- // http://crbug.com/507736
- TestPlaybackCase(kUnknownSession, kEmeLoadFailed);
+ TestPlaybackCase(kUnknownSession, kEmeSessionNotFound);
}
IN_PROC_BROWSER_TEST_F(ECKPrefixedEncryptedMediaTest, InitializeCDMFail) {
« no previous file with comments | « no previous file | media/cdm/ppapi/external_clear_key/clear_key_cdm.cc » ('j') | media/cdm/proxy_decryptor.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698