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

webrtc/p2p/base/port_unittest.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 58 matching lines @@
 // Magic value of 30 is from RFC3484, for IPv4 addresses.
 static const uint32_t kDefaultPrflxPriority =
     ICE_TYPE_PREFERENCE_PRFLX << 24 | 30 << 8 |
     (256 - ICE_CANDIDATE_COMPONENT_DEFAULT);
 
 static const int kTiebreaker1 = 11111;
 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);
   return port->Candidates()[0];
 }
 
 static SocketAddress GetAddress(Port* port) {
   return GetCandidate(port).address();
 }
 
 static IceMessage* CopyStunMessage(const IceMessage* src) {
@@ skipping 429 matching lines @@
   RelayPort* CreateGturnPort(const SocketAddress& addr,
                              ProtocolType int_proto, ProtocolType ext_proto) {
     RelayPort* port = CreateGturnPort(addr);
     SocketAddress addrs[] =
         { kRelayUdpIntAddr, kRelayTcpIntAddr, kRelaySslTcpIntAddr };
     port->AddServerAddress(ProtocolAddress(addrs[int_proto], int_proto));
     return port;
   }
   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.
   }
   rtc::NATServer* CreateNatServer(const SocketAddress& addr,
                                         rtc::NATType type) {
     return new rtc::NATServer(type, ss_.get(), addr, addr, ss_.get(), addr);
   }
   static const char* StunName(NATType type) {
     switch (type) {
       case NAT_OPEN_CONE:       return "stun(open cone)";
@@ skipping 2114 matching lines @@
   EXPECT_EQ(1UL, port->Candidates().size());
   port->SetIceParameters(1, "ufrag2", "password2");
   EXPECT_EQ(1, port->component());
   EXPECT_EQ("ufrag2", port->username_fragment());
   EXPECT_EQ("password2", port->password());
   const Candidate& candidate = port->Candidates()[0];
   EXPECT_EQ(1, candidate.component());
   EXPECT_EQ("ufrag2", candidate.username());
   EXPECT_EQ("password2", candidate.password());
 }