Check media permissions (mic/camera) before exposing local addresses to WebRTC.

content/renderer/p2p/port_allocator.cc

Index: content/renderer/p2p/port_allocator.cc
diff --git a/content/renderer/p2p/port_allocator.cc b/content/renderer/p2p/port_allocator.cc
index 73112ddb3d0876755bfaa3715a4a50866b8aee25..76e820a82b6e3d4b9f52c8ce8d06a7b19967ba0f 100644
--- a/content/renderer/p2p/port_allocator.cc
+++ b/content/renderer/p2p/port_allocator.cc
@@ -7,6 +7,7 @@
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "content/public/common/content_switches.h"
+#include "content/renderer/p2p/socket_dispatcher.h"
 
 namespace content {
 
@@ -22,17 +23,26 @@ P2PPortAllocator::Config::RelayServerConfig::RelayServerConfig()
 P2PPortAllocator::Config::RelayServerConfig::~RelayServerConfig() {
 }
 
-P2PPortAllocator::P2PPortAllocator(
-    P2PSocketDispatcher* socket_dispatcher,
-    rtc::NetworkManager* network_manager,
+P2PPortAllocator::Params::Params(
+    const scoped_refptr<P2PSocketDispatcher>& socket_dispatcher,
     rtc::PacketSocketFactory* socket_factory,
-    const Config& config,
-    const GURL& origin)
-    : cricket::BasicPortAllocator(network_manager, socket_factory),
-      socket_dispatcher_(socket_dispatcher),
-      config_(config),
-      origin_(origin)
-  {
+    const GURL& origin,
+    const Config& config)
+    : socket_dispatcher(socket_dispatcher),
+      socket_factory(socket_factory),
+      requesting_origin(origin),
+      config(config) {}
+
+P2PPortAllocator::Params::~Params() {}
+
+P2PPortAllocator::P2PPortAllocator(
+    const Params& params,
+    scoped_ptr<rtc::NetworkManager> network_manager)
+    : cricket::BasicPortAllocator(network_manager.get(), params.socket_factory),
+      network_manager_(network_manager.Pass()),
+      socket_dispatcher_(params.socket_dispatcher),
+      config_(params.config),
+      origin_(params.requesting_origin) {
   uint32 flags = 0;
   if (!config_.enable_multiple_routes)
     flags |= cricket::PORTALLOCATOR_DISABLE_ADAPTER_ENUMERATION;
@@ -47,7 +57,7 @@ P2PPortAllocator::P2PPortAllocator(
   bool enable_webrtc_stun_origin =
       cmd_line->HasSwitch(switches::kEnableWebRtcStunOrigin);
   if (enable_webrtc_stun_origin) {
-    set_origin(origin.spec());
+    set_origin(origin_.spec());
   }
 }