commit 24e0337846f37a22d975fd4e2c9ec1d28f569ca1
author Henrik Boström <hbos@webrtc.org> Thu Oct 27 13:49:10 2022 +0200
committer WebRTC LUCI CQ <webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com> Sun Oct 30 21:47:27 2022 +0000
tree b9d8f13d416c5eaab938486c7075a689dae31860
parent 5029efb6151fbff956da5a52d3aff498acea004b

Make disable_ipv6 ABSL_DEPRECATED.

// All tests pass, infra failure unrelated
NOTRY=True

Bug: webrtc:14608
Change-Id: Ie16dcf9dc66e687f0befef42c7d8e914696af191
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/280760
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Commit-Queue: Henrik Boström <hbos@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#38502}

api/peer_connection_interface.h

diff --git a/api/peer_connection_interface.h b/api/peer_connection_interface.h
index 55300a5..f8689eb 100644
--- a/api/peer_connection_interface.h
+++ b/api/peer_connection_interface.h
@@ -428,7 +428,10 @@
 
     // If set to true, don't gather IPv6 ICE candidates.
     // TODO(https://crbug.com/webrtc/14608): Delete this flag.
-    bool disable_ipv6 = false;
+    union {
+      bool DEPRECATED_disable_ipv6 = false;
+      bool ABSL_DEPRECATED("https://crbug.com/webrtc/14608") disable_ipv6;
+    };
 
     // If set to true, don't gather IPv6 ICE candidates on Wi-Fi.
     // Only intended to be used on specific devices. Certain phones disable IPv6

pc/peer_connection.cc

diff --git a/pc/peer_connection.cc b/pc/peer_connection.cc
index 86877e5..9e78bac 100644
--- a/pc/peer_connection.cc
+++ b/pc/peer_connection.cc
@@ -297,7 +297,7 @@
     RtcpMuxPolicy rtcp_mux_policy;
     std::vector<rtc::scoped_refptr<rtc::RTCCertificate>> certificates;
     int ice_candidate_pool_size;
-    bool disable_ipv6;
+    bool DEPRECATED_disable_ipv6;
     bool disable_ipv6_on_wifi;
     int max_ipv6_networks;
     bool disable_link_local_networks;
@@ -365,7 +365,8 @@
          certificates == o.certificates &&
          prioritize_most_likely_ice_candidate_pairs ==
              o.prioritize_most_likely_ice_candidate_pairs &&
-         media_config == o.media_config && disable_ipv6 == o.disable_ipv6 &&
+         media_config == o.media_config &&
+         DEPRECATED_disable_ipv6 == o.DEPRECATED_disable_ipv6 &&
          disable_ipv6_on_wifi == o.disable_ipv6_on_wifi &&
          max_ipv6_networks == o.max_ipv6_networks &&
          disable_link_local_networks == o.disable_link_local_networks &&
@@ -2094,7 +2095,7 @@
                           cricket::PORTALLOCATOR_ENABLE_IPV6_ON_WIFI;
   // If the disable-IPv6 flag was specified, we'll not override it
   // by experiment.
-  if (configuration.disable_ipv6) {
+  if (configuration.DEPRECATED_disable_ipv6) {
     port_allocator_flags &= ~(cricket::PORTALLOCATOR_ENABLE_IPV6);
   } else if (trials().IsDisabled("WebRTC-IPv6Default")) {
     port_allocator_flags &= ~(cricket::PORTALLOCATOR_ENABLE_IPV6);

pc/peer_connection_interface_unittest.cc

diff --git a/pc/peer_connection_interface_unittest.cc b/pc/peer_connection_interface_unittest.cc
index 229c066..298a060 100644
--- a/pc/peer_connection_interface_unittest.cc
+++ b/pc/peer_connection_interface_unittest.cc
@@ -1332,7 +1332,7 @@
   server.uri = kStunAddressOnly;
   config.servers.push_back(server);
   config.type = PeerConnectionInterface::kRelay;
-  config.disable_ipv6 = true;
+  config.DEPRECATED_disable_ipv6 = true;
   config.tcp_candidate_policy =
       PeerConnectionInterface::kTcpCandidatePolicyDisabled;
   config.candidate_network_policy =
@@ -3827,7 +3827,7 @@
   EXPECT_NE(a, f);
 
   PeerConnectionInterface::RTCConfiguration g;
-  g.disable_ipv6 = true;
+  g.DEPRECATED_disable_ipv6 = true;
   EXPECT_NE(a, g);
 
   PeerConnectionInterface::RTCConfiguration h(