IPC->mojo of audio_renderer_host

content/renderer/render_thread_impl.cc

Index: content/renderer/render_thread_impl.cc
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
index 605769b9e6bd1c8adde074de5f3644b54ae62b42..b912f93910728cb0799273d78c44c72feaaa97ee 100644
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -102,7 +102,7 @@
 #include "content/renderer/input/main_thread_input_event_filter.h"
 #include "content/renderer/media/aec_dump_message_filter.h"
 #include "content/renderer/media/audio_input_message_filter.h"
-#include "content/renderer/media/audio_message_filter.h"
+#include "content/renderer/media/audio_output_ipc_factory.h"
 #include "content/renderer/media/audio_renderer_mixer_manager.h"
 #include "content/renderer/media/media_stream_center.h"
 #include "content/renderer/media/midi_message_filter.h"
@@ -130,6 +130,7 @@
 #include "ipc/ipc_channel_mojo.h"
 #include "ipc/ipc_platform_file.h"
 #include "media/base/media.h"
+#include "media/media_features.h"
 #include "media/renderers/gpu_video_accelerator_factories.h"
 #include "mojo/common/common_type_converters.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
@@ -694,9 +695,6 @@ void RenderThreadImpl::Init(
   audio_input_message_filter_ = new AudioInputMessageFilter(GetIOTaskRunner());
   AddFilter(audio_input_message_filter_.get());
 
-  audio_message_filter_ = new AudioMessageFilter(GetIOTaskRunner());
-  AddFilter(audio_message_filter_.get());
-
   midi_message_filter_ = new MidiMessageFilter(GetIOTaskRunner());
   AddFilter(midi_message_filter_.get());
 
@@ -718,6 +716,11 @@ void RenderThreadImpl::Init(
 
   GetContentClient()->renderer()->RenderThreadStarted();
 
+#if BUILDFLAG(ENABLE_MOJO_AUDIO)

[Henrik Grunell, 2016/09/01 15:09:07]

Why do we have this build flag? (I know it came from the original CL.)

[Max Morin, 2016/09/02 10:27:07]

I don't think we should have it. I removed it for now.

+  audio_output_ipc_factory_ =
+      new AudioOutputIPCFactory(GetIOTaskRunner(), GetRemoteInterfaces());
+#endif
+
   InitSkiaEventTracer();
   base::trace_event::MemoryDumpManager::GetInstance()->RegisterDumpProvider(
       skia::SkiaMemoryDumpProvider::GetInstance(), "Skia", nullptr);
@@ -924,9 +927,7 @@ void RenderThreadImpl::Shutdown() {
 
   compositor_thread_.reset();
 
-  // AudioMessageFilter may be accessed on |media_thread_|, so shutdown after.
-  RemoveFilter(audio_message_filter_.get());
-  audio_message_filter_ = nullptr;
+  audio_output_ipc_factory_ = nullptr;
 
   categorized_worker_pool_->Shutdown();