Refactor CdmPromise and related classes

media/filters/pipeline_integration_test.cc

Index: media/filters/pipeline_integration_test.cc
diff --git a/media/filters/pipeline_integration_test.cc b/media/filters/pipeline_integration_test.cc
index d9904f611ec0d6ea29408b0984cf74840197f697..c7900e2620af76b4e8cd103ab3ae5bfb064bb794 100644
--- a/media/filters/pipeline_integration_test.cc
+++ b/media/filters/pipeline_integration_test.cc
@@ -212,18 +212,19 @@ class KeyProvidingApp : public FakeEncryptedMedia::AppBase {
   }
 
   scoped_ptr<SimpleCdmPromise> CreatePromise(PromiseResult expected) {
-    scoped_ptr<media::SimpleCdmPromise> promise(new media::SimpleCdmPromise(
-        base::Bind(
-            &KeyProvidingApp::OnResolve, base::Unretained(this), expected),
-        base::Bind(
-            &KeyProvidingApp::OnReject, base::Unretained(this), expected)));
+    scoped_ptr<media::SimpleCdmPromise> promise(
+        new media::CdmCallbackPromise<void>(
+            base::Bind(
+                &KeyProvidingApp::OnResolve, base::Unretained(this), expected),
+            base::Bind(
+                &KeyProvidingApp::OnReject, base::Unretained(this), expected)));
     return promise.Pass();
   }
 
   scoped_ptr<NewSessionCdmPromise> CreateSessionPromise(
       PromiseResult expected) {
     scoped_ptr<media::NewSessionCdmPromise> promise(
-        new media::NewSessionCdmPromise(
+        new media::CdmCallbackPromise<std::string>(
             base::Bind(&KeyProvidingApp::OnResolveWithSession,
                        base::Unretained(this),
                        expected),