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

webrtc/p2p/client/basicportallocator.cc

Index: webrtc/p2p/client/basicportallocator.cc
diff --git a/webrtc/p2p/client/basicportallocator.cc b/webrtc/p2p/client/basicportallocator.cc
index 1351b0e12a61edcdc665f7aab1b87eb4de9326b5..c5cfbd94a154940b6a92eb84337ab19fe02ab7dc 100644
--- a/webrtc/p2p/client/basicportallocator.cc
+++ b/webrtc/p2p/client/basicportallocator.cc
@@ -304,13 +304,6 @@ void BasicPortAllocatorSession::DoAllocate() {
   bool done_signal_needed = false;
   std::vector<rtc::Network*> networks;
 
-  // If the network permission state is BLOCKED, we just act as if the flag has
-  // been passed in.
-  if (allocator_->network_manager()->enumeration_permission() ==
-      rtc::NetworkManager::kEnumerationDisallowed) {
-    set_flags(flags() | PORTALLOCATOR_DISABLE_ADAPTER_ENUMERATION);
-  }
-
   // If the adapter enumeration is disabled, we'll just bind to any address
   // instead of specific NIC. This is to ensure the same routing for http
   // traffic by OS is also used here to avoid any local or public IP leakage
@@ -562,13 +555,6 @@ bool BasicPortAllocatorSession::CheckCandidateFilter(const Candidate& c) {
       return true;
     }
 
-    // If it's loopback address, we should allow it as it's for demo page
-    // connectivity when no TURN/STUN specified.
-    if (c.address().IsLoopbackIP()) {
-      ASSERT((flags() & PORTALLOCATOR_ENABLE_LOCALHOST_CANDIDATE) != 0);
-      return true;
-    }
-
     // This is just to prevent the case when binding to any address (all 0s), if
     // somehow the host candidate address is not all 0s. Either because local
     // installed proxy changes the address or a packet has been sent for any
@@ -839,19 +825,20 @@ void AllocationSequence::CreateUDPPorts() {
   // TODO(mallinath) - Remove UDPPort creating socket after shared socket
   // is enabled completely.
   UDPPort* port = NULL;
-  bool emit_localhost_for_anyaddress =
-    IsFlagSet(PORTALLOCATOR_ENABLE_LOCALHOST_CANDIDATE);
   if (IsFlagSet(PORTALLOCATOR_ENABLE_SHARED_SOCKET) && udp_socket_) {
-    port = UDPPort::Create(
-        session_->network_thread(), session_->socket_factory(), network_,
-        udp_socket_.get(), session_->username(), session_->password(),
-        session_->allocator()->origin(), emit_localhost_for_anyaddress);
+    port = UDPPort::Create(session_->network_thread(),
+                           session_->socket_factory(), network_,
+                           udp_socket_.get(),
+                           session_->username(), session_->password(),
+                           session_->allocator()->origin());
   } else {
-    port = UDPPort::Create(
-        session_->network_thread(), session_->socket_factory(), network_, ip_,
-        session_->allocator()->min_port(), session_->allocator()->max_port(),
-        session_->username(), session_->password(),
-        session_->allocator()->origin(), emit_localhost_for_anyaddress);
+    port = UDPPort::Create(session_->network_thread(),
+                           session_->socket_factory(),
+                           network_, ip_,
+                           session_->allocator()->min_port(),
+                           session_->allocator()->max_port(),
+                           session_->username(), session_->password(),
+                           session_->allocator()->origin());
   }
 
   if (port) {