Adding a skeleton MediaStreamCenter.

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 23 matching lines @@
 class IpcNetworkManager;
 class IpcPacketSocketFactory;
 class P2PSocketDispatcher;
 }
 
 namespace talk_base {
 class Thread;
 }
 
 namespace WebKit {
+class WebMediaStreamCenter;
+class WebMediaStreamCenterClient;
 class WebPeerConnectionHandler;
 class WebPeerConnectionHandlerClient;
 }
 
+class MediaStreamCenter;
 class MediaStreamDispatcher;
 class MediaStreamDependencyFactory;
 class PeerConnectionHandler;
 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.
 class CONTENT_EXPORT MediaStreamImpl
     : NON_EXPORTED_BASE(public WebKit::WebUserMediaClient),
       NON_EXPORTED_BASE(public webkit_media::MediaStreamClient),
       public MediaStreamDispatcherEventHandler,
       NON_EXPORTED_BASE(public base::NonThreadSafe),
       public base::RefCountedThreadSafe<MediaStreamImpl> {
  public:
   MediaStreamImpl(
       MediaStreamDispatcher* media_stream_dispatcher,
       content::P2PSocketDispatcher* p2p_socket_dispatcher,
       VideoCaptureImplManager* vc_manager,
       MediaStreamDependencyFactory* dependency_factory);
   virtual ~MediaStreamImpl();
 
   virtual WebKit::WebPeerConnectionHandler* CreatePeerConnectionHandler(
       WebKit::WebPeerConnectionHandlerClient* client);
+  virtual WebKit::WebMediaStreamCenter* CreateMediaStreamCenter(
+      WebKit::WebMediaStreamCenterClient* client);
   virtual void ClosePeerConnection();
   virtual webrtc::MediaStreamTrackInterface* GetLocalMediaStreamTrack(
       const std::string& label);
 
   // WebKit::WebUserMediaClient implementation
   virtual void requestUserMedia(
       const WebKit::WebUserMediaRequest& user_media_request,
       const WebKit::WebVector<WebKit::WebMediaStreamSource>&
           media_stream_source_vector) OVERRIDE;
   virtual void cancelUserMediaRequest(
@@ skipping 66 matching lines @@
 
   scoped_ptr<content::IpcPacketSocketFactory> socket_factory_;
 
   scoped_refptr<VideoCaptureImplManager> vc_manager_;
 
   // peer_connection_handler_ is a weak reference, owned by WebKit. It's valid
   // until stop is called on it (which will call ClosePeerConnection on us).
   // TODO(grunell): Support several PeerConnectionsHandlers.
   PeerConnectionHandler* peer_connection_handler_;
 
+  // media_stream_center_ is a weak reference, owned by WebKit. It's valid for

[piman, 2012/02/08 01:52:24]

"weak reference" suggests base::WeakPtr, which this is not. Could you say "raw
pointer" instead?

[tommyw, 2012/02/08 13:14:18]

Done.

+  // the lifetime of RenderView.
+  MediaStreamCenter* media_stream_center_;
+
   // We keep a list of the generated local tracks, so that we can add capture
   // devices when generated and also use them for recording.
   typedef talk_base::scoped_refptr<webrtc::MediaStreamTrackInterface>
       MediaStreamTrackPtr;
   typedef std::map<std::string, MediaStreamTrackPtr> MediaStreamTrackPtrMap;
   MediaStreamTrackPtrMap local_tracks_;
 
   talk_base::scoped_refptr<VideoRendererWrapper> video_renderer_;
   scoped_refptr<base::MessageLoopProxy> message_loop_proxy_;
 
   // 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_;
 
   static int next_request_id_;
   typedef std::map<int, WebKit::WebUserMediaRequest> MediaRequestMap;
   MediaRequestMap user_media_requests_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaStreamImpl);
 };
 
 #endif  // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_IMPL_H_