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

Unified Diff: media/base/video_frame_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/video_frame.cc ('k') | media/base/video_util_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/video_frame_unittest.cc
diff --git a/media/base/video_frame_unittest.cc b/media/base/video_frame_unittest.cc
index 18cc1d3dd3a69a83e7b5a5c5852a832e2ca04f60..b249fc8528d6164061bd7044e97aa112c7cd7fed 100644
--- a/media/base/video_frame_unittest.cc
+++ b/media/base/video_frame_unittest.cc
@@ -93,7 +93,7 @@ void ExpectFrameExtents(VideoFrame::Format format, int planes,
gfx::Size size(kWidth, kHeight);
scoped_refptr<VideoFrame> frame = VideoFrame::CreateFrame(
format, size, gfx::Rect(size), size, kTimestamp);
- ASSERT_TRUE(frame);
+ ASSERT_TRUE(frame.get());
for(int plane = 0; plane < planes; plane++) {
SCOPED_TRACE(base::StringPrintf("Checking plane %d", plane));
@@ -129,14 +129,14 @@ TEST(VideoFrame, CreateFrame) {
scoped_refptr<media::VideoFrame> frame =
VideoFrame::CreateFrame(media::VideoFrame::YV12, size, gfx::Rect(size),
size, kTimestamp);
- ASSERT_TRUE(frame);
+ ASSERT_TRUE(frame.get());
// Test VideoFrame implementation.
EXPECT_EQ(media::VideoFrame::YV12, frame->format());
{
SCOPED_TRACE("");
- InitializeYV12Frame(frame, 0.0f);
- ExpectFrameColor(frame, 0xFF000000);
+ InitializeYV12Frame(frame.get(), 0.0f);
+ ExpectFrameColor(frame.get(), 0xFF000000);
}
base::MD5Digest digest;
base::MD5Context context;
@@ -146,8 +146,8 @@ TEST(VideoFrame, CreateFrame) {
EXPECT_EQ(MD5DigestToBase16(digest), "9065c841d9fca49186ef8b4ef547e79b");
{
SCOPED_TRACE("");
- InitializeYV12Frame(frame, 1.0f);
- ExpectFrameColor(frame, 0xFFFFFFFF);
+ InitializeYV12Frame(frame.get(), 1.0f);
+ ExpectFrameColor(frame.get(), 0xFFFFFFFF);
}
base::MD5Init(&context);
frame->HashFrameForTesting(&context);
@@ -167,7 +167,7 @@ TEST(VideoFrame, CreateBlackFrame) {
scoped_refptr<media::VideoFrame> frame =
VideoFrame::CreateBlackFrame(gfx::Size(kWidth, kHeight));
- ASSERT_TRUE(frame);
+ ASSERT_TRUE(frame.get());
// Test basic properties.
EXPECT_EQ(0, frame->GetTimestamp().InMicroseconds());
« no previous file with comments | « media/base/video_frame.cc ('k') | media/base/video_util_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698