EME: Clear Key CDM now generates keystatuseschange event on close()

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 392 matching lines @@
 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());
 
   valid_sessions_.erase(it);
 
   // Close the session.
   DeleteKeysForSession(session_id);
   promise->resolve();

[ddorwin, 2016/06/30 06:51:24]

This is supposed to be last.
https://w3c.github.io/encrypted-media/#session-closed

Also, everything here and below is supposed to be run in a task to ensure it
happens in the correct order. That's probably a larger issue, though.

For now, move the resolve to the end.

[jrummell, 2016/07/01 00:01:22]

Agreed. However, since we're not currently using a task, calling the cb's after
resolving the promise is the way it's been done in this file before (see
UpdateSession() directly above).

This could be converted to call PostTask (plus the other calls above). WDYT?

+
+  // Update key statuses. All keys are gone, so it's an empty set.

[ddorwin, 2016/06/30 06:51:24]

nit: "gone" sounds informal. I suggest either copy the spec line or say all keys
have been destroyed, so ...

[jrummell, 2016/07/01 00:01:22]

Done.

+  session_keys_change_cb_.Run(session_id, false, CdmKeysInfo());
+
+  // Update expiration time to NaN. (http://crbug.com/624192)
+
+  // Resolve the closed attribute.
   session_closed_cb_.Run(session_id);
 }
 
 void AesDecryptor::RemoveSession(const std::string& session_id,
                                  std::unique_ptr<SimpleCdmPromise> promise) {
   // AesDecryptor doesn't keep any persistent data, so this should be
   // NOT_REACHED().
   // TODO(jrummell): Make sure persistent session types are rejected.
   // http://crbug.com/384152.
   //
@@ skipping 183 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