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

webrtc/p2p/base/transportdescriptionfactory.h

Index: webrtc/p2p/base/transportdescriptionfactory.h
diff --git a/webrtc/p2p/base/transportdescriptionfactory.h b/webrtc/p2p/base/transportdescriptionfactory.h
index a137f72115d2dc3d90465f89e3f7ab3c984e983a..2bd86617ed6020cc4c9a1ecfc091c186bacdd7f1 100644
--- a/webrtc/p2p/base/transportdescriptionfactory.h
+++ b/webrtc/p2p/base/transportdescriptionfactory.h
@@ -36,8 +36,6 @@ class TransportDescriptionFactory {
   // The identity to use when setting up DTLS.
   rtc::SSLIdentity* identity() const { return identity_; }
 
-  // Specifies the transport protocol to be use.
-  void set_protocol(TransportProtocol protocol) { protocol_ = protocol; }
   // Specifies the transport security policy to use.
   void set_secure(SecurePolicy s) { secure_ = s; }
   // Specifies the identity to use (only used when secure is not SEC_DISABLED).
@@ -56,7 +54,6 @@ class TransportDescriptionFactory {
   bool SetSecurityInfo(TransportDescription* description,
                        ConnectionRole role) const;
 
-  TransportProtocol protocol_;
   SecurePolicy secure_;
   rtc::SSLIdentity* identity_;
 };