commit d97096706ba53ec249f953d228bd5866e4f26a13
author Niels Möller <nisse@webrtc.org> Mon Mar 25 07:57:50 2019
committer Commit Bot <commit-bot@chromium.org> Mon Mar 25 14:16:44 2019
tree 91529ae48375592698607a25e1917d9036bad8b2
parent c29cb2c42a9a09e09baff08a516ce09bbe1ef58a

Delete unused method ProxyServer::OnBindingDestroyed

Also use unique_ptr, to simplify destruction.

Bug: webrtc:6424
Change-Id: I091980bca37ec5320f33f8219590e507d2e910d7
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/129421
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27269}

rtc_base/proxy_server.cc

diff --git a/rtc_base/proxy_server.cc b/rtc_base/proxy_server.cc
index 3420404..a1477c8 100644
--- a/rtc_base/proxy_server.cc
+++ b/rtc_base/proxy_server.cc
@@ -13,6 +13,7 @@
 #include <stddef.h>
 #include <algorithm>
 
+#include "absl/memory/memory.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/socket_factory.h"
@@ -35,12 +36,7 @@
   server_socket_->SignalReadEvent.connect(this, &ProxyServer::OnAcceptEvent);
 }
 
-ProxyServer::~ProxyServer() {
-  for (BindingList::iterator it = bindings_.begin(); it != bindings_.end();
-       ++it) {
-    delete (*it);
-  }
-}
+ProxyServer::~ProxyServer() = default;
 
 SocketAddress ProxyServer::GetServerAddress() {
   return server_socket_->GetLocalAddress();
@@ -55,20 +51,14 @@
       ext_factory_->CreateAsyncSocket(ext_ip_.family(), SOCK_STREAM);
   if (ext_socket) {
     ext_socket->Bind(ext_ip_);
-    bindings_.push_back(new ProxyBinding(wrapped_socket, ext_socket));
+    bindings_.emplace_back(
+        absl::make_unique<ProxyBinding>(wrapped_socket, ext_socket));
   } else {
     RTC_LOG(LS_ERROR)
         << "Unable to create external socket on proxy accept event";
   }
 }
 
-void ProxyServer::OnBindingDestroyed(ProxyBinding* binding) {
-  BindingList::iterator it =
-      std::find(bindings_.begin(), bindings_.end(), binding);
-  delete (*it);
-  bindings_.erase(it);
-}
-
 // ProxyBinding
 ProxyBinding::ProxyBinding(AsyncProxyServerSocket* int_socket,
                            AsyncSocket* ext_socket)

rtc_base/proxy_server.h

diff --git a/rtc_base/proxy_server.h b/rtc_base/proxy_server.h
index ef4a3c7..c7e6078 100644
--- a/rtc_base/proxy_server.h
+++ b/rtc_base/proxy_server.h
@@ -11,8 +11,10 @@
 #ifndef RTC_BASE_PROXY_SERVER_H_
 #define RTC_BASE_PROXY_SERVER_H_
 
-#include <list>
 #include <memory>
+#include <vector>
+
+#include "absl/memory/memory.h"
 #include "rtc_base/async_socket.h"
 #include "rtc_base/constructor_magic.h"
 #include "rtc_base/server_socket_adapters.h"
@@ -74,14 +76,12 @@
  protected:
   void OnAcceptEvent(AsyncSocket* socket);
   virtual AsyncProxyServerSocket* WrapSocket(AsyncSocket* socket) = 0;
-  void OnBindingDestroyed(ProxyBinding* binding);
 
  private:
-  typedef std::list<ProxyBinding*> BindingList;
   SocketFactory* ext_factory_;
   SocketAddress ext_ip_;
   std::unique_ptr<AsyncSocket> server_socket_;
-  BindingList bindings_;
+  std::vector<std::unique_ptr<ProxyBinding>> bindings_;
   RTC_DISALLOW_COPY_AND_ASSIGN(ProxyServer);
 };