Add Promises for EME (Chromium side)

media/base/cdm_factory.h

Index: media/base/cdm_factory.h
diff --git a/media/base/cdm_factory.h b/media/base/cdm_factory.h
index ccdefa72fd38fda93e70c07b47d3594eede37c30..1c2d48fe0ae5d41913b652172efe3e1a3a71643f 100644
--- a/media/base/cdm_factory.h
+++ b/media/base/cdm_factory.h
@@ -8,20 +8,20 @@
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
+#include "media/base/android/media_drm_bridge.h"
 #include "media/base/media_export.h"
-#include "media/base/media_keys.h"
 
 namespace media {
 
 // Creates a CDM for |key_system|. Returns NULL if the CDM cannot be created.
 // TODO(xhwang): Add ifdef for IPC based CDM.
-scoped_ptr<MediaKeys> MEDIA_EXPORT
+scoped_ptr<MediaDrmBridge> MEDIA_EXPORT
     CreateBrowserCdm(const std::string& key_system,
-                     const SessionCreatedCB& session_created_cb,
-                     const SessionMessageCB& session_message_cb,
-                     const SessionReadyCB& session_ready_cb,
-                     const SessionClosedCB& session_closed_cb,
-                     const SessionErrorCB& session_error_cb);
+                     const MediaDrmBridge::SessionCreatedCB& session_created_cb,
+                     const MediaDrmBridge::SessionMessageCB& session_message_cb,
+                     const MediaDrmBridge::SessionReadyCB& session_ready_cb,
+                     const MediaDrmBridge::SessionClosedCB& session_closed_cb,
+                     const MediaDrmBridge::SessionErrorCB& session_error_cb);
 
 }  // namespace media