Merge AudioRendererImpl and AudioRendererBase; add NullAudioSink

content/renderer/media/audio_device.cc

Index: content/renderer/media/audio_device.cc
diff --git a/content/renderer/media/audio_device.cc b/content/renderer/media/audio_device.cc
index 60e36a729b91b5450e97548a561f6f976415aa05..270286ee7b64ef221ada0a0d1e42db899ced81ce 100644
--- a/content/renderer/media/audio_device.cc
+++ b/content/renderer/media/audio_device.cc
@@ -88,7 +88,8 @@ AudioDevice::~AudioDevice() {
 void AudioDevice::Start() {
   DCHECK(callback_) << "Initialize hasn't been called";
   message_loop()->PostTask(FROM_HERE,
-      base::Bind(&AudioDevice::InitializeOnIOThread, this, audio_parameters_));
+      base::Bind(&AudioDevice::CreateStreamOnIOThread, this,
+                 audio_parameters_));
 }
 
 void AudioDevice::Stop() {
@@ -130,7 +131,7 @@ void AudioDevice::GetVolume(double* volume) {
   *volume = volume_;
 }
 
-void AudioDevice::InitializeOnIOThread(const media::AudioParameters& params) {
+void AudioDevice::CreateStreamOnIOThread(const media::AudioParameters& params) {
   DCHECK(message_loop()->BelongsToCurrentThread());
   // Make sure we don't create the stream more than once.
   DCHECK_EQ(0, stream_id_);