2 files changed, 7 insertions, 10 deletions
diff --git a/media/crypto/aes_decryptor.cc b/media/crypto/aes_decryptor.cc
index 430568c..e214b06 100644
--- a/media/crypto/aes_decryptor.cc
+++ b/media/crypto/aes_decryptor.cc
@@ -152,7 +152,7 @@ bool AesDecryptor::GenerateKeyRequest(const std::string& key_system,
                           init_data_length);
   }
 
-  key_message_cb_.Run(key_system, session_id_string, message, std::string());
+  key_message_cb_.Run(key_system, session_id_string, message, "");
   return true;
 }
 
diff --git a/media/crypto/aes_decryptor_unittest.cc b/media/crypto/aes_decryptor_unittest.cc
index abc7e6e..f882150 100644
--- a/media/crypto/aes_decryptor_unittest.cc
+++ b/media/crypto/aes_decryptor_unittest.cc
@@ -242,13 +242,11 @@ 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(std::string()), StrEq(key_id_string), ""))
+    EXPECT_CALL(*this, KeyMessage(kClearKeySystem,
+                                  StrNe(""), StrEq(key_id_string), ""))
         .WillOnce(SaveArg<1>(&session_id_string_));
-    EXPECT_TRUE(decryptor_.GenerateKeyRequest(
-        kClearKeySystem, std::string(), key_id, key_id_size));
+    EXPECT_TRUE(decryptor_.GenerateKeyRequest(kClearKeySystem, "",
+                                              key_id, key_id_size));
   }
 
   void AddKeyAndExpectToSucceed(const uint8* key_id, int key_id_size,
@@ -327,9 +325,8 @@ class AesDecryptorTest : public testing::Test {
 };
 
 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(kClearKeySystem, StrNe(""), "", ""));
+  EXPECT_TRUE(decryptor_.GenerateKeyRequest(kClearKeySystem, "", NULL, 0));
 }
 
 TEST_F(AesDecryptorTest, NormalWebMDecryption) {