Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(582)

Unified Diff: content/renderer/media/media_stream_dependency_factory.cc

Issue 15741003: Moving WebRTC logging related files from content to chrome. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 4faebcf951cb89a465e2a6959fc80277a20c8822..32f4d01dcac89306b0e125f84c722f6d82a0da71 100644
--- a/content/renderer/media/media_stream_dependency_factory.cc
+++ b/content/renderer/media/media_stream_dependency_factory.cc
@@ -18,8 +18,7 @@
#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_initializer.h"
#include "content/renderer/media/webrtc_uma_histograms.h"
#include "content/renderer/p2p/ipc_network_manager.h"
#include "content/renderer/p2p/ipc_socket_factory.h"
@@ -217,8 +216,7 @@ MediaStreamDependencyFactory::MediaStreamDependencyFactory(
p2p_socket_dispatcher_(p2p_socket_dispatcher),
signaling_thread_(NULL),
worker_thread_(NULL),
- chrome_worker_thread_("Chrome_libJingle_WorkerThread"),
- webrtc_log_open_(false) {
+ chrome_worker_thread_("Chrome_libJingle_WorkerThread") {
}
MediaStreamDependencyFactory::~MediaStreamDependencyFactory() {
@@ -506,17 +504,12 @@ MediaStreamDependencyFactory::CreatePeerConnection(
webrtc::MediaConstraintsInterface::Constraints optional_constraints =
constraints->GetOptional();
std::string constraint_value;
- if (!webrtc_log_open_ &&
- optional_constraints.FindFirst(kWebRtcLoggingConstraint,
+ if (optional_constraints.FindFirst(kWebRtcLoggingConstraint,
&constraint_value)) {
- webrtc_log_open_ = true;
std::string url = web_frame->document().url().spec();
-
RenderThreadImpl::current()->GetIOMessageLoopProxy()->PostTask(
FROM_HERE, base::Bind(
- &MediaStreamDependencyFactory::CreateWebRtcLoggingHandler,
- base::Unretained(this),
- RenderThreadImpl::current()->webrtc_logging_message_filter(),
+ &InitWebRtcLogging,
constraint_value,
url));
}
@@ -791,13 +784,4 @@ void MediaStreamDependencyFactory::CleanupPeerConnectionFactory() {
}
}
-void MediaStreamDependencyFactory::CreateWebRtcLoggingHandler(
- WebRtcLoggingMessageFilter* filter,
- const std::string& app_session_id,
- const std::string& app_url) {
- WebRtcLoggingHandlerImpl* handler =
- new WebRtcLoggingHandlerImpl(filter->io_message_loop());
- filter->InitLogging(handler, app_session_id, app_url);
-}
-
} // namespace content
« no previous file with comments | « content/renderer/media/media_stream_dependency_factory.h ('k') | content/renderer/media/webrtc_logging_handler_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698