Update ClearKey to support CDM_6

media/cdm/aes_decryptor.h

 // 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.
 
 #ifndef MEDIA_CRYPTO_AES_DECRYPTOR_H_
 #define MEDIA_CRYPTO_AES_DECRYPTOR_H_
 
 #include <set>
 #include <string>
 
@@ skipping 25 matching lines @@
                              const uint8* init_data,
                              int init_data_length,
                              SessionType session_type,
                              scoped_ptr<NewSessionCdmPromise> promise) OVERRIDE;
   virtual void LoadSession(const std::string& web_session_id,
                            scoped_ptr<NewSessionCdmPromise> promise) OVERRIDE;
   virtual void UpdateSession(const std::string& web_session_id,
                              const uint8* response,
                              int response_length,
                              scoped_ptr<SimpleCdmPromise> promise) OVERRIDE;
+  void GetUsableKeyIds(const std::string& web_session_id,

[ddorwin, 2014/08/08 23:36:23]

Below Release.
Actually, below all of the public items since it is not apparently part of any
base class.

[jrummell, 2014/08/11 18:59:03]

Done.

+                       scoped_ptr<KeyIdsPromise> promise);
   virtual void ReleaseSession(const std::string& web_session_id,
                               scoped_ptr<SimpleCdmPromise> promise) OVERRIDE;
   virtual Decryptor* GetDecryptor() OVERRIDE;
 
   // Decryptor implementation.
   virtual void RegisterNewKeyCB(StreamType stream_type,
                                 const NewKeyCB& key_added_cb) OVERRIDE;
   virtual void Decrypt(StreamType stream_type,
                        const scoped_refptr<DecoderBuffer>& encrypted,
                        const DecryptCB& decrypt_cb) OVERRIDE;
@@ skipping 81 matching lines @@
   // Protect |new_audio_key_cb_| and |new_video_key_cb_| as they are set on the
   // main thread but called on the media thread.
   mutable base::Lock new_key_cb_lock_;
 
   DISALLOW_COPY_AND_ASSIGN(AesDecryptor);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_CRYPTO_AES_DECRYPTOR_H_