Merge AssociateStreamWithProducer message into CreateStream message for both audio output and input.

content/renderer/media/renderer_webaudiodevice_impl.h

Index: content/renderer/media/renderer_webaudiodevice_impl.h
diff --git a/content/renderer/media/renderer_webaudiodevice_impl.h b/content/renderer/media/renderer_webaudiodevice_impl.h
index ca19d0749054cb9c83f10895a8e88b5b7a88f89b..09c35d838fca14ce3ba8ddf7edc17ac98acdb0f5 100644
--- a/content/renderer/media/renderer_webaudiodevice_impl.h
+++ b/content/renderer/media/renderer_webaudiodevice_impl.h
@@ -12,9 +12,11 @@
 #include "third_party/WebKit/Source/Platform/chromium/public/WebAudioDevice.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebVector.h"
 
-namespace content {
+namespace media {
+class AudioOutputDevice;
+}
 
-class RendererAudioOutputDevice;
+namespace content {
 
 class RendererWebAudioDeviceImpl
     : public WebKit::WebAudioDevice,
@@ -50,7 +52,7 @@ class RendererWebAudioDeviceImpl
   base::ThreadChecker thread_checker_;
 
   // When non-NULL, we are started.  When NULL, we are stopped.
-  scoped_refptr<RendererAudioOutputDevice> output_device_;
+  scoped_refptr<media::AudioOutputDevice> output_device_;
 
   DISALLOW_COPY_AND_ASSIGN(RendererWebAudioDeviceImpl);
 };