Chromecast: change BrowserCdmCast threading model.

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 "media/base/cdm_key_information.h"
 
 namespace chromecast {
 namespace media {
 
 BrowserCdmCast::BrowserCdmCast() {

[erickung1, 2015/02/07 01:31:10]

|next_registration_id_| initialization?

[gunsch, 2015/02/07 01:44:27]

Done.

 }
 
 BrowserCdmCast::~BrowserCdmCast() {
-  player_tracker_.NotifyCdmUnset();
+  {

[erickung1, 2015/02/07 01:31:10]

Nit: maybe no need the parentheses?

[gunsch, 2015/02/07 01:44:27]

Done.

+    base::AutoLock auto_lock(callback_lock_);
+    for (std::map<uint32_t, base::Closure>::const_iterator it =
+         cdm_unset_callbacks_.begin(); it != cdm_unset_callbacks_.end(); ++it) {
+      it->second.Run();
+    }
+  }
 }
 
 void BrowserCdmCast::SetCallbacks(
     const ::media::SessionMessageCB& session_message_cb,
     const ::media::SessionClosedCB& session_closed_cb,
     const ::media::SessionErrorCB& session_error_cb,
     const ::media::SessionKeysChangeCB& session_keys_change_cb,
     const ::media::SessionExpirationUpdateCB& session_expiration_update_cb) {
   session_message_cb_ = session_message_cb;
   session_closed_cb_ = session_closed_cb;
   session_error_cb_ = session_error_cb;
   session_keys_change_cb_ = session_keys_change_cb;
   session_expiration_update_cb_ = session_expiration_update_cb;
 }
 
 int BrowserCdmCast::RegisterPlayer(const base::Closure& new_key_cb,
                                    const base::Closure& cdm_unset_cb) {
-  return player_tracker_.RegisterPlayer(new_key_cb, cdm_unset_cb);
+  int registration_id = next_registration_id_++;
+  DCHECK(!new_key_cb.is_null());
+  DCHECK(!cdm_unset_cb.is_null());
+  {
+    base::AutoLock auto_lock(callback_lock_);
+    DCHECK(!ContainsKey(new_key_callbacks_, registration_id));
+    DCHECK(!ContainsKey(cdm_unset_callbacks_, registration_id));
+    new_key_callbacks_[registration_id] = new_key_cb;
+    cdm_unset_callbacks_[registration_id] = cdm_unset_cb;
+  }
+  return registration_id;
 }
 
 void BrowserCdmCast::UnregisterPlayer(int registration_id) {
-  player_tracker_.UnregisterPlayer(registration_id);
+  {

[erickung1, 2015/02/07 01:31:10]

Nit: maybe no need the parentheses?

[gunsch, 2015/02/07 01:44:27]

Done.

+    base::AutoLock auto_lock(callback_lock_);
+    DCHECK(ContainsKey(new_key_callbacks_, registration_id));
+    DCHECK(ContainsKey(cdm_unset_callbacks_, registration_id));
+    new_key_callbacks_.erase(registration_id);
+    cdm_unset_callbacks_.erase(registration_id);
+  }
 }
 
 void BrowserCdmCast::OnSessionMessage(const std::string& web_session_id,
                                       const std::vector<uint8>& message,
                                       const GURL& destination_url) {
   // Note: Message type is not supported in Chromecast. Do our best guess here.
   ::media::MediaKeys::MessageType message_type =
       destination_url.is_empty() ? ::media::MediaKeys::LICENSE_REQUEST
                                  : ::media::MediaKeys::LICENSE_RENEWAL;
   session_message_cb_.Run(web_session_id,
@@ skipping 12 matching lines @@
   ::media::CdmKeysInfo cdm_keys_info;
   for (const std::pair<std::string, std::string>& key : keys) {
     scoped_ptr< ::media::CdmKeyInformation> cdm_key_information(
         new ::media::CdmKeyInformation());
     cdm_key_information->key_id.assign(key.first.begin(), key.first.end());
     cdm_keys_info.push_back(cdm_key_information.release());
   }
   session_keys_change_cb_.Run(web_session_id, true, cdm_keys_info.Pass());
 
   // Notify listeners of a new key.
-  player_tracker_.NotifyNewKey();
+  {
+    base::AutoLock auto_lock(callback_lock_);
+    for (std::map<uint32_t, base::Closure>::const_iterator it =
+         new_key_callbacks_.begin(); it != new_key_callbacks_.end(); ++it) {
+      it->second.Run();
+    }
+  }
 }
 
 }  // namespace media
 }  // namespace chromecast