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

Unified Diff: media/cast/receiver/video_decoder_unittest.cc

Issue 506683002: Remove implicit conversions from scoped_refptr to T* in media/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 4 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
Index: media/cast/receiver/video_decoder_unittest.cc
diff --git a/media/cast/receiver/video_decoder_unittest.cc b/media/cast/receiver/video_decoder_unittest.cc
index 7ea4b5da141d19e22a0de74345cd97575a284a71..c8428353382079bd3e78ae5e035c99282b70b833 100644
--- a/media/cast/receiver/video_decoder_unittest.cc
+++ b/media/cast/receiver/video_decoder_unittest.cc
@@ -75,7 +75,7 @@ class VideoDecoderTest : public ::testing::TestWithParam<Codec> {
frame_size,
next_frame_timestamp_);
next_frame_timestamp_ += base::TimeDelta::FromSeconds(1) / kFrameRate;
- PopulateVideoFrame(video_frame, 0);
+ PopulateVideoFrame(video_frame.get(), 0);
// Encode |frame| into |encoded_frame->data|.
scoped_ptr<EncodedFrame> encoded_frame(
@@ -121,7 +121,7 @@ class VideoDecoderTest : public ::testing::TestWithParam<Codec> {
DCHECK(cast_environment_->CurrentlyOn(CastEnvironment::MAIN));
// A NULL |video_frame| indicates a decode error, which we don't expect.
- ASSERT_FALSE(!video_frame);
+ ASSERT_FALSE(!video_frame.get());
// Did the decoder detect whether frames were dropped?
EXPECT_EQ(should_be_continuous, is_continuous);

Powered by Google App Engine
This is Rietveld 408576698