Rolling libjingle to 158:159

content/renderer/p2p/port_allocator.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/p2p/port_allocator.h"
 
 #include "base/bind.h"
 #include "base/string_number_conversions.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
@@ skipping 65 matching lines @@
   return new P2PPortAllocatorSession(
       this, component, ice_username_fragment, ice_password);
 }
 
 P2PPortAllocatorSession::P2PPortAllocatorSession(
     P2PPortAllocator* allocator,
     int component,
     const std::string& ice_username_fragment,
     const std::string& ice_password)
     : cricket::BasicPortAllocatorSession(
-        allocator, component,
+        allocator, "", component,
         ice_username_fragment, ice_password),
       allocator_(allocator),
       relay_session_attempts_(0),
       relay_udp_port_(0),
       relay_tcp_port_(0),
       relay_ssltcp_port_(0) {
 }
 
 P2PPortAllocatorSession::~P2PPortAllocatorSession() {
   if (stun_address_request_)
@@ skipping 197 matching lines @@
       talk_base::SocketAddress address(relay_ip_.ip(), relay_ssltcp_port_);
       ports.push_back(cricket::ProtocolAddress(address, cricket::PROTO_SSLTCP));
     }
     if (!ports.empty())
       config->AddRelay(ports, 0.0f);
   }
   ConfigReady(config);
 }
 
 }  // namespace content