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

Unified Diff: media/filters/ffmpeg_demuxer_unittest.cc

Issue 17408005: Refactored DecoderBuffer to use unix_hacker_style naming. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@localrefactor
Patch Set: Created 7 years, 6 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/ffmpeg_demuxer_unittest.cc
diff --git a/media/filters/ffmpeg_demuxer_unittest.cc b/media/filters/ffmpeg_demuxer_unittest.cc
index 163ad98cf88242b4900c1ed1eb04dda71add4c8b..a77acce26d10e7b78305cb60dbdd72e481416b46 100644
--- a/media/filters/ffmpeg_demuxer_unittest.cc
+++ b/media/filters/ffmpeg_demuxer_unittest.cc
@@ -34,9 +34,9 @@ using ::testing::_;
namespace media {
-MATCHER(IsEndOfStreamBuffer,
+MATCHER(is_end_of_streamBuffer,
scherkus (not reviewing) 2013/06/20 21:26:59 revert this -- looks like it got included in some
std::string(negation ? "isn't" : "is") + " end of stream") {
- return arg->IsEndOfStream();
+ return arg->is_end_of_stream();
}
static void EosOnReadDone(bool* got_eos_buffer,
@@ -46,13 +46,13 @@ static void EosOnReadDone(bool* got_eos_buffer,
FROM_HERE, base::MessageLoop::QuitWhenIdleClosure());
EXPECT_EQ(status, DemuxerStream::kOk);
- if (buffer->IsEndOfStream()) {
+ if (buffer->is_end_of_stream()) {
*got_eos_buffer = true;
return;
}
- EXPECT_TRUE(buffer->GetData());
- EXPECT_GT(buffer->GetDataSize(), 0);
+ EXPECT_TRUE(buffer->get_data());
+ EXPECT_GT(buffer->get_data_size(), 0);
*got_eos_buffer = false;
};
@@ -111,9 +111,9 @@ class FFmpegDemuxerTest : public testing::Test {
EXPECT_EQ(status, DemuxerStream::kOk);
OnReadDoneCalled(size, timestampInMicroseconds);
EXPECT_TRUE(buffer.get() != NULL);
- EXPECT_EQ(size, buffer->GetDataSize());
+ EXPECT_EQ(size, buffer->get_data_size());
EXPECT_EQ(base::TimeDelta::FromMicroseconds(timestampInMicroseconds),
- buffer->GetTimestamp());
+ buffer->get_timestamp());
DCHECK_EQ(&message_loop_, base::MessageLoop::current());
message_loop_.PostTask(FROM_HERE, base::MessageLoop::QuitWhenIdleClosure());
@@ -434,7 +434,7 @@ TEST_F(FFmpegDemuxerTest, Stop) {
// Reads after being stopped are all EOS buffers.
StrictMock<MockReadCB> callback;
- EXPECT_CALL(callback, Run(DemuxerStream::kOk, IsEndOfStreamBuffer()));
+ EXPECT_CALL(callback, Run(DemuxerStream::kOk, is_end_of_streamBuffer()));
// Attempt the read...
audio->Read(base::Bind(&MockReadCB::Run, base::Unretained(&callback)));

Powered by Google App Engine
This is Rietveld 408576698