Revert of Change the size of the ICE ufrag to 4 bytes

webrtc/p2p/base/port_unittest.cc

Index: webrtc/p2p/base/port_unittest.cc
diff --git a/webrtc/p2p/base/port_unittest.cc b/webrtc/p2p/base/port_unittest.cc
index 43ef084b02e1aa49a970c9d9a10accce7a414236..a5cbd92a7b31bbe72ca7f4348d01d018283d4157 100644
--- a/webrtc/p2p/base/port_unittest.cc
+++ b/webrtc/p2p/base/port_unittest.cc
@@ -75,8 +75,6 @@
 static const int kTiebreaker2 = 22222;
 
 static const char* data = "ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890";
-
-static const int kGturnUserNameLength = 16;
 
 static Candidate GetCandidate(Port* port) {
   assert(port->Candidates().size() >= 1);
@@ -527,10 +525,9 @@
   }
   RelayPort* CreateGturnPort(const SocketAddress& addr) {
     // TODO(pthatcher):  Remove GTURN.
-    // Generate a username with length of 16 for Gturn only.
-    std::string username = rtc::CreateRandomString(kGturnUserNameLength);
-    return RelayPort::Create(main_, &socket_factory_, &network_, addr.ipaddr(),
-                             0, 0, username, password_);
+    return RelayPort::Create(main_, &socket_factory_, &network_,
+                             addr.ipaddr(), 0, 0,
+                             username_, password_);
     // TODO: Add an external address for ext_proto, so that the
     // other side can connect to this port using a non-UDP protocol.
   }