| Index: media/crypto/aes_decryptor_unittest.cc
|
| diff --git a/media/crypto/aes_decryptor_unittest.cc b/media/crypto/aes_decryptor_unittest.cc
|
| index f88215006b5c4f369e902e5c3ba21781effe6f24..abc7e6eb53c58e8b29d878f676bb3624043b8bdc 100644
|
| --- a/media/crypto/aes_decryptor_unittest.cc
|
| +++ b/media/crypto/aes_decryptor_unittest.cc
|
| @@ -242,11 +242,13 @@ class AesDecryptorTest : public testing::Test {
|
| 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(""), StrEq(key_id_string), ""))
|
| + EXPECT_CALL(
|
| + *this,
|
| + KeyMessage(
|
| + kClearKeySystem, StrNe(std::string()), StrEq(key_id_string), ""))
|
| .WillOnce(SaveArg<1>(&session_id_string_));
|
| - EXPECT_TRUE(decryptor_.GenerateKeyRequest(kClearKeySystem, "",
|
| - key_id, key_id_size));
|
| + EXPECT_TRUE(decryptor_.GenerateKeyRequest(
|
| + kClearKeySystem, std::string(), key_id, key_id_size));
|
| }
|
|
|
| void AddKeyAndExpectToSucceed(const uint8* key_id, int key_id_size,
|
| @@ -325,8 +327,9 @@ class AesDecryptorTest : public testing::Test {
|
| };
|
|
|
| TEST_F(AesDecryptorTest, GenerateKeyRequestWithNullInitData) {
|
| - EXPECT_CALL(*this, KeyMessage(kClearKeySystem, StrNe(""), "", ""));
|
| - EXPECT_TRUE(decryptor_.GenerateKeyRequest(kClearKeySystem, "", NULL, 0));
|
| + EXPECT_CALL(*this, KeyMessage(kClearKeySystem, StrNe(std::string()), "", ""));
|
| + EXPECT_TRUE(
|
| + decryptor_.GenerateKeyRequest(kClearKeySystem, std::string(), NULL, 0));
|
| }
|
|
|
| TEST_F(AesDecryptorTest, NormalWebMDecryption) {
|
|
|