Update ClearKey to support CDM_6

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 <list>
 #include <vector>
 
 #include "base/logging.h"
@@ skipping 35 matching lines @@
 
   // Returns whether the list is empty
   bool Empty() const { return key_list_.empty(); }
 
   // Returns the last inserted DecryptionKey.
   DecryptionKey* LatestDecryptionKey() {
     DCHECK(!key_list_.empty());
     return key_list_.begin()->second;
   }
 
+  bool Contains(const std::string& web_session_id) {
+    return Find(web_session_id) != key_list_.end();
+  }
+
  private:
   // Searches the list for an element with |web_session_id|.
   KeyList::iterator Find(const std::string& web_session_id);
 
   // Deletes the entry pointed to by |position|.
   void Erase(KeyList::iterator position);
 
   KeyList key_list_;
 
   DISALLOW_COPY_AND_ASSIGN(SessionIdDecryptionKeyMap);
@@ skipping 242 matching lines @@
     if (!new_audio_key_cb_.is_null())
       new_audio_key_cb_.Run();
 
     if (!new_video_key_cb_.is_null())
       new_video_key_cb_.Run();
   }
 
   promise->resolve();
 }
 
+void AesDecryptor::GetUsableKeyIds(const std::string& web_session_id,
+                                   scoped_ptr<KeyIdsPromise> promise) {
+  // Since |web_session_id| is not provided by the user, this should never
+  // happen.
+  DCHECK(valid_sessions_.find(web_session_id) != valid_sessions_.end());
+
+  KeyIdsVector keyids;
+  base::AutoLock auto_lock(key_map_lock_);
+  for (KeyIdToSessionKeysMap::iterator it = key_map_.begin();
+       it != key_map_.end();
+       ++it) {
+    if (it->second->Contains(web_session_id))
+      keyids.push_back(std::vector<uint8>(it->first.begin(), it->first.end()));
+  }
+  promise->resolve(keyids);
+}
+
 void AesDecryptor::ReleaseSession(const std::string& web_session_id,
                                   scoped_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(web_session_id);
   // TODO(jrummell): Convert back to a DCHECK once prefixed EME is removed.
   if (it == valid_sessions_.end()) {
     promise->reject(INVALID_ACCESS_ERROR, 0, "Session does not exist.");
     return;
   }
 
@@ skipping 159 matching lines @@
 bool AesDecryptor::DecryptionKey::Init() {
   CHECK(!secret_.empty());
   decryption_key_.reset(crypto::SymmetricKey::Import(
       crypto::SymmetricKey::AES, secret_));
   if (!decryption_key_)
     return false;
   return true;
 }
 
 }  // namespace media