Add Promises for EME (Chromium side)

Now that the EME-WD spec has changed to specify promises, implement
them on the Chromium side. They currently get converted back to
events before passing them to blink:: until the blink interface gets
changed.

Additional changes in this CL:
1. Pass a reference to the promise though PPAPI.
2. Roll DEPS for CDM.h to include CDM_5.
3. Update cdm_adapter to use CDM_5 (in addition to existing CDM_4).
4. Change External Clear Key to use CDM_5.
5. Since CDM_5 references sessions by the actual session id (a string,
   web_session_id), switch to using it rather than the previously used
   session_id (which is an integer, and used as a reference).

BUG=358271
TEST=all existing encrypted media layout and browser tests pass

Review URL: https://codereview.chromium.org/265993002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@275656 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 8 deletions

diff --git a/media/base/browser_cdm_factory.h b/media/base/browser_cdm_factory.h
index 4e86c8b..e6fa47b 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