Clear Key CDM should resolve the promise if session not found

chrome/browser/media/encrypted_media_browsertest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/win/windows_version.h"
 #include "chrome/browser/media/media_browsertest.h"
@@ skipping 49 matching lines @@
 
 // Sessions to load.
 const char kNoSessionToLoad[] = "";
 const char kLoadableSession[] = "LoadableSession";
 const char kUnknownSession[] = "UnknownSession";
 
 // EME-specific test results and errors.
 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";
 const char kEmeMessageUnexpectedType[] = "EME_MESSAGE_UNEXPECTED_TYPE";
 const char kPrefixedEmeRenewalMissingHeader[] =
     "PREFIXED_EME_RENEWAL_MISSING_HEADER";
 const char kPrefixedEmeErrorEvent[] = "PREFIXED_EME_ERROR_EVENT";
 
 const char kDefaultEmePlayer[] = "eme_player.html";
 
@@ skipping 156 matching lines @@
 
  protected:
   scoped_ptr<TestLicenseServer> license_server_;
 
   // We want to fail quickly when a test fails because an error is encountered.
   void AddWaitForTitles(content::TitleWatcher* title_watcher) override {
     MediaBrowserTest::AddWaitForTitles(title_watcher);
     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));
     title_watcher->AlsoWaitForTitle(
         base::ASCIIToUTF16(kEmeMessageUnexpectedType));
     title_watcher->AlsoWaitForTitle(
         base::ASCIIToUTF16(kPrefixedEmeRenewalMissingHeader));
     title_watcher->AlsoWaitForTitle(base::ASCIIToUTF16(kPrefixedEmeErrorEvent));
   }
 
@@ skipping 443 matching lines @@
 IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, FileIOTest) {
   TestNonPlaybackCases(kExternalClearKeyFileIOTestKeySystem,
                        kFileIOTestSuccess);
 }
 
 IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, LoadLoadableSession) {
   TestPlaybackCase(kLoadableSession, kEnded);
 }
 
 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) {
   TestNonPlaybackCases(kExternalClearKeyInitializeFailKeySystem,
                        kPrefixedEmeErrorEvent);
 }
 
 // When CDM crashes, we should still get a decode error.
 // crbug.com/386657
 IN_PROC_BROWSER_TEST_F(ECKPrefixedEncryptedMediaTest,
@@ skipping 18 matching lines @@
 }
 
 IN_PROC_BROWSER_TEST_F(ECKPrefixedEncryptedMediaTest, LoadLoadableSession) {
   TestPlaybackCase(kLoadableSession, kEnded);
 }
 
 IN_PROC_BROWSER_TEST_F(ECKPrefixedEncryptedMediaTest, LoadUnknownSession) {
   TestPlaybackCase(kUnknownSession, kPrefixedEmeErrorEvent);
 }
 #endif  // defined(ENABLE_PEPPER_CDMS)