Add Promises for EME (Chromium side)

media/base/android/media_drm_bridge.h

Index: media/base/android/media_drm_bridge.h
diff --git a/media/base/android/media_drm_bridge.h b/media/base/android/media_drm_bridge.h
index c122ac41f163b576ed5c374a5ec5b0ebce20c49e..b79750960b15bd8c394f533a49c50b60763c0a46 100644
--- a/media/base/android/media_drm_bridge.h
+++ b/media/base/android/media_drm_bridge.h
@@ -24,7 +24,7 @@ class MediaPlayerManager;
 
 // This class provides DRM services for android EME implementation.
 // TODO(qinmin): implement all the functions in this class.
-class MEDIA_EXPORT MediaDrmBridge : public MediaKeys {
+class MEDIA_EXPORT MediaDrmBridge {
  public:
   enum SecurityLevel {
     SECURITY_LEVEL_NONE = 0,
@@ -34,6 +34,22 @@ class MEDIA_EXPORT MediaDrmBridge : public MediaKeys {
 
   typedef base::Callback<void(bool)> ResetCredentialsCB;
 
+  typedef base::Callback<
+      void(uint32 session_id, const std::string& web_session_id)>
+      SessionCreatedCB;
+
+  typedef base::Callback<void(uint32 session_id,
+                              const std::vector<uint8>& message,
+                              const GURL& destination_url)> SessionMessageCB;
+
+  typedef base::Callback<void(uint32 session_id)> SessionReadyCB;
+
+  typedef base::Callback<void(uint32 session_id)> SessionClosedCB;
+
+  typedef base::Callback<void(uint32 session_id,
+                              media::MediaKeys::KeyError error_code,
+                              uint32 system_code)> SessionErrorCB;
+
   virtual ~MediaDrmBridge();
 
   // Checks whether MediaDRM is available.
@@ -88,17 +104,16 @@ class MEDIA_EXPORT MediaDrmBridge : public MediaKeys {
   //   object. Calling this function multiples times may cause errors.
   bool SetSecurityLevel(SecurityLevel security_level);
 
-  // MediaKeys implementations.
-  virtual bool CreateSession(uint32 session_id,
-                             const std::string& content_type,
-                             const uint8* init_data,
-                             int init_data_length) OVERRIDE;
-  virtual void LoadSession(uint32 session_id,
-                           const std::string& web_session_id) OVERRIDE;
-  virtual void UpdateSession(uint32 session_id,
-                             const uint8* response,
-                             int response_length) OVERRIDE;
-  virtual void ReleaseSession(uint32 session_id) OVERRIDE;
+  // Media key operations.
+  bool CreateSession(uint32 session_id,
+                     const std::string& content_type,
+                     const uint8* init_data,
+                     int init_data_length);
+  void LoadSession(uint32 session_id, const std::string& web_session_id);
+  void UpdateSession(uint32 session_id,
+                     const uint8* response,
+                     int response_length);
+  void ReleaseSession(uint32 session_id);
 
   // Returns a MediaCrypto object if it's already created. Returns a null object
   // otherwise.