Refactor CdmPromise and related classes

media/cdm/aes_decryptor_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/json/json_reader.h"
 #include "base/values.h"
-#include "media/base/cdm_promise.h"
+#include "media/base/cdm_callback_promise.h"
 #include "media/base/decoder_buffer.h"
 #include "media/base/decrypt_config.h"
 #include "media/base/mock_filters.h"
 #include "media/cdm/aes_decryptor.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::_;
 using ::testing::Gt;
 using ::testing::IsNull;
@@ skipping 228 matching lines @@
 
   void OnReject(PromiseResult expected_result,
                 MediaKeys::Exception exception_code,
                 uint32 system_code,
                 const std::string& error_message) {
     EXPECT_EQ(expected_result, REJECTED) << "Unexpectedly rejected.";
   }
 
   scoped_ptr<SimpleCdmPromise> CreatePromise(PromiseResult expected_result) {
     scoped_ptr<SimpleCdmPromise> promise(
-        new SimpleCdmPromise(base::Bind(&AesDecryptorTest::OnResolve,
-                                        base::Unretained(this),
-                                        expected_result),
-                             base::Bind(&AesDecryptorTest::OnReject,
-                                        base::Unretained(this),
-                                        expected_result)));
+        new CdmCallbackPromise<>(base::Bind(&AesDecryptorTest::OnResolve,
+                                            base::Unretained(this),
+                                            expected_result),
+                                 base::Bind(&AesDecryptorTest::OnReject,
+                                            base::Unretained(this),
+                                            expected_result)));
     return promise.Pass();
   }
 
   scoped_ptr<NewSessionCdmPromise> CreateSessionPromise(
       PromiseResult expected_result) {
-    scoped_ptr<NewSessionCdmPromise> promise(new NewSessionCdmPromise(
-        base::Bind(&AesDecryptorTest::OnResolveWithSession,
-                   base::Unretained(this),
-                   expected_result),
-        base::Bind(&AesDecryptorTest::OnReject,
-                   base::Unretained(this),
-                   expected_result)));
+    scoped_ptr<NewSessionCdmPromise> promise(
+        new CdmCallbackPromise<std::string>(
+            base::Bind(&AesDecryptorTest::OnResolveWithSession,
+                       base::Unretained(this),
+                       expected_result),
+            base::Bind(&AesDecryptorTest::OnReject,
+                       base::Unretained(this),
+                       expected_result)));
     return promise.Pass();
   }
 
   scoped_ptr<KeyIdsPromise> CreateUsableKeyIdsPromise(
       PromiseResult expected_result,
       uint32 expected_count) {
-    scoped_ptr<KeyIdsPromise> promise(new KeyIdsPromise(
+    scoped_ptr<KeyIdsPromise> promise(new CdmCallbackPromise<KeyIdsVector>(
         base::Bind(&AesDecryptorTest::OnResolveWithUsableKeyIds,
                    base::Unretained(this),
                    expected_result,
                    expected_count),
         base::Bind(&AesDecryptorTest::OnReject,
                    base::Unretained(this),
                    expected_result)));
     return promise.Pass();
   }
 
@@ skipping 598 matching lines @@
   EXPECT_FALSE(UsableKeyIdsContains(key_id2));
 
   // Add second key, verify both IDs returned.
   UpdateSessionAndExpect(session_id, kKey2AsJWK, RESOLVED);
   GetUsableKeyIdsAndExpect(session_id, RESOLVED, 2);
   EXPECT_TRUE(UsableKeyIdsContains(key_id1));
   EXPECT_TRUE(UsableKeyIdsContains(key_id2));
 }
 
 }  // namespace media