media: Make MediaKeys ref-counted.

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 <vector>
@@ skipping 19 matching lines @@
 // 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 CdmContext,
                                   public Decryptor {
  public:
   AesDecryptor(const GURL& security_origin,
                const SessionMessageCB& session_message_cb,
                const SessionClosedCB& session_closed_cb,
                const SessionKeysChangeCB& session_keys_change_cb);
-  ~AesDecryptor() override;
 
   // MediaKeys implementation.
   void SetServerCertificate(const std::vector<uint8_t>& certificate,
                             scoped_ptr<SimpleCdmPromise> promise) override;
   void CreateSessionAndGenerateRequest(
       SessionType session_type,
       EmeInitDataType init_data_type,
       const std::vector<uint8_t>& init_data,
       scoped_ptr<NewSessionCdmPromise> promise) override;
   void LoadSession(SessionType session_type,
@@ skipping 58 matching lines @@
   // for the same key ID, then the last key inserted is used. The structure is
   // optimized so that Decrypt() has fast access, at the cost of slow deletion
   // of keys when a session is released.
   class SessionIdDecryptionKeyMap;
 
   // Key ID <-> SessionIdDecryptionKeyMap map.
   typedef base::ScopedPtrHashMap<std::string,
                                  scoped_ptr<SessionIdDecryptionKeyMap>>
       KeyIdToSessionKeysMap;
 
+  ~AesDecryptor() override;
+
   // Creates a DecryptionKey using |key_string| and associates it with |key_id|.
   // Returns true if successful.
   bool AddDecryptionKey(const std::string& session_id,
                         const std::string& key_id,
                         const std::string& key_string);
 
   // 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_Locked(const std::string& key_id) const;
 
@@ skipping 27 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_