Bug 1621395 - Convert mQueue to nsTArray<UniquePtr<nsOpenConn>> r=val…

…entin

***
Bug 1621395 - Convert mQueue to nsTArray<UniquePtr<nsOpenConn>>

Differential Revision: https://phabricator.services.mozilla.com/D66563

--HG--
extra : moz-landing-system : lando

netwerk/protocol/websocket/WebSocketChannel.cpp

@@ -324,9 +324,8 @@ class nsWSAdmissionManager {
     bool found = (sManager->IndexOf(ws->mAddress) >= 0);
 
     // Always add ourselves to queue, even if we'll connect immediately
-    nsOpenConn* newdata = new nsOpenConn(ws->mAddress, ws);
-    LOG(("Websocket: adding conn %p to the queue", newdata));
-    sManager->mQueue.AppendElement(newdata);
+    UniquePtr<nsOpenConn> newdata(new nsOpenConn(ws->mAddress, ws));
+    sManager->mQueue.AppendElement(std::move(newdata));
 
     if (found) {
       LOG(
@@ -448,10 +447,7 @@ class nsWSAdmissionManager {
     MOZ_COUNT_CTOR(nsWSAdmissionManager);
   }
 
-  ~nsWSAdmissionManager() {
-    MOZ_COUNT_DTOR(nsWSAdmissionManager);
-    for (uint32_t i = 0; i < mQueue.Length(); i++) delete mQueue[i];
-  }
+  ~nsWSAdmissionManager() { MOZ_COUNT_DTOR(nsWSAdmissionManager); }
 
   class nsOpenConn {
    public:
@@ -485,10 +481,7 @@ class nsWSAdmissionManager {
     int32_t index = IndexOf(aChannel);
     MOZ_ASSERT(index >= 0, "connection to remove not in queue");
     if (index >= 0) {
-      nsOpenConn* olddata = mQueue[index];
       mQueue.RemoveElementAt(index);
-      LOG(("Websocket: removing conn %p from the queue", olddata));
-      delete olddata;
     }
   }
 
@@ -515,7 +508,7 @@ class nsWSAdmissionManager {
   //
   // We could hash hostnames instead of using a single big vector here, but the
   // dataset is expected to be small.
-  nsTArray<nsOpenConn*> mQueue;
+  nsTArray<UniquePtr<nsOpenConn>> mQueue;
 
   FailDelayManager mFailures;