Chromium Code Reviews| Index: media/filters/ffmpeg_audio_decoder_unittest.cc |
| diff --git a/media/filters/ffmpeg_audio_decoder_unittest.cc b/media/filters/ffmpeg_audio_decoder_unittest.cc |
| index eb634c7926b6f7f5d2e4cf33bc3436473604c26c..03961244b914ac78c9bbaac3eeb503cdb61f22b5 100644 |
| --- a/media/filters/ffmpeg_audio_decoder_unittest.cc |
| +++ b/media/filters/ffmpeg_audio_decoder_unittest.cc |
| @@ -20,16 +20,22 @@ using ::testing::_; |
| using ::testing::ReturnRef; |
| using ::testing::StrictMock; |
| +namespace { |
|
Ami GONE FROM CHROMIUM
2012/03/09 16:15:06
s/anon namespace/static/ in media code
tommi (sloooow) - chröme
2012/03/11 18:49:36
Done.
|
| +// Used to inject our message loop into the FFmpegAudioDecoder. |
| +template<class T> T Identity(T t) { return t; } |
| +} // end namespace |
| + |
| namespace media { |
| ACTION_P(InvokeReadPacket, test) { |
| test->ReadPacket(arg0); |
| } |
| - |
| + |
| class FFmpegAudioDecoderTest : public testing::Test { |
| - public: |
| + public: |
| FFmpegAudioDecoderTest() |
| - : decoder_(new FFmpegAudioDecoder(&message_loop_)), |
| + : decoder_(new FFmpegAudioDecoder(base::Bind(&Identity<MessageLoop*>, |
| + &message_loop_))), |
| demuxer_(new StrictMock<MockDemuxerStream>()) { |
| CHECK(FFmpegGlue::GetInstance()); |