Roll WebRTC 9687:9692, Libjingle 9690:9692

remoting/test/fake_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/test/fake_port_allocator.h"
 
 #include "remoting/test/fake_network_dispatcher.h"
 #include "remoting/test/fake_network_manager.h"
 #include "remoting/test/fake_socket_factory.h"
 
@@ skipping 85 matching lines @@
 
 FakePortAllocator::FakePortAllocator(
     scoped_ptr<rtc::NetworkManager> network_manager,
     scoped_ptr<FakePacketSocketFactory> socket_factory)
     : HttpPortAllocatorBase(network_manager.get(),
                             socket_factory.get(),
                             std::string()),
       network_manager_(network_manager.Pass()),
       socket_factory_(socket_factory.Pass()) {
   set_flags(cricket::PORTALLOCATOR_DISABLE_TCP |
-            cricket::PORTALLOCATOR_ENABLE_SHARED_UFRAG |
             cricket::PORTALLOCATOR_ENABLE_IPV6 |
             cricket::PORTALLOCATOR_DISABLE_STUN |
             cricket::PORTALLOCATOR_DISABLE_RELAY);
 }
 
 FakePortAllocator::~FakePortAllocator() {
 }
 
 cricket::PortAllocatorSession* FakePortAllocator::CreateSessionInternal(
     const std::string& content_name,
     int component,
     const std::string& ice_username_fragment,
     const std::string& ice_password) {
   return new FakePortAllocatorSession(
       this, content_name, component, ice_username_fragment, ice_password,
       stun_hosts(), relay_hosts(), relay_token());
 }
 
 }  // namespace remoting