media: Make MediaKeys ref-counted.

media/cdm/proxy_decryptor.cc

 // 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.
 
 #include "media/cdm/proxy_decryptor.h"
 
 #include <cstring>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
@@ skipping 42 matching lines @@
       is_clear_key_(false),
       weak_ptr_factory_(this) {
   DCHECK(media_permission);
   DCHECK(!key_added_cb_.is_null());
   DCHECK(!key_error_cb_.is_null());
   DCHECK(!key_message_cb_.is_null());
 }
 
 ProxyDecryptor::~ProxyDecryptor() {
   // Destroy the decryptor explicitly before destroying the plugin.
-  media_keys_.reset();
+  media_keys_ = nullptr;
 }
 
 void ProxyDecryptor::CreateCdm(CdmFactory* cdm_factory,
                                const std::string& key_system,
                                const GURL& security_origin,
                                const CdmContextReadyCB& cdm_context_ready_cb) {
   DVLOG(1) << __FUNCTION__ << ": key_system = " << key_system;
   DCHECK(!is_creating_cdm_);
   DCHECK(!media_keys_);
 
@@ skipping 15 matching lines @@
       base::Bind(&ProxyDecryptor::OnLegacySessionError, weak_this),
       base::Bind(&ProxyDecryptor::OnSessionKeysChange, weak_this),
       base::Bind(&ProxyDecryptor::OnSessionExpirationUpdate, weak_this),
       base::Bind(&ProxyDecryptor::OnCdmCreated, weak_this, key_system,
                  security_origin, cdm_context_ready_cb));
 }
 
 void ProxyDecryptor::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 */) {
   is_creating_cdm_ = false;
 
   if (!cdm) {
     cdm_context_ready_cb.Run(nullptr);
   } else {
     key_system_ = key_system;
     security_origin_ = security_origin;
     is_clear_key_ = IsClearKey(key_system) || IsExternalClearKey(key_system);
-    media_keys_ = cdm.Pass();
+    media_keys_ = cdm;
 
     cdm_context_ready_cb.Run(media_keys_->GetCdmContext());
   }
 
   for (const auto& request : pending_requests_)
     GenerateKeyRequestInternal(request->init_data_type, request->init_data);
 
   pending_requests_.clear();
 }
 
@@ skipping 284 matching lines @@
   bool is_persistent =
       session_type == PersistentSession || session_type == LoadSession;
   active_sessions_.insert(std::make_pair(session_id, is_persistent));
 
   // For LoadSession(), generate the KeyAdded event.
   if (session_type == LoadSession)
     GenerateKeyAdded(session_id);
 }
 
 }  // namespace media