Index: content/renderer/media/media_stream_dependency_factory.cc |
diff --git a/content/renderer/media/media_stream_dependency_factory.cc b/content/renderer/media/media_stream_dependency_factory.cc |
index a7d133bba214c7bd9619ae0bf507ece90c1bd088..d020bb97b89d317865a19c244dacb74a2ab33ce2 100644 |
--- a/content/renderer/media/media_stream_dependency_factory.cc |
+++ b/content/renderer/media/media_stream_dependency_factory.cc |
@@ -8,6 +8,7 @@ |
#include "base/synchronization/waitable_event.h" |
#include "base/utf_string_conversions.h" |
+#include "content/public/renderer/content_renderer_client.h" |
#include "content/renderer/media/media_stream_source_extra_data.h" |
#include "content/renderer/media/rtc_media_constraints.h" |
#include "content/renderer/media/rtc_peer_connection_handler.h" |
@@ -16,8 +17,8 @@ |
#include "content/renderer/media/webaudio_capturer_source.h" |
#include "content/renderer/media/webrtc_audio_device_impl.h" |
#include "content/renderer/media/webrtc_local_audio_track.h" |
-#include "content/renderer/media/webrtc_logging_handler_impl.h" |
-#include "content/renderer/media/webrtc_logging_message_filter.h" |
+//#include "content/renderer/media/webrtc_logging_handler_impl.h" |
+//#include "content/renderer/media/webrtc_logging_message_filter.h" |
Avi (use Gerrit)
2013/05/22 14:39:57
don't comment out lines
Henrik Grunell
2013/05/23 12:50:11
Oops, missed that. Thanks. Done.
|
#include "content/renderer/media/webrtc_uma_histograms.h" |
#include "content/renderer/p2p/ipc_network_manager.h" |
#include "content/renderer/p2p/ipc_socket_factory.h" |
@@ -498,13 +499,7 @@ MediaStreamDependencyFactory::CreatePeerConnection( |
optional_constraints.FindFirst(kWebRtcLoggingConstraint, |
&constraint_value)) { |
webrtc_log_open_ = true; |
- |
- RenderThreadImpl::current()->GetIOMessageLoopProxy()->PostTask( |
- FROM_HERE, base::Bind( |
- &MediaStreamDependencyFactory::CreateWebRtcLoggingHandler, |
- base::Unretained(this), |
- RenderThreadImpl::current()->webrtc_logging_message_filter(), |
- constraint_value)); |
+ GetContentClient()->renderer()->InitWebRtcLogging(constraint_value); |
} |
scoped_refptr<P2PPortAllocatorFactory> pa_factory = |
@@ -777,14 +772,4 @@ void MediaStreamDependencyFactory::CleanupPeerConnectionFactory() { |
} |
} |
-void MediaStreamDependencyFactory::CreateWebRtcLoggingHandler( |
- WebRtcLoggingMessageFilter* filter, |
- const std::string& app_session_id) { |
- WebRtcLoggingHandlerImpl* handler = |
- new WebRtcLoggingHandlerImpl(filter->io_message_loop()); |
- |
- // TODO(grunell): Give app session id as parameter. |
- filter->InitLogging(handler); |
-} |
- |
} // namespace content |