Part 1: Plumb render view ID to render host

content/renderer/media/audio_message_filter.h

Index: content/renderer/media/audio_message_filter.h
diff --git a/content/renderer/media/audio_message_filter.h b/content/renderer/media/audio_message_filter.h
index c50dca4ce2acd2be087f8a1338328f2c1662f034..15a2867e40fac47130c91c9a713cd0c29488c872 100644
--- a/content/renderer/media/audio_message_filter.h
+++ b/content/renderer/media/audio_message_filter.h
@@ -20,31 +20,25 @@
 #include "media/audio/audio_output_ipc.h"
 
 class CONTENT_EXPORT AudioMessageFilter
-    : public IPC::ChannelProxy::MessageFilter,
-      public NON_EXPORTED_BASE(media::AudioOutputIPC) {
+    : public IPC::ChannelProxy::MessageFilter {
  public:
   AudioMessageFilter();
 
   // Getter for the one AudioMessageFilter object.
   static AudioMessageFilter* Get();
 
-  // media::AudioOutputIPCDelegate implementation.
-  virtual int AddDelegate(media::AudioOutputIPCDelegate* delegate) OVERRIDE;
-  virtual void RemoveDelegate(int id) OVERRIDE;
-  virtual void CreateStream(int stream_id,
-      const media::AudioParameters& params) OVERRIDE;
-  virtual void PlayStream(int stream_id) OVERRIDE;
-  virtual void PauseStream(int stream_id) OVERRIDE;
-  virtual void FlushStream(int stream_id) OVERRIDE;
-  virtual void CloseStream(int stream_id) OVERRIDE;
-  virtual void SetVolume(int stream_id, double volume) OVERRIDE;
-
   // IPC::ChannelProxy::MessageFilter override. Called on IO thread.
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
   virtual void OnFilterAdded(IPC::Channel* channel) OVERRIDE;
   virtual void OnFilterRemoved() OVERRIDE;
   virtual void OnChannelClosing() OVERRIDE;
 
+  // Sends an IPC message using |channel_|.
+  bool Send(IPC::Message* message);
+
+  int AddDelegate(media::AudioOutputIPCDelegate* delegate);
+  void RemoveDelegate(int id);
+
  protected:
   virtual ~AudioMessageFilter();
 
@@ -52,9 +46,6 @@ class CONTENT_EXPORT AudioMessageFilter
   FRIEND_TEST_ALL_PREFIXES(AudioMessageFilterTest, Basic);
   FRIEND_TEST_ALL_PREFIXES(AudioMessageFilterTest, Delegates);
 
-  // Sends an IPC message using |channel_|.
-  bool Send(IPC::Message* message);
-
   // Received when browser process has created an audio output stream.
   void OnStreamCreated(int stream_id, base::SharedMemoryHandle handle,
 #if defined(OS_WIN)