Remove NetworkManager::{set_ipv6_enabled,ipv6_enabled}.

This methods were only used in test code, it should be safe to remove
them.

Bug: webrtc:10198
Change-Id: If2da1695f0efbff3aa9b6ebb4eebf4fdfe128593
Reviewed-on: https://webrtc-review.googlesource.com/c/118601
Reviewed-by: Qingsi Wang <qingsi@webrtc.org>
Commit-Queue: Qingsi Wang <qingsi@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#26352}

p2p/client/basic_port_allocator_unittest.cc

@@ -1242,10 +1242,6 @@ TEST_F(BasicPortAllocatorTest, TestGetAllPortsNoAdapters) {
   turn_server_.AddInternalSocket(kTurnTcpIntAddr, PROTO_TCP);
   AddTurnServers(kTurnUdpIntAddr, kTurnTcpIntAddr);
   AddTurnServers(kTurnUdpIntIPv6Addr, kTurnTcpIntIPv6Addr);
-  // Disable IPv6, because our test infrastructure doesn't support having IPv4
-  // behind a NAT but IPv6 not, or having an IPv6 NAT.
-  // TODO(deadbeef): Fix this.
-  network_manager_.set_ipv6_enabled(false);
   ASSERT_TRUE(CreateSession(ICE_CANDIDATE_COMPONENT_RTP));
   session_->StartGettingPorts();
   EXPECT_TRUE_SIMULATED_WAIT(candidate_allocation_done_,

rtc_base/nat_unittest.cc

@@ -221,7 +221,6 @@ bool TestConnectivity(const SocketAddress& src, const IPAddress& dst) {
 
 void TestPhysicalInternal(const SocketAddress& int_addr) {
   BasicNetworkManager network_manager;
-  network_manager.set_ipv6_enabled(true);
   network_manager.StartUpdating();
   // Process pending messages so the network list is updated.
   Thread::Current()->ProcessMessages(0);

rtc_base/network.cc

@@ -264,8 +264,7 @@ webrtc::MdnsResponderInterface* NetworkManager::GetMdnsResponder() const {
 }
 
 NetworkManagerBase::NetworkManagerBase()
-    : enumeration_permission_(NetworkManager::ENUMERATION_ALLOWED),
+    : enumeration_permission_(NetworkManager::ENUMERATION_ALLOWED) {}
-      ipv6_enabled_(true) {}
 
 NetworkManagerBase::~NetworkManagerBase() {
   for (const auto& kv : networks_map_) {
@@ -289,17 +288,15 @@ void NetworkManagerBase::GetAnyAddressNetworks(NetworkList* networks) {
   }
   networks->push_back(ipv4_any_address_network_.get());
 
-  if (ipv6_enabled()) {
   if (!ipv6_any_address_network_) {
     const rtc::IPAddress ipv6_any_address(in6addr_any);
-      ipv6_any_address_network_.reset(new rtc::Network(
+    ipv6_any_address_network_.reset(
-          "any", "any", ipv6_any_address, 0, ADAPTER_TYPE_ANY));
+        new rtc::Network("any", "any", ipv6_any_address, 0, ADAPTER_TYPE_ANY));
     ipv6_any_address_network_->set_default_local_address_provider(this);
     ipv6_any_address_network_->AddIP(ipv6_any_address);
     ipv6_any_address_network_->SetMdnsResponder(GetMdnsResponder());
   }
   networks->push_back(ipv6_any_address_network_.get());
-  }
 }
 
 void NetworkManagerBase::GetNetworks(NetworkList* result) const {
@@ -520,10 +517,6 @@ void BasicNetworkManager::ConvertIfAddrs(struct ifaddrs* interfaces,
         cursor->ifa_addr->sa_family != AF_INET6) {
       continue;
     }
-    // Skip IPv6 if not enabled.
-    if (cursor->ifa_addr->sa_family == AF_INET6 && !ipv6_enabled()) {
-      continue;
-    }
     // Convert to InterfaceAddress.
     if (!ifaddrs_converter->ConvertIfAddrsToIPAddress(cursor, &ip, &mask)) {
       continue;
@@ -699,7 +692,6 @@ bool BasicNetworkManager::CreateNetworks(bool include_ignored,
             break;
           }
           case AF_INET6: {
-            if (ipv6_enabled()) {
             sockaddr_in6* v6_addr =
                 reinterpret_cast<sockaddr_in6*>(address->Address.lpSockaddr);
             scope_id = v6_addr->sin6_scope_id;
@@ -710,9 +702,6 @@ bool BasicNetworkManager::CreateNetworks(bool include_ignored,
             }
 
             break;
-            } else {
-              continue;
-            }
           }
           default: { continue; }
         }

rtc_base/network.h

@@ -153,12 +153,6 @@ class NetworkManagerBase : public NetworkManager {
   void GetNetworks(NetworkList* networks) const override;
   void GetAnyAddressNetworks(NetworkList* networks) override;
 
-  // Defaults to true.
-  // TODO(deadbeef): Remove this. Nothing but tests use this; IPv6 is enabled
-  // by default everywhere else.
-  bool ipv6_enabled() const { return ipv6_enabled_; }
-  void set_ipv6_enabled(bool enabled) { ipv6_enabled_ = enabled; }
-
   EnumerationPermission enumeration_permission() const override;
 
   bool GetDefaultLocalAddress(int family, IPAddress* ipaddr) const override;
@@ -194,7 +188,6 @@ class NetworkManagerBase : public NetworkManager {
   NetworkList networks_;
 
   NetworkMap networks_map_;
-  bool ipv6_enabled_;
 
   std::unique_ptr<rtc::Network> ipv4_any_address_network_;
   std::unique_ptr<rtc::Network> ipv6_any_address_network_;

rtc_base/network_unittest.cc

@@ -624,22 +624,10 @@ TEST_F(NetworkTest, TestCreateAndDumpNetworks) {
   manager.DumpNetworks();
 }
 
-// Test that we can toggle IPv6 on and off.
+TEST_F(NetworkTest, TestIPv6Toggle) {
-// Crashes on Linux. See webrtc:4923.
-#if defined(WEBRTC_LINUX)
-#define MAYBE_TestIPv6Toggle DISABLED_TestIPv6Toggle
-#else
-#define MAYBE_TestIPv6Toggle TestIPv6Toggle
-#endif
-TEST_F(NetworkTest, MAYBE_TestIPv6Toggle) {
   BasicNetworkManager manager;
   bool ipv6_found = false;
   NetworkManager::NetworkList list;
-#if !defined(WEBRTC_WIN)
-  // There should be at least one IPv6 network (fe80::/64 should be in there).
-  // TODO(thaloun): Disabling this test on windows for the moment as the test
-  // machines don't seem to have IPv6 installed on them at all.
-  manager.set_ipv6_enabled(true);
   list = GetNetworks(manager, true);
   for (NetworkManager::NetworkList::iterator it = list.begin();
        it != list.end(); ++it) {
@@ -653,22 +641,6 @@ TEST_F(NetworkTest, MAYBE_TestIPv6Toggle) {
        it != list.end(); ++it) {
     delete (*it);
   }
-#endif
-  ipv6_found = false;
-  manager.set_ipv6_enabled(false);
-  list = GetNetworks(manager, true);
-  for (NetworkManager::NetworkList::iterator it = list.begin();
-       it != list.end(); ++it) {
-    if ((*it)->prefix().family() == AF_INET6) {
-      ipv6_found = true;
-      break;
-    }
-  }
-  EXPECT_FALSE(ipv6_found);
-  for (NetworkManager::NetworkList::iterator it = list.begin();
-       it != list.end(); ++it) {
-    delete (*it);
-  }
 }
 
 // Test that when network interfaces are sorted and given preference values,