Remove ScopedVector from CreateSockets

chrome/browser/local_discovery/service_discovery_client_mdns.cc

 // Copyright 2014 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.
 
 #include "chrome/browser/local_discovery/service_discovery_client_mdns.h"
 
 #include "base/location.h"
 #include "base/memory/scoped_vector.h"

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

Remove, include scoped_ptr, vector instead.

 #include "base/metrics/histogram.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "chrome/common/local_discovery/service_discovery_client_impl.h"
 #include "content/public/browser/browser_thread.h"
 #include "net/dns/mdns_client.h"
 #include "net/udp/datagram_server_socket.h"
 
 namespace local_discovery {
 
@@ skipping 89 matching lines @@
 
 typedef base::Callback<void(bool)> MdnsInitCallback;
 
 class SocketFactory : public net::MDnsSocketFactory {
  public:
   explicit SocketFactory(const net::InterfaceIndexFamilyList& interfaces)
       : interfaces_(interfaces) {}
 
   // net::MDnsSocketFactory implementation:
   void CreateSockets(
-      ScopedVector<net::DatagramServerSocket>* sockets) override {
+      std::vector<scoped_ptr<net::DatagramServerSocket>>* sockets) override {
     for (size_t i = 0; i < interfaces_.size(); ++i) {
       DCHECK(interfaces_[i].second == net::ADDRESS_FAMILY_IPV4 ||
              interfaces_[i].second == net::ADDRESS_FAMILY_IPV6);
       scoped_ptr<net::DatagramServerSocket> socket(
           CreateAndBindMDnsSocket(interfaces_[i].second, interfaces_[i].first));
       if (socket)
-        sockets->push_back(socket.release());
+        sockets->push_back(std::move(socket));
     }
   }
 
  private:
   net::InterfaceIndexFamilyList interfaces_;
 };
 
 void InitMdns(const MdnsInitCallback& on_initialized,
               const net::InterfaceIndexFamilyList& interfaces,
               net::MDnsClient* mdns) {
@@ skipping 298 matching lines @@
   OnBeforeMdnsDestroy();
   // After calling |Proxy::OnMdnsDestroy| all references to client_ and mdns_
   // should be destroyed.
   if (client_)
     mdns_runner_->DeleteSoon(FROM_HERE, client_.release());
   if (mdns_)
     mdns_runner_->DeleteSoon(FROM_HERE, mdns_.release());
 }
 
 }  // namespace local_discovery