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

webrtc/p2p/client/httpportallocator.cc

 /*
  *  Copyright 2004 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 150 matching lines @@
   LOG(LS_INFO) << "HTTPPortAllocator: sending to relay host " << host;
   if (relay_token_.empty()) {
     LOG(LS_WARNING) << "No relay auth token found.";
   }
 
   SendSessionRequest(host, rtc::HTTP_SECURE_PORT);
 }
 
 std::string HttpPortAllocatorSessionBase::GetSessionRequestUrl() {
   std::string url = std::string(HttpPortAllocator::kCreateSessionURL);
-  if (allocator()->flags() & PORTALLOCATOR_ENABLE_SHARED_UFRAG) {
-    ASSERT(!username().empty());
-    ASSERT(!password().empty());
-    url = url + "?username=" + rtc::s_url_encode(username()) +
-        "&password=" + rtc::s_url_encode(password());
-  }
+  ASSERT(!username().empty());
+  ASSERT(!password().empty());
+  url = url + "?username=" + rtc::s_url_encode(username()) +
+      "&password=" + rtc::s_url_encode(password());
   return url;
 }
 
 void HttpPortAllocatorSessionBase::ReceiveSessionResponse(
     const std::string& response) {
 
   StringMap map;
   ParseMap(response, map);
 
   if (!username().empty() && map["username"] != username()) {
@@ skipping 130 matching lines @@
   rtc::MemoryStream* stream =
       static_cast<rtc::MemoryStream*>(request->response().document.get());
   stream->Rewind();
   size_t length;
   stream->GetSize(&length);
   std::string resp = std::string(stream->GetBuffer(), length);
   ReceiveSessionResponse(resp);
 }
 
 }  // namespace cricket