commit c3efe1abfa1de4cd5e164850dbfc2a4231cbe7c5
author Mirko Bonadei <mbonadei@webrtc.org> Tue Jun 30 12:24:09 2020
committer Commit Bot <commit-bot@chromium.org> Mon Jul 06 10:39:39 2020
tree 43574197854de836e66a0b8c07148832b325a2e7
parent c7f0dff19180367ea0c207b707d8bf98110a24d0

Inclusive language in //rtc_base.

Bug: webrtc:11680
Change-Id: I498199afb5e52fd9047afff96b45fa5dfa356606
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/178393
Reviewed-by: Tommi <tommi@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#31633}

rtc_base/nat_server.cc

diff --git a/rtc_base/nat_server.cc b/rtc_base/nat_server.cc
index 323a787..0c458df 100644
--- a/rtc_base/nat_server.cc
+++ b/rtc_base/nat_server.cc
@@ -174,7 +174,7 @@
   RTC_DCHECK(iter != int_map_->end());
 
   // Allow the destination to send packets back to the source.
-  iter->second->WhitelistInsert(dest_addr);
+  iter->second->AllowlistInsert(dest_addr);
 
   // Send the packet to its intended destination.
   rtc::PacketOptions options;
@@ -227,29 +227,29 @@
 
 bool NATServer::ShouldFilterOut(TransEntry* entry,
                                 const SocketAddress& ext_addr) {
-  return entry->WhitelistContains(ext_addr);
+  return entry->AllowlistContains(ext_addr);
 }
 
 NATServer::TransEntry::TransEntry(const SocketAddressPair& r,
                                   AsyncUDPSocket* s,
                                   NAT* nat)
     : route(r), socket(s) {
-  whitelist = new AddressSet(AddrCmp(nat));
+  allowlist = new AddressSet(AddrCmp(nat));
 }
 
 NATServer::TransEntry::~TransEntry() {
-  delete whitelist;
+  delete allowlist;
   delete socket;
 }
 
-void NATServer::TransEntry::WhitelistInsert(const SocketAddress& addr) {
+void NATServer::TransEntry::AllowlistInsert(const SocketAddress& addr) {
   CritScope cs(&crit_);
-  whitelist->insert(addr);
+  allowlist->insert(addr);
 }
 
-bool NATServer::TransEntry::WhitelistContains(const SocketAddress& ext_addr) {
+bool NATServer::TransEntry::AllowlistContains(const SocketAddress& ext_addr) {
   CritScope cs(&crit_);
-  return whitelist->find(ext_addr) == whitelist->end();
+  return allowlist->find(ext_addr) == allowlist->end();
 }
 
 }  // namespace rtc

rtc_base/nat_server.h

diff --git a/rtc_base/nat_server.h b/rtc_base/nat_server.h
index 46f01e9..47a1a33 100644
--- a/rtc_base/nat_server.h
+++ b/rtc_base/nat_server.h
@@ -96,12 +96,12 @@
     TransEntry(const SocketAddressPair& r, AsyncUDPSocket* s, NAT* nat);
     ~TransEntry();
 
-    void WhitelistInsert(const SocketAddress& addr);
-    bool WhitelistContains(const SocketAddress& ext_addr);
+    void AllowlistInsert(const SocketAddress& addr);
+    bool AllowlistContains(const SocketAddress& ext_addr);
 
     SocketAddressPair route;
     AsyncUDPSocket* socket;
-    AddressSet* whitelist;
+    AddressSet* allowlist;
     CriticalSection crit_;
   };