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

content/content_renderer.gypi

 # 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.
 
 {
   'dependencies': [
     '../jingle/jingle.gyp:jingle_glue',
     '../net/net.gyp:net',
     '../skia/skia.gyp:skia',
     '../third_party/hyphen/hyphen.gyp:hyphen',
@@ skipping 123 matching lines @@
     'renderer/media/audio_renderer_mixer_manager.h',
     'renderer/media/media_stream_center.h',
     'renderer/media/media_stream_dependency_factory.h',
     'renderer/media/media_stream_dispatcher.h',
     'renderer/media/media_stream_dispatcher_eventhandler.h',
     'renderer/media/media_stream_impl.h',
     'renderer/media/pepper_platform_video_decoder_impl.cc',
     'renderer/media/pepper_platform_video_decoder_impl.h',
     'renderer/media/render_media_log.cc',
     'renderer/media/render_media_log.h',
-    'renderer/media/renderer_audio_output_device.cc',
-    'renderer/media/renderer_audio_output_device.h',
     'renderer/media/renderer_gpu_video_decoder_factories.cc',
     'renderer/media/renderer_gpu_video_decoder_factories.h',
     'renderer/media/renderer_webaudiodevice_impl.cc',
     'renderer/media/renderer_webaudiodevice_impl.h',
     'renderer/media/rtc_video_renderer.cc',
     'renderer/media/rtc_video_renderer.h',
     'renderer/media/stream_texture_factory_impl_android.cc',
     'renderer/media/stream_texture_factory_impl_android.h',
     'renderer/media/video_capture_impl.cc',
     'renderer/media/video_capture_impl.h',
@@ skipping 270 matching lines @@
     }],
   ],
   'target_conditions': [
     ['OS=="android"', {
       'sources/': [
         ['include', '^renderer/render_view_linux\\.cc$'],
       ],
     }],
   ],
 }