EME Clear Key: Run Session Closed algorithm before resolving returned promise

media/cdm/aes_decryptor.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/aes_decryptor.h"
 
 #include <stddef.h>
 #include <list>
 #include <utility>
 #include <vector>
@@ skipping 378 matching lines @@
       if (item.second->Contains(session_id)) {
         keys_info.push_back(
             new CdmKeyInformation(item.first, CdmKeyInformation::USABLE, 0));
       }
     }
   }
 
   session_keys_change_cb_.Run(session_id, key_added, std::move(keys_info));
 }
 
+// Runs the parallel steps from https://w3c.github.io/encrypted-media/#close.
 void AesDecryptor::CloseSession(const std::string& session_id,
                                 std::unique_ptr<SimpleCdmPromise> promise) {
   // Validate that this is a reference to an active session and then forget it.
   std::set<std::string>::iterator it = valid_sessions_.find(session_id);
   DCHECK(it != valid_sessions_.end());
 
+  // 5.1. Let cdm be the CDM instance represented by session's cdm instance
+  //      value.
+  // 5.2. Use cdm to close the session associated with session.
   valid_sessions_.erase(it);
+  DeleteKeysForSession(session_id);
 
-  // Close the session.
-  DeleteKeysForSession(session_id);
+  // 5.3. Queue a task to run the following steps:
+  // 5.3.1. Run the Session Closed algorithm on the session.
+  session_closed_cb_.Run(session_id);
+  // 5.3.2. Resolve promise.
   promise->resolve();
-
-  // Resolve the closed attribute.
-  session_closed_cb_.Run(session_id);
 }
 
 void AesDecryptor::RemoveSession(const std::string& session_id,
                                  std::unique_ptr<SimpleCdmPromise> promise) {
   NOTIMPLEMENTED() << "Need to address https://crbug.com/616166.";
   promise->reject(INVALID_ACCESS_ERROR, 0, "Session does not exist.");
 }
 
 CdmContext* AesDecryptor::GetCdmContext() {
   return this;
@@ skipping 169 matching lines @@
 bool AesDecryptor::DecryptionKey::Init() {
   CHECK(!secret_.empty());
   decryption_key_ =
       crypto::SymmetricKey::Import(crypto::SymmetricKey::AES, secret_);
   if (!decryption_key_)
     return false;
   return true;
 }
 
 }  // namespace media