Moving WebRTC logging related files from content to chrome.

content/renderer/media/media_stream_dependency_factory.cc

 // 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.
 
 #include "content/renderer/media/media_stream_dependency_factory.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/utf_string_conversions.h"
 #include "content/public/common/content_switches.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"
 #include "content/renderer/media/rtc_video_capturer.h"
 #include "content/renderer/media/video_capture_impl_manager.h"
 #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_impl.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"
 #include "content/renderer/p2p/port_allocator.h"
 #include "content/renderer/render_thread_impl.h"
 #include "jingle/glue/thread_wrapper.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebMediaConstraints.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebMediaStream.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebMediaStreamSource.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebMediaStreamTrack.h"
@@ skipping 177 matching lines @@
 };
 
 MediaStreamDependencyFactory::MediaStreamDependencyFactory(
     VideoCaptureImplManager* vc_manager,
     P2PSocketDispatcher* p2p_socket_dispatcher)
     : network_manager_(NULL),
       vc_manager_(vc_manager),
       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() {
   CleanupPeerConnectionFactory();
 }
 
 WebKit::WebRTCPeerConnectionHandler*
 MediaStreamDependencyFactory::CreateRTCPeerConnectionHandler(
     WebKit::WebRTCPeerConnectionHandlerClient* client) {
   // Save histogram data so we can see how much PeerConnetion is used.
@@ skipping 267 matching lines @@
     const webrtc::PeerConnectionInterface::IceServers& ice_servers,
     const webrtc::MediaConstraintsInterface* constraints,
     WebKit::WebFrame* web_frame,
     webrtc::PeerConnectionObserver* observer) {
   CHECK(web_frame);
   CHECK(observer);
 
   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));
   }
 
   scoped_refptr<P2PPortAllocatorFactory> pa_factory =
         new talk_base::RefCountedObject<P2PPortAllocatorFactory>(
             p2p_socket_dispatcher_.get(),
             network_manager_,
             socket_factory_.get(),
             web_frame);
@@ skipping 254 matching lines @@
       // Stopping the thread will wait until all tasks have been
       // processed before returning. We wait for the above task to finish before
       // letting the the function continue to avoid any potential race issues.
       chrome_worker_thread_.Stop();
     } else {
       NOTREACHED() << "Worker thread not running.";
     }
   }
 }
 
-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