Chromecast: use PlayerTrackerImpl in BrowserCdmCast.

chromecast/media/cdm/browser_cdm_cast.cc

Index: chromecast/media/cdm/browser_cdm_cast.cc
diff --git a/chromecast/media/cdm/browser_cdm_cast.cc b/chromecast/media/cdm/browser_cdm_cast.cc
index 33502f2aeb952c1d90fa70fa475ad9e281eff981..627b33b283213b5624e6fde60bb07315eda562c3 100644
--- a/chromecast/media/cdm/browser_cdm_cast.cc
+++ b/chromecast/media/cdm/browser_cdm_cast.cc
@@ -4,6 +4,7 @@
 
 #include "chromecast/media/cdm/browser_cdm_cast.h"
 
+#include "base/bind.h"
 #include "base/callback.h"
 #include "base/location.h"
 #include "base/message_loop/message_loop_proxy.h"

[lcwu1, 2015/01/08 18:25:17]

No longer needed.

[gunsch, 2015/01/08 18:34:46]

Done.

@@ -12,45 +13,24 @@
 namespace chromecast {
 namespace media {
 
-BrowserCdmCast::BrowserCdmCast()
-    : next_registration_id_(1) {
+BrowserCdmCast::BrowserCdmCast() {
 }
 
 BrowserCdmCast::~BrowserCdmCast() {
-  // Call unset callbacks synchronously.
-  for (std::map<uint32_t, base::Closure>::const_iterator it =
-       cdm_unset_callbacks_.begin(); it != cdm_unset_callbacks_.end(); ++it) {
-    it->second.Run();
-  }
-
-  new_key_callbacks_.clear();
-  cdm_unset_callbacks_.clear();
+  player_tracker_.NotifyCdmUnset();
 }
 
 int BrowserCdmCast::RegisterPlayer(const base::Closure& new_key_cb,
                                    const base::Closure& cdm_unset_cb) {
-  int registration_id = next_registration_id_++;
-  DCHECK(!new_key_cb.is_null());
-  DCHECK(!cdm_unset_cb.is_null());
-  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;
+  return player_tracker_.RegisterPlayer(new_key_cb, cdm_unset_cb);
 }
 
 void BrowserCdmCast::UnregisterPlayer(int registration_id) {
-  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);
+  player_tracker_.UnregisterPlayer(registration_id);
 }
 
-void BrowserCdmCast::NotifyKeyAdded() const {
-  for (std::map<uint32_t, base::Closure>::const_iterator it =
-       new_key_callbacks_.begin(); it != new_key_callbacks_.end(); ++it) {
-    base::MessageLoopProxy::current()->PostTask(FROM_HERE, it->second);
-  }
+void BrowserCdmCast::NotifyKeyAdded() {
+  player_tracker_.NotifyNewKey();
 }
 
 }  // namespace media