Add PlayerTracker and BrowserCdm interfaces.

media/base/android/media_drm_bridge.cc

 // Copyright (c) 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/base/android/media_drm_bridge.h"
 
 #include <algorithm>
 
 #include "base/android/build_info.h"
 #include "base/android/jni_array.h"
@@ skipping 293 matching lines @@
   CHECK(env);
 
   ScopedJavaLocalRef<jbyteArray> j_scheme_uuid =
       base::android::ToJavaByteArray(env, &scheme_uuid[0], scheme_uuid.size());
   j_media_drm_.Reset(Java_MediaDrmBridge_create(
       env, j_scheme_uuid.obj(), reinterpret_cast<intptr_t>(this)));
 }
 
 MediaDrmBridge::~MediaDrmBridge() {
   JNIEnv* env = AttachCurrentThread();
+  player_tracker_.NotifyCdmDestroyed();
   if (!j_media_drm_.is_null())
     Java_MediaDrmBridge_release(env, j_media_drm_.obj());
 }
 
 // static
 scoped_ptr<MediaDrmBridge> MediaDrmBridge::Create(
     const std::string& key_system,
     const SessionCreatedCB& session_created_cb,
     const SessionMessageCB& session_message_cb,
     const SessionReadyCB& session_ready_cb,
@@ skipping 91 matching lines @@
   DVLOG(1) << __FUNCTION__;
 
   DCHECK(!session_ready_cb_.is_null())
       << __FUNCTION__ << " called on a sessionless MediaDrmBridge object.";
 
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jbyteArray> j_response =
       base::android::ToJavaByteArray(env, response, response_length);
   Java_MediaDrmBridge_updateSession(
       env, j_media_drm_.obj(), session_id, j_response.obj());
+
+  player_tracker_.NotifyNewKey();

[ddorwin, 2014/05/30 20:50:05]

Just FYI: This will not be called here in the future.

[xhwang, 2014/06/02 20:11:43]

Yep. Added TODO.

 }
 
 void MediaDrmBridge::ReleaseSession(uint32 session_id) {
   DVLOG(1) << __FUNCTION__;
 
   DCHECK(!session_closed_cb_.is_null())
       << __FUNCTION__ << " called on a sessionless MediaDrmBridge object.";
 
   JNIEnv* env = AttachCurrentThread();
   Java_MediaDrmBridge_releaseSession(env, j_media_drm_.obj(), session_id);
 }
 
+int MediaDrmBridge::RegisterPlayer(const base::Closure& new_key_cb,
+                                   const base::Closure& cdm_destroyed_cb) {
+  return player_tracker_.RegisterPlayer(new_key_cb, cdm_destroyed_cb);
+}
+
+void MediaDrmBridge::UnregisterPlayer(int registration_id) {
+  player_tracker_.UnregisterPlayer(registration_id);
+}
+
 void MediaDrmBridge::SetMediaCryptoReadyCB(const base::Closure& closure) {
   if (closure.is_null()) {
     media_crypto_ready_cb_.Reset();
     return;
   }
 
   DCHECK(media_crypto_ready_cb_.is_null());
 
   if (!GetMediaCrypto().is_null()) {
     base::MessageLoopProxy::current()->PostTask(FROM_HERE, closure);
@@ skipping 81 matching lines @@
   JNIEnv* env = AttachCurrentThread();
   Java_MediaDrmBridge_resetDeviceCredentials(env, j_media_drm_.obj());
 }
 
 void MediaDrmBridge::OnResetDeviceCredentialsCompleted(
     JNIEnv* env, jobject, bool success) {
   base::ResetAndReturn(&reset_credentials_cb_).Run(success);
 }
 
 }  // namespace media