Forwarding app URL to handler host for WebRTC logs.

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"
@@ skipping 12 matching lines @@
 #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"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 
 #if defined(USE_OPENSSL)
 #include "third_party/libjingle/source/talk/base/ssladapter.h"
 #else
 #include "net/socket/nss_ssl_util.h"
 #endif
 
 namespace content {
 
@@ skipping 458 matching lines @@
   CHECK(web_frame);
   CHECK(observer);
 
   webrtc::MediaConstraintsInterface::Constraints optional_constraints =
       constraints->GetOptional();
   std::string constraint_value;
   if (!webrtc_log_open_ &&
       optional_constraints.FindFirst(kWebRtcLoggingConstraint,
                                      &constraint_value)) {
     webrtc_log_open_ = true;
+    std::string url = web_frame->document().url().spec().data();

[tommi (sloooow) - chröme, 2013/05/25 11:44:04]

why call data()?  using std::string's copy constructor might be better but I'm
curious why you need to bypass that.

[Henrik Grunell, 2013/05/27 11:21:50]

That's totally unnecessary, I just didn't notice the operator in WebCString.
Thanks. Fixed.

[tommi (sloooow) - chröme, 2013/05/27 11:33:33]

Sorry, I actually thought I was looking at a GURL variable, so I was expecting
spec() to return std::string. My bad.

 
     RenderThreadImpl::current()->GetIOMessageLoopProxy()->PostTask(
         FROM_HERE, base::Bind(
             &MediaStreamDependencyFactory::CreateWebRtcLoggingHandler,
             base::Unretained(this),
             RenderThreadImpl::current()->webrtc_logging_message_filter(),
-            constraint_value));
+            constraint_value,
+            url));
   }
 
   scoped_refptr<P2PPortAllocatorFactory> pa_factory =
         new talk_base::RefCountedObject<P2PPortAllocatorFactory>(
             p2p_socket_dispatcher_.get(),
             network_manager_,
             socket_factory_.get(),
             web_frame);
   return pc_factory_->CreatePeerConnection(
       ice_servers, constraints, pa_factory, observer).get();
@@ skipping 254 matching lines @@
       // 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_session_id,
+    const std::string& app_url) {
   WebRtcLoggingHandlerImpl* handler =
       new WebRtcLoggingHandlerImpl(filter->io_message_loop());
-  filter->InitLogging(handler, app_session_id);
+  filter->InitLogging(handler, app_session_id, app_url);
 }
 
 }  // namespace content