| Index: media/filters/frame_processor_unittest.cc
|
| diff --git a/media/filters/frame_processor_unittest.cc b/media/filters/frame_processor_unittest.cc
|
| index b4fe2236893897285cc29562fad72b4e99204c4d..075ec926f557e0855a50dc200ee65ed5ea23e2e4 100644
|
| --- a/media/filters/frame_processor_unittest.cc
|
| +++ b/media/filters/frame_processor_unittest.cc
|
| @@ -11,6 +11,7 @@
|
| #include "base/strings/string_split.h"
|
| #include "base/strings/string_util.h"
|
| #include "base/time/time.h"
|
| +#include "media/base/media_log.h"
|
| #include "media/base/mock_filters.h"
|
| #include "media/base/test_helpers.h"
|
| #include "media/filters/chunk_demuxer.h"
|
| @@ -27,8 +28,6 @@ typedef StreamParser::BufferQueue BufferQueue;
|
| typedef StreamParser::TextBufferQueueMap TextBufferQueueMap;
|
| typedef StreamParser::TrackId TrackId;
|
|
|
| -static void LogFunc(const std::string& str) { DVLOG(1) << str; }
|
| -
|
| // Used for setting expectations on callbacks. Using a StrictMock also lets us
|
| // test for missing or extra callbacks.
|
| class FrameProcessorTestCallbackHelper {
|
| @@ -277,7 +276,8 @@ class FrameProcessorTest : public testing::TestWithParam<bool> {
|
| false);
|
| frame_processor_->OnPossibleAudioConfigUpdate(decoder_config);
|
| ASSERT_TRUE(
|
| - audio_->UpdateAudioConfig(decoder_config, base::Bind(&LogFunc)));
|
| + audio_->UpdateAudioConfig(decoder_config,
|
| + base::Bind(&AddLogEntryForTest)));
|
| break;
|
| }
|
| case DemuxerStream::VIDEO: {
|
| @@ -285,7 +285,7 @@ class FrameProcessorTest : public testing::TestWithParam<bool> {
|
| video_.reset(new ChunkDemuxerStream(
|
| DemuxerStream::VIDEO, DemuxerStream::LIVENESS_UNKNOWN, true));
|
| ASSERT_TRUE(video_->UpdateVideoConfig(TestVideoConfig::Normal(),
|
| - base::Bind(&LogFunc)));
|
| + base::Bind(&AddLogEntryForTest)));
|
| break;
|
| }
|
| // TODO(wolenetz): Test text coded frame processing.
|
|
|