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

Unified Diff: media/filters/fake_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/filters/fake_video_decoder_unittest.cc
diff --git a/media/filters/fake_video_decoder_unittest.cc b/media/filters/fake_video_decoder_unittest.cc
index 3598a7a48edac090354d791401f048bfbd067d40..ec0d303150e6d113570c7a981961f3639f8f9751 100644
--- a/media/filters/fake_video_decoder_unittest.cc
+++ b/media/filters/fake_video_decoder_unittest.cc
@@ -92,17 +92,17 @@ class FakeVideoDecoderTest
case OK:
EXPECT_EQ(0, pending_decode_requests_);
ASSERT_EQ(VideoDecoder::kOk, last_decode_status_);
- ASSERT_TRUE(last_decoded_frame_);
+ ASSERT_TRUE(last_decoded_frame_.get());
break;
case NOT_ENOUGH_DATA:
EXPECT_EQ(0, pending_decode_requests_);
ASSERT_EQ(VideoDecoder::kOk, last_decode_status_);
- ASSERT_FALSE(last_decoded_frame_);
+ ASSERT_FALSE(last_decoded_frame_.get());
break;
case ABORTED:
EXPECT_EQ(0, pending_decode_requests_);
ASSERT_EQ(VideoDecoder::kAborted, last_decode_status_);
- EXPECT_FALSE(last_decoded_frame_);
+ EXPECT_FALSE(last_decoded_frame_.get());
break;
}
}
@@ -132,7 +132,7 @@ class FakeVideoDecoderTest
last_decoded_frame_ = NULL;
do {
Decode();
- } while (!last_decoded_frame_ && pending_decode_requests_ == 0);
+ } while (!last_decoded_frame_.get() && pending_decode_requests_ == 0);
}
void ReadAllFrames() {
@@ -274,7 +274,7 @@ TEST_P(FakeVideoDecoderTest, Read_Pending_NotEnoughData) {
SatisfyDecodeAndExpect(NOT_ENOUGH_DATA);
// Verify that FrameReady() hasn't been called.
- EXPECT_FALSE(last_decoded_frame_);
+ EXPECT_FALSE(last_decoded_frame_.get());
}
TEST_P(FakeVideoDecoderTest, Read_Pending_OK) {

Powered by Google App Engine
This is Rietveld 408576698