Encrypted Media: Replace DecryptorClient with key event callbacks.

media/crypto/aes_decryptor.h

 // Copyright (c) 2012 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 <string>
 
 #include "base/basictypes.h"
 #include "base/hash_tables.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string_piece.h"
 #include "base/synchronization/lock.h"
 #include "media/base/decryptor.h"
 #include "media/base/media_export.h"
 
 namespace crypto {
 class SymmetricKey;
 }
 
 namespace media {
 
-class DecryptorClient;
-
 // 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 Decryptor {
  public:
-  // The AesDecryptor does not take ownership of the |client|. The |client|
-  // must be valid throughout the lifetime of the AesDecryptor.
-  explicit AesDecryptor(DecryptorClient* client);
+  AesDecryptor(const KeyAddedCB& key_added_cb,
+               const KeyErrorCB& key_error_cb,
+               const KeyMessageCB& key_message_cb,
+               const NeedKeyCB& need_key_cb);
   virtual ~AesDecryptor();
 
   // Decryptor implementation.
   virtual bool GenerateKeyRequest(const std::string& key_system,
                                   const std::string& type,
                                   const uint8* init_data,
                                   int init_data_length) OVERRIDE;
   virtual void AddKey(const std::string& key_system,
                       const uint8* key,
                       int key_length,
                       const uint8* init_data,
                       int init_data_length,
                       const std::string& session_id) OVERRIDE;
   virtual void CancelKeyRequest(const std::string& key_system,
                                 const std::string& session_id) OVERRIDE;
-  virtual void RegisterKeyAddedCB(StreamType stream_type,
-                                  const KeyAddedCB& key_added_cb) OVERRIDE;
+  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;
   virtual void CancelDecrypt(StreamType stream_type) OVERRIDE;
   virtual void InitializeAudioDecoder(scoped_ptr<AudioDecoderConfig> config,
                                       const DecoderInitCB& init_cb) OVERRIDE;
   virtual void InitializeVideoDecoder(scoped_ptr<VideoDecoderConfig> config,
                                       const DecoderInitCB& init_cb) OVERRIDE;
   virtual void DecryptAndDecodeAudio(
       const scoped_refptr<DecoderBuffer>& encrypted,
@@ skipping 28 matching lines @@
     DISALLOW_COPY_AND_ASSIGN(DecryptionKey);
   };
 
   // Sets |key| for |key_id|. The AesDecryptor takes the ownership of the |key|.
   void SetKey(const std::string& key_id, scoped_ptr<DecryptionKey> key);
 
   // Gets a DecryptionKey associated with |key_id|. The AesDecryptor still owns
   // the key. Returns NULL if no key is associated with |key_id|.
   DecryptionKey* GetKey(const std::string& key_id) const;
 
+  // Callbacks for firing key events.
+  KeyAddedCB key_added_cb_;
+  KeyErrorCB key_error_cb_;
+  KeyMessageCB key_message_cb_;
+  NeedKeyCB need_key_cb_;
+
   // KeyMap owns the DecryptionKey* and must delete them when they are
   // not needed any more.
   typedef base::hash_map<std::string, DecryptionKey*> KeyMap;
 
   // Since only Decrypt() is called off the renderer thread, we only need to
   // protect |key_map_|, the only member variable that is shared between
   // Decrypt() and other methods.
   KeyMap key_map_;  // Protected by the |key_map_lock_|.
   mutable base::Lock key_map_lock_;  // Protects the |key_map_|.
 
   // Make session ID unique per renderer by making it static.
   // TODO(xhwang): Make session ID more strictly defined if needed:
   // https://www.w3.org/Bugs/Public/show_bug.cgi?id=16739#c0
   static uint32 next_session_id_;
 
-  DecryptorClient* const client_;
-
-  KeyAddedCB audio_key_added_cb_;
-  KeyAddedCB video_key_added_cb_;
+  NewKeyCB new_audio_key_cb_;
+  NewKeyCB new_video_key_cb_;
 
   DISALLOW_COPY_AND_ASSIGN(AesDecryptor);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_CRYPTO_AES_DECRYPTOR_H_