Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(617)

Unified Diff: media/crypto/aes_decryptor_unittest.cc

Issue 16297002: Update media/ to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/crypto/aes_decryptor.cc ('k') | media/filters/audio_renderer_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/crypto/aes_decryptor_unittest.cc
diff --git a/media/crypto/aes_decryptor_unittest.cc b/media/crypto/aes_decryptor_unittest.cc
index 120be12c03563570ac109f4d53a0bc85ec2f09d9..ea11985faa28def8c3678cd9e57a12c9e6c463de 100644
--- a/media/crypto/aes_decryptor_unittest.cc
+++ b/media/crypto/aes_decryptor_unittest.cc
@@ -181,7 +181,7 @@ static scoped_refptr<DecoderBuffer> CreateWebMEncryptedBuffer(
const uint8* key_id, int key_id_size) {
scoped_refptr<DecoderBuffer> encrypted_buffer = DecoderBuffer::CopyFrom(
data, data_size);
- CHECK(encrypted_buffer);
+ CHECK(encrypted_buffer.get());
DCHECK_EQ(kWebMSignalByteSize, 1);
uint8 signal_byte = data[0];
@@ -214,7 +214,7 @@ static scoped_refptr<DecoderBuffer> CreateSubsampleEncryptedBuffer(
const std::vector<SubsampleEntry>& subsample_entries) {
scoped_refptr<DecoderBuffer> encrypted_buffer =
DecoderBuffer::CopyFrom(data, data_size);
- CHECK(encrypted_buffer);
+ CHECK(encrypted_buffer.get());
encrypted_buffer->SetDecryptConfig(
scoped_ptr<DecryptConfig>(new DecryptConfig(
std::string(reinterpret_cast<const char*>(key_id), key_id_size),
@@ -276,7 +276,7 @@ class AesDecryptorTest : public testing::Test {
.WillOnce(SaveArg<1>(&decrypted));
decryptor_.Decrypt(Decryptor::kVideo, encrypted, decrypt_cb_);
- ASSERT_TRUE(decrypted);
+ ASSERT_TRUE(decrypted.get());
ASSERT_EQ(plain_text_size, decrypted->GetDataSize());
EXPECT_EQ(0, memcmp(plain_text, decrypted->GetData(), plain_text_size));
}
@@ -289,7 +289,7 @@ class AesDecryptorTest : public testing::Test {
.WillOnce(SaveArg<1>(&decrypted));
decryptor_.Decrypt(Decryptor::kVideo, encrypted, decrypt_cb_);
- ASSERT_TRUE(decrypted);
+ ASSERT_TRUE(decrypted.get());
ASSERT_EQ(plain_text_size, decrypted->GetDataSize());
EXPECT_NE(0, memcmp(plain_text, decrypted->GetData(), plain_text_size));
}
@@ -302,7 +302,7 @@ class AesDecryptorTest : public testing::Test {
.WillOnce(SaveArg<1>(&decrypted));
decryptor_.Decrypt(Decryptor::kVideo, encrypted, decrypt_cb_);
- ASSERT_TRUE(decrypted);
+ ASSERT_TRUE(decrypted.get());
EXPECT_NE(plain_text_size, decrypted->GetDataSize());
EXPECT_NE(0, memcmp(plain_text, decrypted->GetData(), plain_text_size));
}
« no previous file with comments | « media/crypto/aes_decryptor.cc ('k') | media/filters/audio_renderer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698