Make BrowserMessageFilter not derive from IPC::ChannelProxy::MessageFilter. This allows us to hide …

content/test/webrtc_audio_device_test.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/test/webrtc_audio_device_test.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/compiler_specific.h"
 #include "base/file_util.h"
@@ skipping 59 matching lines @@
   virtual int GetEnabledBindings() const OVERRIDE { return 0; }
   virtual TransportDIB* CreateTransportDIB(size_t size) OVERRIDE {
     return NULL;
   }
   virtual void FreeTransportDIB(TransportDIB*) OVERRIDE {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(WebRTCMockRenderProcess);
 };
 
+class TestAudioRendererHost : public AudioRendererHost {
+ public:
+  TestAudioRendererHost(
+      int render_process_id,
+      media::AudioManager* audio_manager,
+      AudioMirroringManager* mirroring_manager,
+      MediaInternals* media_internals,
+      MediaStreamManager* media_stream_manager,
+      IPC::Channel* channel)
+      : AudioRendererHost(render_process_id, audio_manager, mirroring_manager,
+                          media_internals, media_stream_manager),
+        channel_(channel) {}
+  virtual bool Send(IPC::Message* message) OVERRIDE {
+    if (channel_)
+      return channel_->Send(message);
+    return false;
+  }
+  void ResetChannel() {
+    channel_ = NULL;
+  }
+
+ private:
+  IPC::Channel* channel_;
+};
+
+class TestAudioInputRendererHost : public AudioInputRendererHost {
+ public:
+  TestAudioInputRendererHost(
+      media::AudioManager* audio_manager,
+      MediaStreamManager* media_stream_manager,
+      AudioMirroringManager* audio_mirroring_manager,
+      media::UserInputMonitor* user_input_monitor,
+      IPC::Channel* channel)
+      : AudioInputRendererHost(audio_manager, media_stream_manager,
+                          audio_mirroring_manager, user_input_monitor),

[scherkus (not reviewing), 2013/09/26 19:57:37]

nit: fix indent?

looks off

[jam, 2013/09/26 20:22:39]

Done.

+        channel_(channel) {}
+  virtual bool Send(IPC::Message* message) OVERRIDE {
+    if (channel_)
+      return channel_->Send(message);
+    return false;
+  }
+  void ResetChannel() {
+    channel_ = NULL;
+  }
+
+ private:
+  IPC::Channel* channel_;
+};
+
 // Utility scoped class to replace the global content client's renderer for the
 // duration of the test.
 class ReplaceContentClientRenderer {
  public:
   explicit ReplaceContentClientRenderer(ContentRendererClient* new_renderer) {
     saved_renderer_ = SetRendererClientForTesting(new_renderer);
   }
   ~ReplaceContentClientRenderer() {
     // Restore the original renderer.
     SetRendererClientForTesting(saved_renderer_);
@@ skipping 161 matching lines @@
 #if defined(OS_WIN)
   initialize_com_.reset();
 #endif
 
   audio_manager_.reset();
 }
 
 void MAYBE_WebRTCAudioDeviceTest::CreateChannel(const char* name) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
-  static const int kRenderProcessId = 1;
-  audio_render_host_ = new AudioRendererHost(
-      kRenderProcessId, audio_manager_.get(), mirroring_manager_.get(),
-      media_internals_.get(), media_stream_manager_.get());
-  audio_render_host_->OnChannelConnected(base::GetCurrentProcId());
-
-  audio_input_renderer_host_ =
-      new AudioInputRendererHost(audio_manager_.get(),
-                                 media_stream_manager_.get(),
-                                 mirroring_manager_.get(),
-                                 NULL);
-  audio_input_renderer_host_->OnChannelConnected(base::GetCurrentProcId());
-
   channel_.reset(new IPC::Channel(name, IPC::Channel::MODE_SERVER, this));
   ASSERT_TRUE(channel_->Connect());
 
-  audio_render_host_->OnFilterAdded(channel_.get());
-  audio_input_renderer_host_->OnFilterAdded(channel_.get());
+  static const int kRenderProcessId = 1;
+  audio_render_host_ = new TestAudioRendererHost(
+      kRenderProcessId, audio_manager_.get(), mirroring_manager_.get(),
+      media_internals_.get(), media_stream_manager_.get(), channel_.get());
+  audio_render_host_->set_peer_pid_for_testing(base::GetCurrentProcId());
+
+  audio_input_renderer_host_ =
+      new TestAudioInputRendererHost(audio_manager_.get(),
+                                     media_stream_manager_.get(),
+                                     mirroring_manager_.get(),
+                                     NULL,
+                                     channel_.get());
+  audio_input_renderer_host_->set_peer_pid_for_testing(
+      base::GetCurrentProcId());
 }
 
 void MAYBE_WebRTCAudioDeviceTest::DestroyChannel() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   audio_render_host_->OnChannelClosing();
   audio_render_host_->OnFilterRemoved();
   audio_input_renderer_host_->OnChannelClosing();
   audio_input_renderer_host_->OnFilterRemoved();
+  audio_render_host_->ResetChannel();
+  audio_input_renderer_host_->ResetChannel();
   channel_.reset();
   audio_render_host_ = NULL;
   audio_input_renderer_host_ = NULL;
 }
 
 void MAYBE_WebRTCAudioDeviceTest::OnGetAudioHardwareConfig(
     AudioParameters* input_params, AudioParameters* output_params) {
   ASSERT_TRUE(audio_hardware_config_);
   *input_params = audio_hardware_config_->GetInputConfig();
   *output_params = audio_hardware_config_->GetOutputConfig();
@@ skipping 85 matching lines @@
 int WebRTCTransportImpl::SendPacket(int channel, const void* data, int len) {
   return network_->ReceivedRTPPacket(channel, data, len);
 }
 
 int WebRTCTransportImpl::SendRTCPPacket(int channel, const void* data,
                                         int len) {
   return network_->ReceivedRTCPPacket(channel, data, len);
 }
 
 }  // namespace content