Remove ScopedVector from CreateSockets

chrome/utility/local_discovery/service_discovery_message_handler.cc

Index: chrome/utility/local_discovery/service_discovery_message_handler.cc
diff --git a/chrome/utility/local_discovery/service_discovery_message_handler.cc b/chrome/utility/local_discovery/service_discovery_message_handler.cc
index 681e18bb824531c4610bf7ba32b3a2fca4e09b7f..69b43bd8ea4faaa885118b8f8150a48b2fe2145b 100644
--- a/chrome/utility/local_discovery/service_discovery_message_handler.cc
+++ b/chrome/utility/local_discovery/service_discovery_message_handler.cc
@@ -5,9 +5,11 @@
 #include "chrome/utility/local_discovery/service_discovery_message_handler.h"
 
 #include <algorithm>
+#include <vector>
 
 #include "base/lazy_instance.h"
 #include "base/location.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/single_thread_task_runner.h"
 #include "chrome/common/local_discovery/local_discovery_messages.h"
 #include "chrome/common/local_discovery/service_discovery_client_impl.h"
@@ -72,12 +74,16 @@ class PreCreatedMDnsSocketFactory : public net::MDnsSocketFactory {
   ~PreCreatedMDnsSocketFactory() override {
     // Not empty if process exits too fast, before starting mDns code. If
     // happened, destructors may crash accessing destroyed global objects.
-    sockets_.weak_clear();
+    // TODO This sounds memory leak, check and do better if possible
+    for (scoped_ptr<net::DatagramServerSocket>& it : sockets_) {

[Vitaly Buka (NO REVIEWS), 2015/12/02 18:32:10]

use of {} is inconsistent with the rest of the file

+      base::IgnoreResult(it.release());
+    }
+    sockets_.clear();
   }
 
   // net::MDnsSocketFactory implementation:
   void CreateSockets(
-      ScopedVector<net::DatagramServerSocket>* sockets) override {
+      std::vector<scoped_ptr<net::DatagramServerSocket>>* sockets) override {
     sockets->swap(sockets_);
     Reset();
   }
@@ -90,7 +96,7 @@ class PreCreatedMDnsSocketFactory : public net::MDnsSocketFactory {
                                      socket_info.interface_index));
     if (socket) {
       socket->DetachFromThread();
-      sockets_.push_back(socket.release());
+      sockets_.push_back(std::move(socket));
     }
   }
 
@@ -99,7 +105,7 @@ class PreCreatedMDnsSocketFactory : public net::MDnsSocketFactory {
   }
 
  private:
-  ScopedVector<net::DatagramServerSocket> sockets_;
+  std::vector<scoped_ptr<net::DatagramServerSocket>> sockets_;
 
   DISALLOW_COPY_AND_ASSIGN(PreCreatedMDnsSocketFactory);
 };