Merge AudioRendererImpl and AudioRendererBase; add NullAudioSink

content/renderer/media/webrtc_audio_device_impl.h

Index: content/renderer/media/webrtc_audio_device_impl.h
diff --git a/content/renderer/media/webrtc_audio_device_impl.h b/content/renderer/media/webrtc_audio_device_impl.h
index 6937495e87b91441791ee369c12736e3291e5c97..42c067e471d9bce28a6f2d3e2192854076138428 100644
--- a/content/renderer/media/webrtc_audio_device_impl.h
+++ b/content/renderer/media/webrtc_audio_device_impl.h
@@ -112,15 +112,15 @@ class CONTENT_EXPORT WebRtcAudioDeviceImpl
   static bool ImplementsThreadSafeReferenceCounting() { return true; }
 
   // AudioDevice::RenderCallback implementation.
-  virtual size_t Render(const std::vector<float*>& audio_data,
-                        size_t number_of_frames,
-                        size_t audio_delay_milliseconds) OVERRIDE;
+  virtual int Render(const std::vector<float*>& audio_data,
+                     int number_of_frames,
+                     int audio_delay_milliseconds) OVERRIDE;
   virtual void OnRenderError() OVERRIDE;
 
   // AudioInputDevice::CaptureCallback implementation.
   virtual void Capture(const std::vector<float*>& audio_data,
-                       size_t number_of_frames,
-                       size_t audio_delay_milliseconds) OVERRIDE;
+                       int number_of_frames,
+                       int audio_delay_milliseconds) OVERRIDE;
   virtual void OnCaptureError() OVERRIDE;
 
   // AudioInputDevice::CaptureEventHandler implementation.
@@ -254,10 +254,10 @@ class CONTENT_EXPORT WebRtcAudioDeviceImpl
   void SetSessionId(int session_id);
 
   // Accessors.
-  size_t input_buffer_size() const {
+  int input_buffer_size() const {
     return input_audio_parameters_.frames_per_buffer();
   }
-  size_t output_buffer_size() const {
+  int output_buffer_size() const {
     return input_audio_parameters_.frames_per_buffer();

[tommi (sloooow) - chröme, 2012/03/26 10:57:25]

fyi - this has been fixed on trunk.

[vrk (LEFT CHROMIUM), 2012/04/02 21:17:54]

D'oh! Thanks :)

   }
   int input_channels() const {