Revert "Generate localhost candidate when no STUN/TURN and portallocator has the right flag spefied…

webrtc/p2p/base/stunport.h

 /*
  *  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 16 matching lines @@
 
 // Communicates using the address on the outside of a NAT.
 class UDPPort : public Port {
  public:
   static UDPPort* Create(rtc::Thread* thread,
                          rtc::PacketSocketFactory* factory,
                          rtc::Network* network,
                          rtc::AsyncPacketSocket* socket,
                          const std::string& username,
                          const std::string& password,
-                         const std::string& origin,
-                         bool emit_localhost_for_anyaddress) {
+                         const std::string& origin) {
     UDPPort* port = new UDPPort(thread, factory, network, socket,
-                                username, password, origin,
-                                emit_localhost_for_anyaddress);
+                                username, password, origin);
     if (!port->Init()) {
       delete port;
       port = NULL;
     }
     return port;
   }
 
   static UDPPort* Create(rtc::Thread* thread,
                          rtc::PacketSocketFactory* factory,
                          rtc::Network* network,
                          const rtc::IPAddress& ip,
                          uint16 min_port,
                          uint16 max_port,
                          const std::string& username,
                          const std::string& password,
-                         const std::string& origin,
-                         bool emit_localhost_for_anyaddress) {
+                         const std::string& origin) {
     UDPPort* port = new UDPPort(thread, factory, network,
                                 ip, min_port, max_port,
-                                username, password, origin,
-                                emit_localhost_for_anyaddress);
+                                username, password, origin);
     if (!port->Init()) {
       delete port;
       port = NULL;
     }
     return port;
   }
 
   virtual ~UDPPort();
 
   rtc::SocketAddress GetLocalAddress() const {
@@ skipping 34 matching lines @@
 
  protected:
   UDPPort(rtc::Thread* thread,
           rtc::PacketSocketFactory* factory,
           rtc::Network* network,
           const rtc::IPAddress& ip,
           uint16 min_port,
           uint16 max_port,
           const std::string& username,
           const std::string& password,
-          const std::string& origin,
-          bool emit_localhost_for_anyaddress);
+          const std::string& origin);
 
   UDPPort(rtc::Thread* thread,
           rtc::PacketSocketFactory* factory,
           rtc::Network* network,
           rtc::AsyncPacketSocket* socket,
           const std::string& username,
           const std::string& password,
-          const std::string& origin,
-          bool emit_localhost_for_anyaddress);
+          const std::string& origin);
 
   bool Init();
 
   virtual int SendTo(const void* data, size_t size,
                      const rtc::SocketAddress& addr,
                      const rtc::PacketOptions& options,
                      bool payload);
 
   void OnLocalAddressReady(rtc::AsyncPacketSocket* socket,
                            const rtc::SocketAddress& address);
@@ skipping 63 matching lines @@
   ServerAddresses server_addresses_;
   ServerAddresses bind_request_succeeded_servers_;
   ServerAddresses bind_request_failed_servers_;
   StunRequestManager requests_;
   rtc::AsyncPacketSocket* socket_;
   int error_;
   rtc::scoped_ptr<AddressResolver> resolver_;
   bool ready_;
   int stun_keepalive_delay_;
 
-  // This is true when no STUN or TURN is specified in AllocationSequence and
-  // PORTALLOCATOR_ENABLE_LOCALHOST_CANDIDATE is specified.
-  bool emit_localhost_for_anyaddress_;
-
   friend class StunBindingRequest;
 };
 
 class StunPort : public UDPPort {
  public:
   static StunPort* Create(rtc::Thread* thread,
                           rtc::PacketSocketFactory* factory,
                           rtc::Network* network,
                           const rtc::IPAddress& ip,
                           uint16 min_port, uint16 max_port,
@@ skipping 23 matching lines @@
            rtc::PacketSocketFactory* factory,
            rtc::Network* network,
            const rtc::IPAddress& ip,
            uint16 min_port,
            uint16 max_port,
            const std::string& username,
            const std::string& password,
            const ServerAddresses& servers,
            const std::string& origin)
      : UDPPort(thread, factory, network, ip, min_port, max_port, username,
-               password, origin, false) {
+               password, origin) {
     // UDPPort will set these to local udp, updating these to STUN.
     set_type(STUN_PORT_TYPE);
     set_server_addresses(servers);
   }
 };
 
 }  // namespace cricket
 
 #endif  // WEBRTC_P2P_BASE_STUNPORT_H_