Adds AudioDevice factory for all audio clients in Chrome

content/renderer/media/media_stream_impl.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.
 
 #ifndef CONTENT_RENDERER_MEDIA_MEDIA_STREAM_IMPL_H_
 #define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_IMPL_H_
 
 #include <list>
 #include <map>
 #include <string>
@@ skipping 36 matching lines @@
 namespace WebKit {
 class WebFrame;
 class WebMediaStreamComponent;
 class WebMediaStreamDescriptor;
 class WebPeerConnection00Handler;
 class WebPeerConnection00HandlerClient;
 class WebPeerConnectionHandler;
 class WebPeerConnectionHandlerClient;
 }
 
+class AudioDeviceFactoryInterface;
 class MediaStreamDispatcher;
 class MediaStreamDependencyFactory;
 class PeerConnectionHandlerBase;
 class VideoCaptureImplManager;
 class RTCVideoDecoder;
 
 // MediaStreamImpl is a delegate for the Media Stream API messages used by
 // WebKit. It ties together WebKit, native PeerConnection in libjingle and
 // MediaStreamManager (via MediaStreamDispatcher and MediaStreamDispatcherHost)
 // in the browser process. It must be created, called and destroyed on the
 // render thread.
 // MediaStreamImpl have weak pointers to a P2PSocketDispatcher and a
 // MediaStreamDispatcher. These objects are also RenderViewObservers.
 // MediaStreamImpl must be deleted before the P2PSocketDispatcher.
 class CONTENT_EXPORT MediaStreamImpl
     : public content::RenderViewObserver,
       NON_EXPORTED_BASE(public WebKit::WebUserMediaClient),
       NON_EXPORTED_BASE(public webkit_media::MediaStreamClient),
       public MediaStreamDispatcherEventHandler,
       public base::SupportsWeakPtr<MediaStreamImpl>,
       NON_EXPORTED_BASE(public content::P2PSocketDispatcherDestructionObserver),
       NON_EXPORTED_BASE(public base::NonThreadSafe) {
  public:
   MediaStreamImpl(
       content::RenderView* render_view,
       MediaStreamDispatcher* media_stream_dispatcher,
       content::P2PSocketDispatcher* p2p_socket_dispatcher,
       VideoCaptureImplManager* vc_manager,
-      MediaStreamDependencyFactory* dependency_factory);
+      MediaStreamDependencyFactory* dependency_factory,
+      AudioDeviceFactoryInterface* audio_device_factory);
   virtual ~MediaStreamImpl();
 
   virtual WebKit::WebPeerConnectionHandler* CreatePeerConnectionHandler(
       WebKit::WebPeerConnectionHandlerClient* client);
   virtual WebKit::WebPeerConnection00Handler* CreatePeerConnectionHandlerJsep(
       WebKit::WebPeerConnection00HandlerClient* client);
   // Stops a local MediaStream by notifying the MediaStreamDispatcher that the
   // stream no longer may be used.
   virtual void StopLocalMediaStream(
       const WebKit::WebMediaStreamDescriptor& stream);
@@ skipping 118 matching lines @@
   scoped_ptr<MediaStreamDependencyFactory> dependency_factory_;
 
   // media_stream_dispatcher_ is a weak reference, owned by RenderView. It's
   // valid for the lifetime of RenderView.
   MediaStreamDispatcher* media_stream_dispatcher_;
 
   // p2p_socket_dispatcher_ is a weak reference, owned by RenderView. It's valid
   // for the lifetime of RenderView.
   content::P2PSocketDispatcher* p2p_socket_dispatcher_;
 
+  // audio_device_factory is a weak reference, owned by RenderView. It's valid
+  // for the lifetime of RenderView.
+  AudioDeviceFactoryInterface* audio_device_factory_;
+
   // We own network_manager_, must be deleted on the worker thread.
   // The network manager uses |p2p_socket_dispatcher_|.
   content::IpcNetworkManager* network_manager_;
   scoped_ptr<content::IpcPacketSocketFactory> socket_factory_;
   scoped_refptr<VideoCaptureImplManager> vc_manager_;
 
   MediaRequestMap user_media_requests_;
   LocalNativeStreamMap local_media_streams_;
 
   // PeerConnection threads. signaling_thread_ is created from the
   // "current" chrome thread.
   talk_base::Thread* signaling_thread_;
   talk_base::Thread* worker_thread_;
   base::Thread chrome_worker_thread_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaStreamImpl);
 };
 
 #endif  // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_IMPL_H_