Ensuring that UDP TURN servers are always used as STUN servers.

webrtc/base/natsocketfactory.h

Index: webrtc/base/natsocketfactory.h
diff --git a/webrtc/base/natsocketfactory.h b/webrtc/base/natsocketfactory.h
index 9a189d8ca189bdfbe64b2540faef46b3ab6c2c4f..3519cf01333aec583dace1d24154ddecb102a90f 100644
--- a/webrtc/base/natsocketfactory.h
+++ b/webrtc/base/natsocketfactory.h
@@ -37,7 +37,8 @@ class NATInternalSocketFactory {
 // from a socket factory, given to the constructor.
 class NATSocketFactory : public SocketFactory, public NATInternalSocketFactory {
  public:
-  NATSocketFactory(SocketFactory* factory, const SocketAddress& nat_addr);
+  NATSocketFactory(SocketFactory* factory, const SocketAddress& nat_udp_addr,
+                   const SocketAddress& nat_tcp_addr);
 
   // SocketFactory implementation
   Socket* CreateSocket(int type) override;
@@ -53,7 +54,8 @@ class NATSocketFactory : public SocketFactory, public NATInternalSocketFactory {
 
  private:
   SocketFactory* factory_;
-  SocketAddress nat_addr_;
+  SocketAddress nat_udp_addr_;
+  SocketAddress nat_tcp_addr_;
   DISALLOW_COPY_AND_ASSIGN(NATSocketFactory);
 };
 
@@ -94,8 +96,8 @@ class NATSocketServer : public SocketServer, public NATInternalSocketFactory {
     ~Translator();
 
     SocketFactory* internal_factory() { return internal_factory_.get(); }
-    SocketAddress internal_address() const {
-      return nat_server_->internal_address();
+    SocketAddress internal_udp_address() const {
+      return nat_server_->internal_udp_address();
     }
     SocketAddress internal_tcp_address() const {
       return SocketAddress();  // nat_server_->internal_tcp_address();