Refactor CdmPromise and related classes

content/renderer/media/crypto/proxy_decryptor.cc

Index: content/renderer/media/crypto/proxy_decryptor.cc
diff --git a/content/renderer/media/crypto/proxy_decryptor.cc b/content/renderer/media/crypto/proxy_decryptor.cc
index 98c301c573c235d3378cd7383a112f60b7a13ef2..bc4e3eef36911a1cb282433915ba610840dcc518 100644
--- a/content/renderer/media/crypto/proxy_decryptor.cc
+++ b/content/renderer/media/crypto/proxy_decryptor.cc
@@ -11,7 +11,7 @@
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 #include "content/renderer/media/crypto/content_decryption_module_factory.h"
-#include "media/base/cdm_promise.h"
+#include "media/base/cdm_callback_promise.h"
 #include "media/cdm/json_web_key.h"
 #include "media/cdm/key_system_names.h"
 
@@ -112,7 +112,7 @@ bool ProxyDecryptor::GenerateKeyRequest(const std::string& content_type,
   }
 
   scoped_ptr<media::NewSessionCdmPromise> promise(
-      new media::NewSessionCdmPromise(
+      new media::CdmCallbackPromise<std::string>(
           base::Bind(&ProxyDecryptor::SetSessionId,
                      weak_ptr_factory_.GetWeakPtr(),
                      session_creation_type),
@@ -174,13 +174,13 @@ void ProxyDecryptor::AddKey(const uint8* key,
     }
   }
 
-  scoped_ptr<media::SimpleCdmPromise> promise(
-      new media::SimpleCdmPromise(base::Bind(&ProxyDecryptor::OnSessionReady,
-                                             weak_ptr_factory_.GetWeakPtr(),
-                                             web_session_id),
-                                  base::Bind(&ProxyDecryptor::OnSessionError,
-                                             weak_ptr_factory_.GetWeakPtr(),
-                                             web_session_id)));
+  scoped_ptr<media::SimpleCdmPromise> promise(new media::CdmCallbackPromise<>(
+      base::Bind(&ProxyDecryptor::OnSessionReady,
+                 weak_ptr_factory_.GetWeakPtr(),
+                 web_session_id),
+      base::Bind(&ProxyDecryptor::OnSessionError,
+                 weak_ptr_factory_.GetWeakPtr(),
+                 web_session_id)));
 
   // EME WD spec only supports a single array passed to the CDM. For
   // Clear Key using v0.1b, both arrays are used (|init_data| is key_id).
@@ -211,13 +211,13 @@ void ProxyDecryptor::AddKey(const uint8* key,
 void ProxyDecryptor::CancelKeyRequest(const std::string& web_session_id) {
   DVLOG(1) << "CancelKeyRequest()";
 
-  scoped_ptr<media::SimpleCdmPromise> promise(
-      new media::SimpleCdmPromise(base::Bind(&ProxyDecryptor::OnSessionClosed,
-                                             weak_ptr_factory_.GetWeakPtr(),
-                                             web_session_id),
-                                  base::Bind(&ProxyDecryptor::OnSessionError,
-                                             weak_ptr_factory_.GetWeakPtr(),
-                                             web_session_id)));
+  scoped_ptr<media::SimpleCdmPromise> promise(new media::CdmCallbackPromise<>(
+      base::Bind(&ProxyDecryptor::OnSessionClosed,
+                 weak_ptr_factory_.GetWeakPtr(),
+                 web_session_id),
+      base::Bind(&ProxyDecryptor::OnSessionError,
+                 weak_ptr_factory_.GetWeakPtr(),
+                 web_session_id)));
   media_keys_->RemoveSession(web_session_id, promise.Pass());
 }