Introduce CdmContext interface.

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>
 
 #include "base/basictypes.h"
 #include "base/containers/scoped_ptr_hash_map.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/synchronization/lock.h"
+#include "media/base/cdm_context.h"
 #include "media/base/decryptor.h"
 #include "media/base/media_export.h"
 #include "media/base/media_keys.h"
 
 namespace crypto {
 class SymmetricKey;
 }
 
 namespace media {
 
 // Decrypts an AES encrypted buffer into an unencrypted buffer. The AES
 // encryption must be CTR with a key size of 128bits.
-class MEDIA_EXPORT AesDecryptor : public MediaKeys, public Decryptor {
+class MEDIA_EXPORT AesDecryptor : public MediaKeys,
+                                  public CdmContext,
+                                  public Decryptor {
  public:
   AesDecryptor(const SessionMessageCB& session_message_cb,
                const SessionClosedCB& session_closed_cb,
                const SessionKeysChangeCB& session_keys_change_cb);
   ~AesDecryptor() override;
 
   // MediaKeys implementation.
   void SetServerCertificate(const uint8* certificate_data,
                             int certificate_data_length,
                             scoped_ptr<SimpleCdmPromise> promise) override;
   void CreateSession(const std::string& init_data_type,
                      const uint8* init_data,
                      int init_data_length,
                      SessionType session_type,
                      scoped_ptr<NewSessionCdmPromise> promise) override;
   void LoadSession(const std::string& web_session_id,
                    scoped_ptr<NewSessionCdmPromise> promise) override;
   void UpdateSession(const std::string& web_session_id,
                      const uint8* response,
                      int response_length,
                      scoped_ptr<SimpleCdmPromise> promise) override;
   void CloseSession(const std::string& web_session_id,
                     scoped_ptr<SimpleCdmPromise> promise) override;
   void RemoveSession(const std::string& web_session_id,
                      scoped_ptr<SimpleCdmPromise> promise) override;
   void GetUsableKeyIds(const std::string& web_session_id,
                        scoped_ptr<KeyIdsPromise> promise) override;
+  CdmContext* GetCdmContext() override;
+
+  // CdmContext implementation.
   Decryptor* GetDecryptor() override;
 #if defined(ENABLE_BROWSER_CDMS)
   virtual int GetCdmId() const override;
 #endif  // defined(ENABLE_BROWSER_CDMS)
 
   // Decryptor implementation.
   void RegisterNewKeyCB(StreamType stream_type,
                         const NewKeyCB& key_added_cb) override;
   void Decrypt(StreamType stream_type,
                const scoped_refptr<DecoderBuffer>& encrypted,
@@ 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_