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

webrtc/p2p/client/httpportallocator.cc

Index: webrtc/p2p/client/httpportallocator.cc
diff --git a/webrtc/p2p/client/httpportallocator.cc b/webrtc/p2p/client/httpportallocator.cc
index b36de5671dea662a27f0dd0ee01e75ba17054a37..c072da27e154768bf92c1e7cf2419b96bcfb6d62 100644
--- a/webrtc/p2p/client/httpportallocator.cc
+++ b/webrtc/p2p/client/httpportallocator.cc
@@ -168,10 +168,12 @@ void HttpPortAllocatorSessionBase::TryCreateRelaySession() {
 
 std::string HttpPortAllocatorSessionBase::GetSessionRequestUrl() {
   std::string url = std::string(HttpPortAllocator::kCreateSessionURL);
-  ASSERT(!username().empty());
-  ASSERT(!password().empty());
-  url = url + "?username=" + rtc::s_url_encode(username()) +
-      "&password=" + rtc::s_url_encode(password());
+  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());
+  }
   return url;
 }