Add Promises for EME (Chromium side)

media/base/android/cdm_factory_android.cc

Index: media/base/android/cdm_factory_android.cc
diff --git a/media/base/android/cdm_factory_android.cc b/media/base/android/cdm_factory_android.cc
index c9b24e2d550d67de06543533f35a54ffc381f7e9..030f432c8769d30e68d9d6aa78e9946d84dc0fb5 100644
--- a/media/base/android/cdm_factory_android.cc
+++ b/media/base/android/cdm_factory_android.cc
@@ -12,16 +12,16 @@
 
 namespace media {
 
-scoped_ptr<MediaKeys> CreateBrowserCdm(
+scoped_ptr<MediaDrmBridge> 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) {

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

As mentioned in my CL:
https://codereview.chromium.org/308073004/diff/40001/media/base/browser_cdm_f...

It might worth putting all the exceptions and callbacks in a common file (e.g.
media/base/cdm_common.h) so that they can be shared by MediaKeys and BrowserCdm.

[jrummell, 2014/06/03 18:55:24]

This should get cleaned up in a later CL when Android supports promises. Moved
the CB definitions to BrowserCdm and added a comment there.

   if (!MediaDrmBridge::IsKeySystemSupported(key_system)) {
     NOTREACHED() << "Unsupported key system: " << key_system;
-    return scoped_ptr<MediaKeys>();
+    return scoped_ptr<MediaDrmBridge>();
   }
 
   scoped_ptr<MediaDrmBridge> cdm(MediaDrmBridge::Create(key_system,
@@ -32,7 +32,7 @@ scoped_ptr<MediaKeys> CreateBrowserCdm(
                                                         session_error_cb));
   if (!cdm) {
     NOTREACHED() << "MediaDrmBridge cannot be created for " << key_system;
-    return scoped_ptr<MediaKeys>();
+    return scoped_ptr<MediaDrmBridge>();
   }
 
   // TODO(xhwang/ddorwin): Pass the security level from key system.
@@ -44,10 +44,10 @@ scoped_ptr<MediaKeys> CreateBrowserCdm(
   }
   if (!cdm->SetSecurityLevel(security_level)) {
     DVLOG(1) << "failed to set security level " << security_level;
-    return scoped_ptr<MediaKeys>();
+    return scoped_ptr<MediaDrmBridge>();
   }
 
-  return cdm.PassAs<MediaKeys>();
+  return cdm.Pass();
 }
 
 }  // namespace media