Index: content/renderer/render_thread_impl.cc |
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc |
index dd75520bbd51798da537b82a36a2d04de1b0bb28..93ec9cf006aed3766bccd2d4a64bc5b10911d860 100644 |
--- a/content/renderer/render_thread_impl.cc |
+++ b/content/renderer/render_thread_impl.cc |
@@ -377,9 +377,9 @@ void RenderThreadImpl::Init() { |
webrtc_identity_service_.reset(new WebRTCIdentityService()); |
- media_stream_factory_.reset(new PeerConnectionDependencyFactory( |
+ peer_connection_factory_.reset(new PeerConnectionDependencyFactory( |
p2p_socket_dispatcher_.get())); |
- AddObserver(media_stream_factory_.get()); |
+ AddObserver(peer_connection_factory_.get()); |
#endif // defined(ENABLE_WEBRTC) |
audio_input_message_filter_ = |
@@ -533,10 +533,8 @@ void RenderThreadImpl::Shutdown() { |
RemoveFilter(audio_message_filter_.get()); |
audio_message_filter_ = NULL; |
- // |media_stream_factory_| produces users of |vc_manager_| so it must be |
- // destroyed first. |
#if defined(ENABLE_WEBRTC) |
- media_stream_factory_.reset(); |
+ peer_connection_factory_.reset(); |
#endif |
RemoveFilter(vc_manager_->video_capture_message_filter()); |
vc_manager_.reset(); |
@@ -1326,7 +1324,7 @@ blink::WebMediaStreamCenter* RenderThreadImpl::CreateMediaStreamCenter( |
PeerConnectionDependencyFactory* |
RenderThreadImpl::GetPeerConnectionDependencyFactory() { |
- return media_stream_factory_.get(); |
+ return peer_connection_factory_.get(); |
} |
GpuChannelHost* RenderThreadImpl::GetGpuChannel() { |