Add Promises for EME (Chromium side)

media/base/browser_cdm_factory.h

Index: media/base/browser_cdm_factory.h
diff --git a/media/base/browser_cdm_factory.h b/media/base/browser_cdm_factory.h
index 4e86c8ba59e4728eafef82018aa87057fbd5a24f..e6fa47bcaf473a43f8540f8ddcbcd63012278f54 100644
--- a/media/base/browser_cdm_factory.h
+++ b/media/base/browser_cdm_factory.h
@@ -8,23 +8,21 @@
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
+#include "media/base/browser_cdm.h"
 #include "media/base/media_export.h"
-#include "media/base/media_keys.h"
 
 namespace media {
 
-class BrowserCdm;
-
 // Creates a BrowserCdm for |key_system|. Returns NULL if the CDM cannot be
 // created.
 // TODO(xhwang): Add ifdef for IPC based CDM.
 scoped_ptr<BrowserCdm> 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 BrowserCdm::SessionCreatedCB& session_created_cb,
+                     const BrowserCdm::SessionMessageCB& session_message_cb,
+                     const BrowserCdm::SessionReadyCB& session_ready_cb,
+                     const BrowserCdm::SessionClosedCB& session_closed_cb,
+                     const BrowserCdm::SessionErrorCB& session_error_cb);
 
 }  // namespace media