Remove ScopedVector from CreateSockets

net/dns/mdns_client_impl.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef NET_DNS_MDNS_CLIENT_IMPL_H_
 #define NET_DNS_MDNS_CLIENT_IMPL_H_
 
 #include <map>
 #include <queue>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/cancelable_callback.h"
 #include "base/gtest_prod_util.h"
-#include "base/memory/scoped_vector.h"
 #include "base/observer_list.h"
 #include "net/base/io_buffer.h"
 #include "net/base/ip_endpoint.h"
 #include "net/dns/mdns_cache.h"
 #include "net/dns/mdns_client.h"
 #include "net/udp/datagram_server_socket.h"
 #include "net/udp/udp_server_socket.h"
 #include "net/udp/udp_socket.h"
 
 namespace base {
 class Clock;
 class Timer;
 }  // namespace base
 
 namespace net {
 
 class MDnsSocketFactoryImpl : public MDnsSocketFactory {
  public:
   MDnsSocketFactoryImpl() {}
   ~MDnsSocketFactoryImpl() override{};
 
-  void CreateSockets(ScopedVector<DatagramServerSocket>* sockets) override;
+  void CreateSockets(
+      std::vector<scoped_ptr<DatagramServerSocket>>* sockets) override;

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

include scoped_ptr

 
  private:
   DISALLOW_COPY_AND_ASSIGN(MDnsSocketFactoryImpl);
 };
 
 // A connection to the network for multicast DNS clients. It reads data into
 // DnsResponse objects and alerts the delegate that a packet has been received.
 class NET_EXPORT_PRIVATE MDnsConnection {
  public:
   class Delegate {
@@ skipping 41 matching lines @@
 
   // Callback for handling a datagram being received on either ipv4 or ipv6.
   void OnDatagramReceived(DnsResponse* response,
                           const IPEndPoint& recv_addr,
                           int bytes_read);
 
   void PostOnError(SocketHandler* loop, int rv);
   void OnError(int rv);
 
   // Only socket handlers which successfully bound and started are kept.
-  ScopedVector<SocketHandler> socket_handlers_;
+  std::vector<scoped_ptr<SocketHandler>> socket_handlers_;
 
   Delegate* delegate_;
 
   base::WeakPtrFactory<MDnsConnection> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(MDnsConnection);
 };
 
 class MDnsListenerImpl;
 
@@ skipping 208 matching lines @@
   MDnsClientImpl* client_;
 
   bool started_;
   int flags_;
 
   DISALLOW_COPY_AND_ASSIGN(MDnsTransactionImpl);
 };
 
 }  // namespace net
 #endif  // NET_DNS_MDNS_CLIENT_IMPL_H_