| 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) {
|
|
|