media: Make MediaKeys ref-counted.

chromecast/media/cdm/browser_cdm_cast.cc

 // Copyright 2014 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 "chromecast/media/cdm/browser_cdm_cast.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
@@ skipping 71 matching lines @@
 }
 
 void BrowserCdmCast::Initialize(
     const ::media::SessionMessageCB& session_message_cb,
     const ::media::SessionClosedCB& session_closed_cb,
     const ::media::LegacySessionErrorCB& legacy_session_error_cb,
     const ::media::SessionKeysChangeCB& session_keys_change_cb,
     const ::media::SessionExpirationUpdateCB& session_expiration_update_cb) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
-  player_tracker_impl_.reset(new ::media::PlayerTrackerImpl);
+  player_tracker_impl_.reset(new ::media::PlayerTrackerImpl());
 
   session_message_cb_ = session_message_cb;
   session_closed_cb_ = session_closed_cb;
   legacy_session_error_cb_ = legacy_session_error_cb;
   session_keys_change_cb_ = session_keys_change_cb;
   session_expiration_update_cb_ = session_expiration_update_cb;
 
   InitializeInternal();
 }
 
@@ skipping 44 matching lines @@
 }
 
 // A macro runs current member function on |task_runner_| thread.
 #define FORWARD_ON_CDM_THREAD(param_fn, ...) \
   task_runner_->PostTask(                    \
       FROM_HERE,                             \
       base::Bind(&BrowserCdmCast::param_fn,  \
                  base::Unretained(browser_cdm_cast_.get()), ##__VA_ARGS__))
 
 BrowserCdmCastUi::BrowserCdmCastUi(
-    scoped_ptr<BrowserCdmCast> browser_cdm_cast,
+    const scoped_refptr<BrowserCdmCast>& browser_cdm_cast,
     const scoped_refptr<base::SingleThreadTaskRunner>& task_runner)
-    : browser_cdm_cast_(browser_cdm_cast.Pass()), task_runner_(task_runner) {
-}
+    : browser_cdm_cast_(browser_cdm_cast), task_runner_(task_runner) {}
 
 BrowserCdmCastUi::~BrowserCdmCastUi() {
   DCHECK(thread_checker_.CalledOnValidThread());
-  task_runner_->DeleteSoon(FROM_HERE, browser_cdm_cast_.release());
-}
-
-int BrowserCdmCastUi::RegisterPlayer(const base::Closure& new_key_cb,
-                                     const base::Closure& cdm_unset_cb) {
-  NOTREACHED() << "RegisterPlayer should be called on BrowserCdmCast";
-  return -1;
-}
-
-void BrowserCdmCastUi::UnregisterPlayer(int registration_id) {
-  NOTREACHED() << "UnregisterPlayer should be called on BrowserCdmCast";
+  browser_cdm_cast_->AddRef();
+  BrowserCdmCast* raw_cdm = browser_cdm_cast_.get();
+  browser_cdm_cast_ = nullptr;
+  task_runner_->ReleaseSoon(FROM_HERE, raw_cdm);

[halliwell, 2015/10/30 01:50:51]

Seems that we should assert that it HasOneRef before we call ReleaseSoon (if I'm
understanding correctly that this is intended to be a deterministic destruction
path still).

[xhwang, 2015/10/30 04:50:16]

For now yes. In the future, if the CMA pipeline could also hods a ref-count to
the browser_cdm_cast, then the ref count could be >1. I am reluctant to add it
here since that really is the implementation detail of the player (pipeline),
and is not a part of the EME stack.

 }
 
 BrowserCdmCast* BrowserCdmCastUi::browser_cdm_cast() const {
   DCHECK(thread_checker_.CalledOnValidThread());
   return browser_cdm_cast_.get();
 }
 
 void BrowserCdmCastUi::SetServerCertificate(
     const std::vector<uint8_t>& certificate,
     scoped_ptr<::media::SimpleCdmPromise> promise) {
@@ skipping 61 matching lines @@
   return nullptr;
 }
 
 // A default empty implementation for subclasses that don't need to provide
 // any key system specific initialization.
 void BrowserCdmCast::InitializeInternal() {
 }
 
 }  // namespace media
 }  // namespace chromecast