Chromium Code Reviews| Index: content/renderer/media/audio_renderer_impl_unittest.cc |
| =================================================================== |
| --- content/renderer/media/audio_renderer_impl_unittest.cc (revision 90030) |
| +++ content/renderer/media/audio_renderer_impl_unittest.cc (working copy) |
| @@ -15,17 +15,11 @@ |
| class AudioRendererImplTest : public ::testing::Test { |
| public: |
| - static const int kRouteId = 0; |
| static const int kSize = 1024; |
| AudioRendererImplTest() { |
| message_loop_.reset(new MessageLoop(MessageLoop::TYPE_IO)); |
| - // TODO(scherkus): use gmock with AudioMessageFilter to verify |
| - // AudioRendererImpl calls or doesn't call Send(). |
| - filter_ = new AudioMessageFilter(kRouteId); |
| - filter_->message_loop_ = message_loop_.get(); |
| - |
| // Create temporary shared memory. |
| CHECK(shared_mem_.CreateAnonymous(kSize)); |
| @@ -37,8 +31,11 @@ |
| CHANNEL_LAYOUT_MONO, |
| 44100))); |
| + // TODO(henrika) - figure out a way to avoid a crash here. |
| + // Construction of AudioRendererImpl only works on the main renderer thread. |
|
scherkus (not reviewing)
2011/06/23 19:14:43
could you paste the stack trace?
it's probably be
henrika_dont_use
2011/06/27 15:05:44
See separate e-mail discussion.
On 2011/06/23 19:
|
| + |
| // Create and initialize audio renderer. |
| - renderer_ = new AudioRendererImpl(filter_); |
| + renderer_ = new AudioRendererImpl(); |
| renderer_->set_host(&host_); |
| renderer_->Initialize(decoder_, media::NewExpectedCallback()); |
| @@ -60,7 +57,6 @@ |
| protected: |
| // Fixtures. |
| scoped_ptr<MessageLoop> message_loop_; |
| - scoped_refptr<AudioMessageFilter> filter_; |
| base::SharedMemory shared_mem_; |
| media::MockFilterHost host_; |
| scoped_refptr<media::MockAudioDecoder> decoder_; |