Revert of Move "max IPv6 networks" logic to BasicPortAllocator, and fix sorting.

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 091819ac43f1d0e1420bcd123bb6c6384fd67291..2970987900b1390c956e45a5b775cc008ecbc9b3 100644
--- a/webrtc/p2p/client/basicportallocator.cc
+++ b/webrtc/p2p/client/basicportallocator.cc
@@ -588,14 +588,13 @@
       network_manager->GetAnyAddressNetworks(&networks);
     }
   }
-  // Do some more filtering, depending on the network ignore mask and "disable
-  // costly networks" flag.
   networks.erase(std::remove_if(networks.begin(), networks.end(),
                                 [this](rtc::Network* network) {
                                   return allocator_->network_ignore_mask() &
                                          network->type();
                                 }),
                  networks.end());
+
   if (flags() & PORTALLOCATOR_DISABLE_COSTLY_NETWORKS) {
     uint16_t lowest_cost = rtc::kNetworkCostMax;
     for (rtc::Network* network : networks) {
@@ -607,26 +606,6 @@
                                            lowest_cost + rtc::kNetworkCostLow;
                                   }),
                    networks.end());
-  }
-  // Lastly, if we have a limit for the number of IPv6 network interfaces (by
-  // default, it's 5), remove networks to ensure that limit is satisfied.
-  //
-  // TODO(deadbeef): Instead of just taking the first N arbitrary IPv6
-  // networks, we could try to choose a set that's "most likely to work". It's
-  // hard to define what that means though; it's not just "lowest cost".
-  // Alternatively, we could just focus on making our ICE pinging logic smarter
-  // such that this filtering isn't necessary in the first place.
-  int ipv6_networks = 0;
-  for (auto it = networks.begin(); it != networks.end();) {
-    if ((*it)->prefix().family() == AF_INET6) {
-      if (ipv6_networks >= allocator_->max_ipv6_networks()) {
-        it = networks.erase(it);
-        continue;
-      } else {
-        ++ipv6_networks;
-      }
-    }
-    ++it;
   }
   return networks;
 }