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

content/renderer/media/audio_input_message_filter.h

 // 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.
 //
 // MessageFilter that handles audio input messages and delegates them to
 // audio capturers. Created on render thread, AudioMessageFilter is operated on
 // IO thread (secondary thread of render process), it intercepts audio messages
 // and process them on IO thread since these messages are time critical.
 
 #ifndef CONTENT_RENDERER_MEDIA_AUDIO_INPUT_MESSAGE_FILTER_H_
 #define CONTENT_RENDERER_MEDIA_AUDIO_INPUT_MESSAGE_FILTER_H_
 
 #include "base/id_map.h"
 #include "base/shared_memory.h"
 #include "base/sync_socket.h"
 #include "content/common/content_export.h"
 #include "ipc/ipc_channel_proxy.h"
 #include "media/audio/audio_buffers_state.h"
 #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_|.
   bool Send(IPC::Message* message);
 
   // 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;
@@ skipping 16 matching lines @@
                             media::AudioInputIPCDelegate::State state);
 
   // Notification of the opened device of an audio session.
   void OnDeviceStarted(int stream_id, const std::string& device_id);
 
   // A map of stream ids to delegates.
   IDMap<media::AudioInputIPCDelegate> delegates_;
 
   IPC::Channel* channel_;
 
-  // The singleton instance for this filter.
-  static AudioInputMessageFilter* filter_;
-
   DISALLOW_COPY_AND_ASSIGN(AudioInputMessageFilter);
 };
 
 #endif  // CONTENT_RENDERER_MEDIA_AUDIO_INPUT_MESSAGE_FILTER_H_