Implements AudioMessageFilter as member in RenderThread

content/renderer/media/audio_message_filter.cc

Index: content/renderer/media/audio_message_filter.cc
===================================================================
--- content/renderer/media/audio_message_filter.cc	(revision 89645)
+++ content/renderer/media/audio_message_filter.cc	(working copy)
@@ -9,17 +9,28 @@
 #include "content/common/media/audio_messages.h"
 #include "ipc/ipc_logging.h"
 
-AudioMessageFilter::AudioMessageFilter(int32 route_id)
+// static
+AudioMessageFilter* AudioMessageFilter::GetInstance() {
+  // Access the singleton taking into account that we are reference counted.
+  return Singleton<AudioMessageFilter,
+      RefCountedSingletonTraits<AudioMessageFilter> >::get();
+}
+
+AudioMessageFilter::AudioMessageFilter()
     : channel_(NULL),
-      route_id_(route_id),
-      message_loop_(NULL) {
+      message_loop_(NULL),
+      routing_id_(ROUTING_ID_HAS_NOT_BEEN_SET) {
+  VLOG(1) << "AudioMessageFilter::AudioMessageFilter()";
 }
 
 AudioMessageFilter::~AudioMessageFilter() {
+  VLOG(1) << "AudioMessageFilter::~AudioMessageFilter()";
+  VLOG(1) << "  routing_id_=" << routing_id_;
 }
 
 // Called on the IPC thread.
 bool AudioMessageFilter::Send(IPC::Message* message) {
+  DCHECK(RoutingIDHasBeenSet());
   if (!channel_) {
     delete message;
     return false;
@@ -33,12 +44,12 @@
     return true;
   }
 
-  message->set_routing_id(route_id_);
+  message->set_routing_id(routing_id_);
   return channel_->Send(message);
 }
 
 bool AudioMessageFilter::OnMessageReceived(const IPC::Message& message) {
-  if (message.routing_id() != route_id_)
+  if (message.routing_id() != routing_id_)
     return false;
 
   bool handled = true;
@@ -55,6 +66,7 @@
 }
 
 void AudioMessageFilter::OnFilterAdded(IPC::Channel* channel) {
+  VLOG(1) << "AudioMessageFilter::OnFilterAdded()";
   // Captures the message loop for IPC.
   message_loop_ = MessageLoop::current();
   channel_ = channel;
@@ -135,6 +147,15 @@
   delegate->OnVolume(volume);
 }
 
+void AudioMessageFilter::SetRoutingID(int32 id) {
+  VLOG(1) << "AudioMessageFilter::SetRoutingID(id=" << id << ")";
+  routing_id_ = id;
+}
+
+bool AudioMessageFilter::RoutingIDHasBeenSet() const {
+  return (routing_id_ != ROUTING_ID_HAS_NOT_BEEN_SET);
+}
+
 int32 AudioMessageFilter::AddDelegate(Delegate* delegate) {
   return delegates_.Add(delegate);
 }