Refactor the P2PSocketDispatcher to be created on the RenderThread instead of the RenderView.

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 56 matching lines @@
 // 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);
   virtual ~MediaStreamImpl();
 
@@ skipping 41 matching lines @@
   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;
 
   // content::RenderViewObserver OVERRIDE
   virtual void FrameWillClose(WebKit::WebFrame* frame) OVERRIDE;
 
-  // content P2PSocketDispatcherDestructionObserver implementation.
-  // This is needed since all IpcNetworkManager must be deleted before the
-  // P2PSocketDispatcher is destroyed. MediaStreamImpl owns a IpcNetworkManager.
-  virtual void OnSocketDispatcherDestroyed() OVERRIDE;
-
  protected:
   // This function is virtual for test purposes. A test can override this to
   // test requesting local media streams. The function notifies WebKit that the
   // |request| have completed and generated the MediaStream |stream|.
   virtual void CompleteGetUserMediaRequest(
       const WebKit::WebMediaStreamDescriptor& stream,
       WebKit::WebUserMediaRequest* request);
   // This function is virtual for test purposes.
   // Returns the WebKit representation of a MediaStream given an URL.
   virtual WebKit::WebMediaStreamDescriptor GetMediaStream(const GURL& url);
@@ skipping 34 matching lines @@
       media::MessageLoopFactory* message_loop_factory);
   bool CreateNativeLocalMediaStream(
       WebKit::WebMediaStreamDescriptor* description);
 
   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_;
+  scoped_refptr<content::P2PSocketDispatcher> p2p_socket_dispatcher_;
 
   // 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_