Add Promises for EME (Chromium side)

content/browser/media/android/browser_media_player_manager.h

Index: content/browser/media/android/browser_media_player_manager.h
diff --git a/content/browser/media/android/browser_media_player_manager.h b/content/browser/media/android/browser_media_player_manager.h
index 8e696231544c894db58d16a6c3c117bc784ea49c..c89e5cf273b7df42d127cca44b75198a1acfeeed 100644
--- a/content/browser/media/android/browser_media_player_manager.h
+++ b/content/browser/media/android/browser_media_player_manager.h
@@ -22,12 +22,13 @@
 #include "ipc/ipc_message.h"
 #include "media/base/android/media_player_android.h"
 #include "media/base/android/media_player_manager.h"
+#include "media/base/media_keys.h"
 #include "ui/gfx/rect_f.h"
 #include "url/gurl.h"
 
 namespace media {
 class DemuxerAndroid;
-class MediaKeys;
+class MediaDrmBridge;

[ddorwin, 2014/05/30 18:43:56]

This basically reverts a previous CL. :(
We might need to just wait for https://codereview.chromium.org/308073004/.

[xhwang, 2014/06/02 21:59:21]

Yeah, this will be BrowserCdm, which can be not a subclass of MediaKeys.

 }
 
 namespace content {
@@ -91,7 +92,7 @@ class CONTENT_EXPORT BrowserMediaPlayerManager
   virtual media::MediaResourceGetter* GetMediaResourceGetter() OVERRIDE;
   virtual media::MediaPlayerAndroid* GetFullscreenPlayer() OVERRIDE;
   virtual media::MediaPlayerAndroid* GetPlayer(int player_id) OVERRIDE;
-  virtual media::MediaKeys* GetCdm(int cdm_id) OVERRIDE;
+  virtual media::MediaDrmBridge* GetCdm(int cdm_id) OVERRIDE;
   virtual void DestroyAllMediaPlayers() OVERRIDE;
   virtual void RequestFullScreen(int player_id) OVERRIDE;
   virtual void OnSessionCreated(int cdm_id,
@@ -229,7 +230,7 @@ class CONTENT_EXPORT BrowserMediaPlayerManager
   ScopedVector<media::MediaPlayerAndroid> players_;
 
   // A map from CDM IDs to managed CDMs.
-  typedef std::map<int, media::MediaKeys*> CdmMap;
+  typedef std::map<int, media::MediaDrmBridge*> CdmMap;
   CdmMap cdm_map_;
 
   // Map from CDM ID to MediaPlayerAndroid player ID to indicate that