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

Unified Diff: media/filters/fake_video_decoder_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/filters/fake_video_decoder.cc ('k') | media/filters/ffmpeg_audio_decoder.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 24f0e0b930a61cc96d502f3d1eb8bc7cbf746738..45b2891b1b45f0bd5165218190e027dd6272a859 100644
--- a/media/filters/fake_video_decoder_unittest.cc
+++ b/media/filters/fake_video_decoder_unittest.cc
@@ -52,7 +52,7 @@ class FakeVideoDecoderTest : public testing::Test {
is_read_pending_ = false;
frame_read_ = frame;
- if (frame && !frame->IsEndOfStream())
+ if (frame.get() && !frame->IsEndOfStream())
num_decoded_frames_++;
}
@@ -67,20 +67,20 @@ class FakeVideoDecoderTest : public testing::Test {
switch (result) {
case PENDING:
EXPECT_TRUE(is_read_pending_);
- ASSERT_FALSE(frame_read_);
+ ASSERT_FALSE(frame_read_.get());
break;
case OK:
EXPECT_FALSE(is_read_pending_);
- ASSERT_TRUE(frame_read_);
+ ASSERT_TRUE(frame_read_.get());
EXPECT_FALSE(frame_read_->IsEndOfStream());
break;
case ABROTED:
EXPECT_FALSE(is_read_pending_);
- EXPECT_FALSE(frame_read_);
+ EXPECT_FALSE(frame_read_.get());
break;
case EOS:
EXPECT_FALSE(is_read_pending_);
- ASSERT_TRUE(frame_read_);
+ ASSERT_TRUE(frame_read_.get());
EXPECT_TRUE(frame_read_->IsEndOfStream());
break;
}
@@ -97,7 +97,7 @@ class FakeVideoDecoderTest : public testing::Test {
void ReadUntilEOS() {
do {
ReadOneFrame();
- } while (frame_read_ && !frame_read_->IsEndOfStream());
+ } while (frame_read_.get() && !frame_read_->IsEndOfStream());
}
void EnterPendingReadState() {
« no previous file with comments | « media/filters/fake_video_decoder.cc ('k') | media/filters/ffmpeg_audio_decoder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698