Plumb render view ID from audio-related code in renderer through IPCs to AudioRendererHost in brows…

content/renderer/media/audio_input_message_filter.h

Index: content/renderer/media/audio_input_message_filter.h
diff --git a/content/renderer/media/audio_input_message_filter.h b/content/renderer/media/audio_input_message_filter.h
index ee99900d64e078e4f51c6c136a772b3e66182bcb..c2f52bebc3e27cd1f7fbee6faadec97939a6ba1c 100644
--- a/content/renderer/media/audio_input_message_filter.h
+++ b/content/renderer/media/audio_input_message_filter.h
@@ -19,26 +19,18 @@
 #include "media/audio/audio_input_ipc.h"
 
 class CONTENT_EXPORT AudioInputMessageFilter
-    : public IPC::ChannelProxy::MessageFilter,
-      public NON_EXPORTED_BASE(media::AudioInputIPC) {
+    : public IPC::ChannelProxy::MessageFilter {
  public:
   AudioInputMessageFilter();
 
-  // Getter for the one AudioInputMessageFilter object.
-  static AudioInputMessageFilter* Get();
-
-  // Implementation of AudioInputIPC.
-  virtual int AddDelegate(
-      media::AudioInputIPCDelegate* delegate) OVERRIDE;
-  virtual void RemoveDelegate(int id) OVERRIDE;
-  virtual void CreateStream(int stream_id, const media::AudioParameters& params,
-      const std::string& device_id, bool automatic_gain_control) OVERRIDE;
-  virtual void StartDevice(int stream_id, int session_id) OVERRIDE;
-  virtual void RecordStream(int stream_id) OVERRIDE;
-  virtual void CloseStream(int stream_id) OVERRIDE;
-  virtual void SetVolume(int stream_id, double volume) OVERRIDE;
+  // Creates an AudioInputIPC which is used to send messages to/from the host
+  // on behalf of a render view (i.e., the view which contains the object
+  // consuming the audio input).  Caller owns the returned object.
+  media::AudioInputIPC* CreateAudioInputIPC(int render_view_id);
 
  private:
+  class AudioInputIPCImpl;
+
   virtual ~AudioInputMessageFilter();
 
   // Sends an IPC message using |channel_|.
@@ -75,9 +67,6 @@ class CONTENT_EXPORT AudioInputMessageFilter
 
   IPC::Channel* channel_;
 
-  // The singleton instance for this filter.
-  static AudioInputMessageFilter* filter_;
-
   DISALLOW_COPY_AND_ASSIGN(AudioInputMessageFilter);
 };