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

Unified Diff: media/base/decoder_buffer_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/base/decoder_buffer_queue.cc ('k') | media/base/video_frame.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/decoder_buffer_unittest.cc
diff --git a/media/base/decoder_buffer_unittest.cc b/media/base/decoder_buffer_unittest.cc
index 7880a80f6c26895db26bc21a672a1a77c1c68413..3dda67f84ee42d6a812105a50f165770f37a2cdd 100644
--- a/media/base/decoder_buffer_unittest.cc
+++ b/media/base/decoder_buffer_unittest.cc
@@ -16,7 +16,7 @@ TEST(DecoderBufferTest, Constructors) {
const int kTestSize = 10;
scoped_refptr<DecoderBuffer> buffer3(new DecoderBuffer(kTestSize));
- ASSERT_TRUE(buffer3);
+ ASSERT_TRUE(buffer3.get());
EXPECT_EQ(kTestSize, buffer3->GetDataSize());
}
@@ -30,7 +30,7 @@ TEST(DecoderBufferTest, CopyFrom) {
const int kDataSize = arraysize(kData);
scoped_refptr<DecoderBuffer> buffer2(DecoderBuffer::CopyFrom(
reinterpret_cast<const uint8*>(&kData), kDataSize));
- ASSERT_TRUE(buffer2);
+ ASSERT_TRUE(buffer2.get());
EXPECT_NE(kData, buffer2->GetData());
EXPECT_EQ(buffer2->GetDataSize(), kDataSize);
EXPECT_EQ(0, memcmp(buffer2->GetData(), kData, kDataSize));
@@ -38,7 +38,7 @@ TEST(DecoderBufferTest, CopyFrom) {
scoped_refptr<DecoderBuffer> buffer3(DecoderBuffer::CopyFrom(
reinterpret_cast<const uint8*>(&kData), kDataSize,
reinterpret_cast<const uint8*>(&kData), kDataSize));
- ASSERT_TRUE(buffer3);
+ ASSERT_TRUE(buffer3.get());
EXPECT_NE(kData, buffer3->GetData());
EXPECT_EQ(buffer3->GetDataSize(), kDataSize);
EXPECT_EQ(0, memcmp(buffer3->GetData(), kData, kDataSize));
@@ -54,7 +54,7 @@ TEST(DecoderBufferTest, PaddingAlignment) {
const int kDataSize = arraysize(kData);
scoped_refptr<DecoderBuffer> buffer2(DecoderBuffer::CopyFrom(
reinterpret_cast<const uint8*>(&kData), kDataSize));
- ASSERT_TRUE(buffer2);
+ ASSERT_TRUE(buffer2.get());
// Padding data should always be zeroed.
for(int i = 0; i < DecoderBuffer::kPaddingSize; i++)
@@ -80,7 +80,7 @@ TEST(DecoderBufferTest, ReadingWriting) {
const int kDataSize = arraysize(kData);
scoped_refptr<DecoderBuffer> buffer(new DecoderBuffer(kDataSize));
- ASSERT_TRUE(buffer);
+ ASSERT_TRUE(buffer.get());
uint8* data = buffer->GetWritableData();
ASSERT_TRUE(data);
« no previous file with comments | « media/base/decoder_buffer_queue.cc ('k') | media/base/video_frame.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698