Reland "Add unprefixed EME tests for LoadSession()"

media/cdm/ppapi/external_clear_key/clear_key_cdm.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 "media/cdm/ppapi/external_clear_key/clear_key_cdm.h"
 
 #include <algorithm>
 #include <cstring>
 #include <sstream>
 #include <string>
@@ skipping 682 matching lines @@
   host_->OnSessionMessage(web_session_id.data(),
                           web_session_id.length(),
                           reinterpret_cast<const char*>(message.data()),
                           message.size(),
                           destination_url.spec().data(),
                           destination_url.spec().size());
 }
 
 void ClearKeyCdm::OnSessionKeysChange(const std::string& web_session_id,
                                       bool has_additional_usable_key) {
+  // Ignore the message when we are waiting to update the loadable session.
+  if (web_session_id == session_id_for_emulated_loadsession_)
+    return;
+
   host_->OnSessionUsableKeysChange(web_session_id.data(),
                                    web_session_id.length(),
                                    has_additional_usable_key);
 }
 
 void ClearKeyCdm::OnSessionClosed(const std::string& web_session_id) {
   host_->OnSessionClosed(web_session_id.data(), web_session_id.length());
 }
 
 void ClearKeyCdm::OnSessionCreated(uint32 promise_id,
@@ skipping 29 matching lines @@
 
 void ClearKeyCdm::OnSessionUpdated(uint32 promise_id,
                                    const std::string& web_session_id) {
   // UpdateSession() may be called to finish loading sessions, so handle
   // appropriately.
   if (web_session_id == session_id_for_emulated_loadsession_) {
     session_id_for_emulated_loadsession_ = std::string();
     // |promise_id| is the LoadSession() promise, so resolve appropriately.
     host_->OnResolveNewSessionPromise(
         promise_id, kLoadableWebSessionId, strlen(kLoadableWebSessionId));
+    // Generate the UsableKeys event now that the session is "loaded".
+    host_->OnSessionUsableKeysChange(
+        kLoadableWebSessionId, strlen(kLoadableWebSessionId), true);
     return;
   }
 
   host_->OnResolvePromise(promise_id);
 }
 
 void ClearKeyCdm::OnUsableKeyIdsObtained(uint32 promise_id,
                                          const KeyIdsVector& key_ids) {
   scoped_ptr<cdm::BinaryData[]> result(new cdm::BinaryData[key_ids.size()]);
   for (uint32 i = 0; i < key_ids.size(); ++i) {
@@ skipping 90 matching lines @@
   host_->OnSessionMessage(last_session_id_.data(),
                           last_session_id_.length(),
                           message.data(),
                           message.length(),
                           NULL,
                           0);
   file_io_test_runner_.reset();
 }
 
 }  // namespace media