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..68914e2492fb36006c19cefa9e4b79dbc19a8551 100644
--- a/chrome/utility/local_discovery/service_discovery_message_handler.cc
+++ b/chrome/utility/local_discovery/service_discovery_message_handler.cc
@@ -72,12 +72,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_) {
+      base::IgnoreResult(it.release());
+    }
+    sockets_.clear();
   }
 
   // net::MDnsSocketFactory implementation:
   void CreateSockets(
-      ScopedVector<net::DatagramServerSocket>* sockets) override {
+      std::vector<scoped_ptr<net::DatagramServerSocket>>* sockets) override {

[mmenke, 2015/11/24 17:39:33]

include vector / scoped_ptr (At least in net, we generally try to include the
transitive dependencies we use directly, even when needed just to declare a
method we're overriding)

     sockets->swap(sockets_);
     Reset();
   }
@@ -90,7 +94,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 +103,7 @@ class PreCreatedMDnsSocketFactory : public net::MDnsSocketFactory {
   }
 
  private:
-  ScopedVector<net::DatagramServerSocket> sockets_;
+  std::vector<scoped_ptr<net::DatagramServerSocket>> sockets_;
 
   DISALLOW_COPY_AND_ASSIGN(PreCreatedMDnsSocketFactory);
 };