media: Make MediaKeys ref-counted.

media/cdm/proxy_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_CDM_PROXY_DECRYPTOR_H_
 #define MEDIA_CDM_PROXY_DECRYPTOR_H_
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/containers/hash_tables.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"

[jrummell, 2015/10/29 21:05:17]

#include "base/memory/ref_counted.h"?

[xhwang, 2015/10/30 16:20:59]

Done.

 #include "base/memory/weak_ptr.h"
 #include "media/base/cdm_context.h"
 #include "media/base/decryptor.h"
 #include "media/base/eme_constants.h"
 #include "media/base/media_export.h"
 #include "media/base/media_keys.h"
 #include "url/gurl.h"
 
 namespace media {
 
@@ skipping 45 matching lines @@
   void AddKey(const uint8* key, int key_length,
               const uint8* init_data, int init_data_length,
               const std::string& session_id);
   void CancelKeyRequest(const std::string& session_id);
 
  private:
   // Callback for CreateCdm().
   void OnCdmCreated(const std::string& key_system,
                     const GURL& security_origin,
                     const CdmContextReadyCB& cdm_context_ready_cb,
-                    scoped_ptr<MediaKeys> cdm,
+                    const scoped_refptr<MediaKeys>& cdm,
                     const std::string& error_message);
 
   void GenerateKeyRequestInternal(EmeInitDataType init_data_type,
                                   const std::vector<uint8>& init_data);
 
   // Callbacks for firing session events.
   void OnSessionMessage(const std::string& session_id,
                         MediaKeys::MessageType message_type,
                         const std::vector<uint8>& message,
                         const GURL& legacy_destination_url);
@@ skipping 31 matching lines @@
                                   const std::vector<uint8>& init_data);
     ~PendingGenerateKeyRequestData();
 
     const EmeInitDataType init_data_type;
     const std::vector<uint8> init_data;
   };
 
   bool is_creating_cdm_;
 
   // The real MediaKeys that manages key operations for the ProxyDecryptor.
-  scoped_ptr<MediaKeys> media_keys_;
+  scoped_refptr<MediaKeys> media_keys_;
 
 #if defined(OS_CHROMEOS) || defined(OS_ANDROID)
   MediaPermission* media_permission_;
 #endif
 
   bool use_hw_secure_codecs_;
 
   // Callbacks for firing key events.
   KeyAddedCB key_added_cb_;
   KeyErrorCB key_error_cb_;
@@ skipping 11 matching lines @@
 
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<ProxyDecryptor> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ProxyDecryptor);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_CDM_PROXY_DECRYPTOR_H_