commit ae226f65c896d309fbdfd9e83cc28b5b5db9f0ef
author Steve Anton <steveanton@webrtc.org> Tue Jan 29 20:47:38 2019
committer Commit Bot <commit-bot@chromium.org> Tue Jan 29 21:52:18 2019
tree 91dbc4f76173cf2a4419f497cdb1f138c8d19067
parent 3e659b811a66b409822af0527e071e4d920ad198

Use Abseil container algorithms in p2p/

Bug: None
Change-Id: I02dd19efa201bd9d55d0f7c2e1496693017a6848
Reviewed-on: https://webrtc-review.googlesource.com/c/120001
Commit-Queue: Steve Anton <steveanton@webrtc.org>
Reviewed-by: Qingsi Wang <qingsi@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#26455}

p2p/base/tcp_port.cc

diff --git a/p2p/base/tcp_port.cc b/p2p/base/tcp_port.cc
index af49389..f98322a 100644
--- a/p2p/base/tcp_port.cc
+++ b/p2p/base/tcp_port.cc
@@ -67,9 +67,9 @@
 #include "p2p/base/tcp_port.h"
 
 #include <errno.h>
-#include <algorithm>
 #include <vector>
 
+#include "absl/algorithm/container.h"
 #include "p2p/base/p2p_constants.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/ip_address.h"
@@ -357,13 +357,10 @@
     RTC_LOG(LS_VERBOSE) << ToString() << ": socket ipaddr: "
                         << socket_->GetLocalAddress().ToString()
                         << ", port() Network:" << port->Network()->ToString();
-    const std::vector<rtc::InterfaceAddress>& desired_addresses =
-        port_->Network()->GetIPs();
-    RTC_DCHECK(std::find_if(desired_addresses.begin(), desired_addresses.end(),
-                            [this](const rtc::InterfaceAddress& addr) {
-                              return socket_->GetLocalAddress().ipaddr() ==
-                                     addr;
-                            }) != desired_addresses.end());
+    RTC_DCHECK(absl::c_any_of(
+        port_->Network()->GetIPs(), [this](const rtc::InterfaceAddress& addr) {
+          return socket_->GetLocalAddress().ipaddr() == addr;
+        }));
     ConnectSocketSignals(socket);
   }
 }
@@ -444,12 +441,10 @@
   // Note that, aside from minor differences in log statements, this logic is
   // identical to that in TurnPort.
   const rtc::SocketAddress& socket_address = socket->GetLocalAddress();
-  const std::vector<rtc::InterfaceAddress>& desired_addresses =
-      port_->Network()->GetIPs();
-  if (std::find_if(desired_addresses.begin(), desired_addresses.end(),
-                   [socket_address](const rtc::InterfaceAddress& addr) {
-                     return socket_address.ipaddr() == addr;
-                   }) != desired_addresses.end()) {
+  if (absl::c_any_of(port_->Network()->GetIPs(),
+                     [socket_address](const rtc::InterfaceAddress& addr) {
+                       return socket_address.ipaddr() == addr;
+                     })) {
     RTC_LOG(LS_VERBOSE) << ToString() << ": Connection established to "
                         << socket->GetRemoteAddress().ToSensitiveString();
   } else {