Roll WebRTC 9687:9692, Libjingle 9690:9692

remoting/protocol/chromium_port_allocator.cc

 // Copyright 2014 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 "remoting/protocol/chromium_port_allocator.h"
 
 #include "base/bind.h"
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "net/http/http_status_code.h"
@@ skipping 125 matching lines @@
   scoped_ptr<rtc::NetworkManager> network_manager(
       new rtc::BasicNetworkManager());
   scoped_ptr<rtc::PacketSocketFactory> socket_factory(
       new ChromiumPacketSocketFactory());
   scoped_ptr<ChromiumPortAllocator> result(
       new ChromiumPortAllocator(url_context, network_manager.Pass(),
                             socket_factory.Pass()));
 
   // We always use PseudoTcp to provide a reliable channel. It provides poor
   // performance when combined with TCP-based transport, so we have to disable
-  // TCP ports. ENABLE_SHARED_UFRAG flag is specified so that the same username
-  // fragment is shared between all candidates for this channel.
+  // TCP ports.
   int flags = cricket::PORTALLOCATOR_DISABLE_TCP |
-              cricket::PORTALLOCATOR_ENABLE_SHARED_UFRAG |
               cricket::PORTALLOCATOR_ENABLE_IPV6;
 
   if (!(network_settings.flags & NetworkSettings::NAT_TRAVERSAL_STUN))
     flags |= cricket::PORTALLOCATOR_DISABLE_STUN;
 
   if (!(network_settings.flags & NetworkSettings::NAT_TRAVERSAL_RELAY))
     flags |= cricket::PORTALLOCATOR_DISABLE_RELAY;
 
   result->set_flags(flags);
   result->SetPortRange(network_settings.port_range.min_port,
@@ skipping 21 matching lines @@
     int component,
     const std::string& ice_username_fragment,
     const std::string& ice_password) {
   return new ChromiumPortAllocatorSession(
       this, content_name, component, ice_username_fragment, ice_password,
       stun_hosts(), relay_hosts(), relay_token(), url_context_);
 }
 
 }  // namespace protocol
 }  // namespace remoting