Add Promises for EME (Chromium side)

content/browser/media/android/browser_media_player_manager.cc

Index: content/browser/media/android/browser_media_player_manager.cc
diff --git a/content/browser/media/android/browser_media_player_manager.cc b/content/browser/media/android/browser_media_player_manager.cc
index ceace3651f3ed6af38442c812650213c128bb08b..bff71c31edb1f7fc3b74cfd397368a6043b0dde1 100644
--- a/content/browser/media/android/browser_media_player_manager.cc
+++ b/content/browser/media/android/browser_media_player_manager.cc
@@ -31,7 +31,7 @@
 #include "media/base/cdm_factory.h"
 #include "media/base/media_switches.h"
 
-using media::MediaKeys;
+using media::MediaDrmBridge;
 using media::MediaPlayerAndroid;
 using media::MediaPlayerBridge;
 using media::MediaPlayerManager;
@@ -317,7 +317,7 @@ MediaPlayerAndroid* BrowserMediaPlayerManager::GetPlayer(int player_id) {
   return NULL;
 }
 
-MediaKeys* BrowserMediaPlayerManager::GetCdm(int cdm_id) {
+MediaDrmBridge* BrowserMediaPlayerManager::GetCdm(int cdm_id) {
   CdmMap::const_iterator iter = cdm_map_.find(cdm_id);
   return (iter == cdm_map_.end()) ? NULL : iter->second;
 }
@@ -612,7 +612,7 @@ void BrowserMediaPlayerManager::OnCreateSession(
     return;
   }
 
-  MediaKeys* cdm = GetCdm(cdm_id);
+  MediaDrmBridge* cdm = GetCdm(cdm_id);
   if (!cdm) {
     DLOG(WARNING) << "No CDM for ID " << cdm_id << " found";
     OnSessionError(cdm_id, session_id, media::MediaKeys::kUnknownError, 0);
@@ -648,7 +648,7 @@ void BrowserMediaPlayerManager::OnUpdateSession(
     int cdm_id,
     uint32 session_id,
     const std::vector<uint8>& response) {
-  MediaKeys* cdm = GetCdm(cdm_id);
+  MediaDrmBridge* cdm = GetCdm(cdm_id);
   if (!cdm) {
     DLOG(WARNING) << "No CDM for ID " << cdm_id << " found";
     OnSessionError(cdm_id, session_id, media::MediaKeys::kUnknownError, 0);
@@ -676,7 +676,7 @@ void BrowserMediaPlayerManager::OnUpdateSession(
 
 void BrowserMediaPlayerManager::OnReleaseSession(int cdm_id,
                                                  uint32 session_id) {
-  MediaKeys* cdm = GetCdm(cdm_id);
+  MediaDrmBridge* cdm = GetCdm(cdm_id);
   if (!cdm) {
     DLOG(WARNING) << "No CDM for ID " << cdm_id << " found";
     OnSessionError(cdm_id, session_id, media::MediaKeys::kUnknownError, 0);
@@ -687,7 +687,7 @@ void BrowserMediaPlayerManager::OnReleaseSession(int cdm_id,
 }
 
 void BrowserMediaPlayerManager::OnDestroyCdm(int cdm_id) {
-  MediaKeys* cdm = GetCdm(cdm_id);
+  MediaDrmBridge* cdm = GetCdm(cdm_id);
   if (!cdm)
     return;
 
@@ -748,7 +748,7 @@ void BrowserMediaPlayerManager::AddCdm(int cdm_id,
   base::WeakPtr<BrowserMediaPlayerManager> weak_this =
       weak_ptr_factory_.GetWeakPtr();
 
-  scoped_ptr<MediaKeys> cdm(media::CreateBrowserCdm(
+  scoped_ptr<MediaDrmBridge> cdm(media::CreateBrowserCdm(
       key_system,
       base::Bind(
           &BrowserMediaPlayerManager::OnSessionCreated, weak_this, cdm_id),
@@ -788,7 +788,7 @@ void BrowserMediaPlayerManager::RemoveCdm(int cdm_id) {
 
 void BrowserMediaPlayerManager::OnSetCdm(int player_id, int cdm_id) {
   MediaPlayerAndroid* player = GetPlayer(player_id);
-  MediaKeys* cdm = GetCdm(cdm_id);
+  MediaDrmBridge* cdm = GetCdm(cdm_id);
   if (!cdm || !player) {
     DVLOG(1) << "Cannot set CDM on the specified player.";
     return;
@@ -826,7 +826,7 @@ void BrowserMediaPlayerManager::CreateSessionIfPermitted(
     return;
   }
 
-  MediaKeys* cdm = GetCdm(cdm_id);
+  MediaDrmBridge* cdm = GetCdm(cdm_id);
   if (!cdm) {
     DLOG(WARNING) << "No CDM for ID: " << cdm_id << " found";
     OnSessionError(cdm_id, session_id, media::MediaKeys::kUnknownError, 0);