Revert "Reland "Remove GICE (gone forever!) and PORTALLOCATOR_ENABLE_SHARED_UFRAG (enabled forever)…

webrtc/p2p/client/connectivitychecker.cc

 /*
  *  Copyright 2011 The WebRTC Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 97 matching lines @@
     nics_.clear();
     main_->Clear(this, MSG_SIGNAL_RESULTS);
   }
 }
 
 bool ConnectivityChecker::Initialize() {
   network_manager_.reset(CreateNetworkManager());
   socket_factory_.reset(CreateSocketFactory(worker_));
   port_allocator_.reset(CreatePortAllocator(network_manager_.get(),
                                             user_agent_, relay_token_));
+  uint32 new_allocator_flags = port_allocator_->flags();
+  new_allocator_flags |= cricket::PORTALLOCATOR_ENABLE_SHARED_UFRAG;
+  port_allocator_->set_flags(new_allocator_flags);
   return true;
 }
 
 void ConnectivityChecker::Start() {
   main_ = rtc::Thread::Current();
   worker_->Post(this, MSG_START);
   started_ = true;
 }
 
 void ConnectivityChecker::CleanUp() {
@@ skipping 392 matching lines @@
       nic_info->https.start_time_ms = now;
     } else {
       LOG(LS_ERROR) << "Registering start time for unknown port: " << port;
     }
   } else {
     LOG(LS_ERROR) << "Error, no nic info found while registering http start.";
   }
 }
 
 }  // namespace rtc