Separate CDM initialization from GenerateKeyRequest & remove key_system parameters.

media/crypto/aes_decryptor_unittest.cc

 // Copyright (c) 2012 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 "media/base/decoder_buffer.h"
@@ skipping 226 matching lines @@
         subsample_entries_(kSubsampleEntries,
                            kSubsampleEntries + arraysize(kSubsampleEntries)) {
   }
 
  protected:
   void GenerateKeyRequest(const uint8* key_id, int key_id_size) {
     std::string key_id_string(reinterpret_cast<const char*>(key_id),
                               key_id_size);
     EXPECT_CALL(
         *this,
-        KeyMessage(
-            kClearKeySystem, StrNe(std::string()), StrEq(key_id_string), ""))
+        KeyMessage(StrNe(std::string()), StrEq(key_id_string), ""))
         .WillOnce(SaveArg<1>(&session_id_string_));
     EXPECT_TRUE(decryptor_.GenerateKeyRequest(
-        kClearKeySystem, std::string(), key_id, key_id_size));
+        std::string(), key_id, key_id_size));
   }
 
   void AddKeyAndExpectToSucceed(const uint8* key_id, int key_id_size,
                                 const uint8* key, int key_size) {
-    EXPECT_CALL(*this, KeyAdded(kClearKeySystem, session_id_string_));
-    decryptor_.AddKey(kClearKeySystem, key, key_size, key_id, key_id_size,
+    EXPECT_CALL(*this, KeyAdded(session_id_string_));
+    decryptor_.AddKey(key, key_size, key_id, key_id_size,
                       session_id_string_);
   }
 
   void AddKeyAndExpectToFail(const uint8* key_id, int key_id_size,
                              const uint8* key, int key_size) {
-    EXPECT_CALL(*this, KeyError(kClearKeySystem, session_id_string_,
+    EXPECT_CALL(*this, KeyError(session_id_string_,
                                 MediaKeys::kUnknownError, 0));
-    decryptor_.AddKey(kClearKeySystem, key, key_size, key_id, key_id_size,
-                      session_id_string_);
+    decryptor_.AddKey(key, key_size, key_id, key_id_size, session_id_string_);
   }
 
   MOCK_METHOD2(BufferDecrypted, void(Decryptor::Status,
                                      const scoped_refptr<DecoderBuffer>&));
 
   void DecryptAndExpectToSucceed(const scoped_refptr<DecoderBuffer>& encrypted,
                                  const uint8* plain_text, int plain_text_size) {
     scoped_refptr<DecoderBuffer> decrypted;
     EXPECT_CALL(*this, BufferDecrypted(AesDecryptor::kSuccess, NotNull()))
         .WillOnce(SaveArg<1>(&decrypted));
@@ skipping 28 matching lines @@
     ASSERT_TRUE(decrypted.get());
     EXPECT_NE(plain_text_size, decrypted->GetDataSize());
     EXPECT_NE(0, memcmp(plain_text, decrypted->GetData(), plain_text_size));
   }
 
   void DecryptAndExpectToFail(const scoped_refptr<DecoderBuffer>& encrypted) {
     EXPECT_CALL(*this, BufferDecrypted(AesDecryptor::kError, IsNull()));
     decryptor_.Decrypt(Decryptor::kVideo, encrypted, decrypt_cb_);
   }
 
-  MOCK_METHOD2(KeyAdded, void(const std::string&, const std::string&));
-  MOCK_METHOD4(KeyError, void(const std::string&, const std::string&,
+  MOCK_METHOD1(KeyAdded, void(const std::string&));
+  MOCK_METHOD3(KeyError, void(const std::string&,
                               MediaKeys::KeyError, int));
-  MOCK_METHOD4(KeyMessage, void(const std::string& key_system,
-                                const std::string& session_id,
+  MOCK_METHOD3(KeyMessage, void(const std::string& session_id,
                                 const std::string& message,
                                 const std::string& default_url));
 
   AesDecryptor decryptor_;
   std::string session_id_string_;
   AesDecryptor::DecryptCB decrypt_cb_;
   std::vector<SubsampleEntry> subsample_entries_;
 };
 
 TEST_F(AesDecryptorTest, GenerateKeyRequestWithNullInitData) {
-  EXPECT_CALL(*this, KeyMessage(kClearKeySystem, StrNe(std::string()), "", ""));
-  EXPECT_TRUE(
-      decryptor_.GenerateKeyRequest(kClearKeySystem, std::string(), NULL, 0));
+  EXPECT_CALL(*this, KeyMessage(StrNe(std::string()), "", ""));
+  EXPECT_TRUE(decryptor_.GenerateKeyRequest(std::string(), NULL, 0));
 }
 
 TEST_F(AesDecryptorTest, NormalWebMDecryption) {
   const WebmEncryptedData& frame = kWebmEncryptedFrames[0];
   GenerateKeyRequest(frame.key_id, frame.key_id_size);
   AddKeyAndExpectToSucceed(frame.key_id, frame.key_id_size,
                            frame.key, frame.key_size);
   scoped_refptr<DecoderBuffer> encrypted_data =
       CreateWebMEncryptedBuffer(frame.encrypted_data,
                                 frame.encrypted_data_size,
@@ skipping 256 matching lines @@
   scoped_refptr<DecoderBuffer> encrypted_data = CreateSubsampleEncryptedBuffer(
       kSubsampleData, arraysize(kSubsampleData),
       kSubsampleKeyId, arraysize(kSubsampleKeyId),
       kSubsampleIv, arraysize(kSubsampleIv),
       0,
       entries);
   ASSERT_NO_FATAL_FAILURE(DecryptAndExpectToFail(encrypted_data));
 }
 
 }  // namespace media