Revert 131949 (multiple memory leaks) - Adding JSEP PeerConnection glue.

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>
-#include <utility>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop_proxy.h"
 #include "base/threading/non_thread_safe.h"
 #include "base/threading/thread.h"
@@ skipping 14 matching lines @@
 class IpcNetworkManager;
 class IpcPacketSocketFactory;
 class P2PSocketDispatcher;
 }
 
 namespace talk_base {
 class Thread;
 }
 
 namespace WebKit {
-class WebPeerConnection00Handler;
-class WebPeerConnection00HandlerClient;
 class WebPeerConnectionHandler;
 class WebPeerConnectionHandlerClient;
 }
 
 class MediaStreamDispatcher;
 class MediaStreamDependencyFactory;
-class PeerConnectionHandlerBase;
+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 base::SupportsWeakPtr<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::WebPeerConnection00Handler* CreatePeerConnectionHandlerJsep(
-      WebKit::WebPeerConnection00HandlerClient* client);
-  virtual void ClosePeerConnection(PeerConnectionHandlerBase* pc_handler);
+  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>& audio_sources,
       const WebKit::WebVector<WebKit::WebMediaStreamSource>& video_sources)
       OVERRIDE;
   virtual void cancelUserMediaRequest(
@@ skipping 22 matching lines @@
       const media_stream::StreamDeviceInfoArray& device_array) OVERRIDE;
   virtual void OnDevicesEnumerationFailed(int request_id) OVERRIDE;
   virtual void OnDeviceOpened(
       int request_id,
       const std::string& label,
       const media_stream::StreamDeviceInfo& device_info) OVERRIDE;
   virtual void OnDeviceOpenFailed(int request_id) OVERRIDE;
 
  private:
   FRIEND_TEST_ALL_PREFIXES(MediaStreamImplTest, Basic);
-  FRIEND_TEST_ALL_PREFIXES(MediaStreamImplTest, MultiplePeerConnections);
 
   class VideoRendererWrapper : public webrtc::VideoRendererWrapperInterface {
    public:
     VideoRendererWrapper();
     virtual cricket::VideoRenderer* renderer() OVERRIDE {
       return rtc_video_decoder_.get();
     }
     void SetVideoDecoder(RTCVideoDecoder* decoder);
 
    protected:
@@ skipping 22 matching lines @@
   // for the lifetime of RenderView.
   content::P2PSocketDispatcher* p2p_socket_dispatcher_;
 
   // We own network_manager_, must be deleted on the worker thread.
   content::IpcNetworkManager* network_manager_;
 
   scoped_ptr<content::IpcPacketSocketFactory> socket_factory_;
 
   scoped_refptr<VideoCaptureImplManager> vc_manager_;
 
-  // peer_connection_handlers_ contains raw references, owned by WebKit. A
-  // pointer is valid until stop is called on the object (which will call
-  // ClosePeerConnection on us and we remove the pointer).
-  std::list<PeerConnectionHandlerBase*> peer_connection_handlers_;
+  // 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_;
 
   // 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_;
 
-  // Native PeerConnection only supports 1:1 mapping between MediaStream and
-  // video tag/renderer, so we restrict to this too.  The key in
-  // VideoRendererMap is the stream label.
-  typedef talk_base::scoped_refptr<VideoRendererWrapper> VideoRendererPtr;
-  typedef std::pair<VideoRendererPtr, PeerConnectionHandlerBase*>
-      VideoRendererPair;
-  typedef std::map<std::string, VideoRendererPair> VideoRendererMap;
-  VideoRendererMap video_renderers_;
+  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_