| Index: content/renderer/render_view_impl.cc
|
| diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
|
| index ad0d19abf0f789217ed8dc928a06a1beafba09ba..cbfdfa645a576de291aa65e3e91cc1a3998f6db1 100644
|
| --- a/content/renderer/render_view_impl.cc
|
| +++ b/content/renderer/render_view_impl.cc
|
| @@ -85,7 +85,6 @@
|
| #include "content/renderer/media/renderer_gpu_video_decoder_factories.h"
|
| #include "content/renderer/mhtml_generator.h"
|
| #include "content/renderer/notification_provider.h"
|
| -#include "content/renderer/p2p/socket_dispatcher.h"
|
| #include "content/renderer/plugin_channel_host.h"
|
| #include "content/renderer/render_process.h"
|
| #include "content/renderer/render_thread_impl.h"
|
| @@ -606,7 +605,6 @@ RenderViewImpl::RenderViewImpl(
|
| device_orientation_dispatcher_(NULL),
|
| media_stream_dispatcher_(NULL),
|
| media_stream_impl_(NULL),
|
| - p2p_socket_dispatcher_(NULL),
|
| devtools_agent_(NULL),
|
| accessibility_mode_(AccessibilityModeOff),
|
| renderer_accessibility_(NULL),
|
| @@ -701,8 +699,6 @@ RenderViewImpl::RenderViewImpl(
|
| host_window_ = parent_hwnd;
|
|
|
| #if defined(ENABLE_WEBRTC)
|
| - if (!p2p_socket_dispatcher_)
|
| - p2p_socket_dispatcher_ = new content::P2PSocketDispatcher(this);
|
| if (!media_stream_dispatcher_)
|
| media_stream_dispatcher_ = new MediaStreamDispatcher(this);
|
| #endif
|
| @@ -3790,9 +3786,6 @@ void RenderViewImpl::EnsureMediaStreamImpl() {
|
| return;
|
|
|
| #if defined(ENABLE_WEBRTC)
|
| - if (!p2p_socket_dispatcher_)
|
| - p2p_socket_dispatcher_ = new content::P2PSocketDispatcher(this);
|
| -
|
| if (!media_stream_dispatcher_)
|
| media_stream_dispatcher_ = new MediaStreamDispatcher(this);
|
|
|
| @@ -3802,7 +3795,7 @@ void RenderViewImpl::EnsureMediaStreamImpl() {
|
| media_stream_impl_ = new MediaStreamImpl(
|
| this,
|
| media_stream_dispatcher_,
|
| - p2p_socket_dispatcher_,
|
| + RenderThreadImpl::current()->p2p_socket_dispatcher(),
|
| RenderThreadImpl::current()->video_capture_impl_manager(),
|
| factory);
|
| }
|
|
|