Index: media/filters/source_buffer_stream_unittest.cc |
diff --git a/media/filters/source_buffer_stream_unittest.cc b/media/filters/source_buffer_stream_unittest.cc |
index 8270bd9ea68fb6f71a4e630829adab0d8ba3aa18..b0e9316e72abdcdffb475c3a4dc99f6304bec30c 100644 |
--- a/media/filters/source_buffer_stream_unittest.cc |
+++ b/media/filters/source_buffer_stream_unittest.cc |
@@ -35,7 +35,7 @@ class SourceBufferStreamTest : public testing::Test { |
SourceBufferStreamTest() { |
video_config_ = TestVideoConfig::Normal(); |
SetStreamInfo(kDefaultFramesPerSecond, kDefaultKeyframesPerSecond); |
- stream_.reset(new SourceBufferStream(video_config_, log_cb(), true)); |
+ stream_.reset(new SourceBufferStream(video_config_, new MediaLog(), true)); |
} |
void SetMemoryLimit(int buffers_of_data) { |
@@ -51,7 +51,7 @@ class SourceBufferStreamTest : public testing::Test { |
void SetTextStream() { |
video_config_ = TestVideoConfig::Invalid(); |
TextTrackConfig config(kTextSubtitles, "", "", ""); |
- stream_.reset(new SourceBufferStream(config, log_cb(), true)); |
+ stream_.reset(new SourceBufferStream(config, new MediaLog(), true)); |
SetStreamInfo(2, 2); |
} |
@@ -67,7 +67,7 @@ class SourceBufferStreamTest : public testing::Test { |
false, |
base::TimeDelta(), |
0); |
- stream_.reset(new SourceBufferStream(audio_config_, log_cb(), true)); |
+ stream_.reset(new SourceBufferStream(audio_config_, new MediaLog(), true)); |
// Equivalent to 2ms per frame. |
SetStreamInfo(500, 500); |
@@ -370,8 +370,6 @@ class SourceBufferStreamTest : public testing::Test { |
<< "\nActual: " << actual.AsHumanReadableString(); |
} |
- const LogCB log_cb() { return base::Bind(&AddLogEntryForTest); } |
- |
base::TimeDelta frame_duration() const { return frame_duration_; } |
scoped_ptr<SourceBufferStream> stream_; |
@@ -3408,7 +3406,7 @@ TEST_F(SourceBufferStreamTest, SameTimestamp_Video_Overlap_3) { |
TEST_F(SourceBufferStreamTest, SameTimestamp_Audio) { |
AudioDecoderConfig config(kCodecMP3, kSampleFormatF32, CHANNEL_LAYOUT_STEREO, |
44100, NULL, 0, false); |
- stream_.reset(new SourceBufferStream(config, log_cb(), true)); |
+ stream_.reset(new SourceBufferStream(config, new MediaLog(), true)); |
Seek(0); |
NewSegmentAppend("0K 0K 30K 30 60 60"); |
CheckExpectedBuffers("0K 0K 30K 30 60 60"); |
@@ -3417,7 +3415,7 @@ TEST_F(SourceBufferStreamTest, SameTimestamp_Audio) { |
TEST_F(SourceBufferStreamTest, SameTimestamp_Audio_Invalid_1) { |
AudioDecoderConfig config(kCodecMP3, kSampleFormatF32, CHANNEL_LAYOUT_STEREO, |
44100, NULL, 0, false); |
- stream_.reset(new SourceBufferStream(config, log_cb(), true)); |
+ stream_.reset(new SourceBufferStream(config, new MediaLog(), true)); |
Seek(0); |
NewSegmentAppend_ExpectFailure("0K 30 30K 60"); |
} |
@@ -4000,7 +3998,7 @@ TEST_F(SourceBufferStreamTest, Audio_SpliceFrame_NoMillisecondSplices) { |
audio_config_.Initialize(kCodecVorbis, kSampleFormatPlanarF32, |
CHANNEL_LAYOUT_STEREO, 4000, NULL, 0, false, false, |
base::TimeDelta(), 0); |
- stream_.reset(new SourceBufferStream(audio_config_, log_cb(), true)); |
+ stream_.reset(new SourceBufferStream(audio_config_, new MediaLog(), true)); |
// Equivalent to 0.5ms per frame. |
SetStreamInfo(2000, 2000); |
Seek(0); |