Implements AudioMessageFilter as member in RenderThread

content/renderer/media/audio_renderer_impl_unittest.cc

Index: content/renderer/media/audio_renderer_impl_unittest.cc
===================================================================
--- content/renderer/media/audio_renderer_impl_unittest.cc	(revision 90366)
+++ content/renderer/media/audio_renderer_impl_unittest.cc	(working copy)
@@ -5,6 +5,7 @@
 #include "base/process_util.h"
 #include "content/common/media/audio_messages.h"
 #include "content/renderer/media/audio_renderer_impl.h"
+#include "content/renderer/render_thread.h"
 #include "media/base/data_buffer.h"
 #include "media/base/mock_callback.h"
 #include "media/base/mock_filter_host.h"
@@ -15,17 +16,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 +32,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.
+
     // Create and initialize audio renderer.
-    renderer_ = new AudioRendererImpl(filter_);
+    renderer_ = new AudioRendererImpl();
     renderer_->set_host(&host_);
     renderer_->Initialize(decoder_, media::NewExpectedCallback());
 
@@ -60,11 +58,11 @@
  protected:
   // Fixtures.
   scoped_ptr<MessageLoop> message_loop_;
-  scoped_refptr<AudioMessageFilter> filter_;
   base::SharedMemory shared_mem_;
   media::MockFilterHost host_;
   scoped_refptr<media::MockAudioDecoder> decoder_;
   scoped_refptr<AudioRendererImpl> renderer_;
+  RenderThread* render_thread_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(AudioRendererImplTest);