Revert 255311 "Bind before sandbox lockdown on Windows."

trunk/src/chrome/utility/local_discovery/service_discovery_message_handler.cc

 // 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.
 
 #include "chrome/utility/local_discovery/service_discovery_message_handler.h"
 
 #include <algorithm>
 
 #include "base/lazy_instance.h"
 #include "chrome/common/local_discovery/local_discovery_messages.h"
@@ skipping 54 matching lines @@
 class PreCreatedMDnsSocketFactory : public net::MDnsSocketFactory {
  public:
   PreCreatedMDnsSocketFactory() {}
   virtual ~PreCreatedMDnsSocketFactory() {
     Reset();
   }
 
   // net::MDnsSocketFactory implementation:
   virtual void CreateSockets(
       ScopedVector<net::DatagramServerSocket>* sockets) OVERRIDE {
-    sockets->swap(sockets_);
-    Reset();
+    for (size_t i = 0; i < sockets_.size(); ++i) {
+      // Takes ownership of sockets_[i].socket;
+      ScopedSocketFactory platform_factory(sockets_[i].socket);
+      scoped_ptr<net::DatagramServerSocket> socket(
+          net::CreateAndBindMDnsSocket(sockets_[i].address_family,
+                                       sockets_[i].interface_index));
+      if (socket)
+        sockets->push_back(socket.release());
+    }
+    sockets_.clear();
   }
 
-  void AddSocket(const SocketInfo& socket_info) {
-    // Takes ownership of socket_info.socket;
-    ScopedSocketFactory platform_factory(socket_info.socket);
-    scoped_ptr<net::DatagramServerSocket> socket(
-        net::CreateAndBindMDnsSocket(socket_info.address_family,
-                                     socket_info.interface_index));
-    if (socket) {
-      socket->DetachFromThread();
-      sockets_.push_back(socket.release());
-    }
+  void AddSocket(const SocketInfo& socket) {
+    sockets_.push_back(socket);
   }
 
   void Reset() {
+    for (size_t i = 0; i < sockets_.size(); ++i) {
+      if (sockets_[i].socket != net::kInvalidSocket)
+        ClosePlatformSocket(sockets_[i].socket);
+    }
     sockets_.clear();
   }
 
  private:
-  ScopedVector<net::DatagramServerSocket> sockets_;
+  std::vector<SocketInfo> sockets_;
 
   DISALLOW_COPY_AND_ASSIGN(PreCreatedMDnsSocketFactory);
 };
 
 base::LazyInstance<PreCreatedMDnsSocketFactory>
     g_local_discovery_socket_factory = LAZY_INSTANCE_INITIALIZER;
 
 #if defined(OS_WIN)
 
 void ClosePlatformSocket(net::SocketDescriptor socket) {
@@ skipping 357 matching lines @@
           id, success, address_ipv4, address_ipv6));
 }
 
 void ServiceDiscoveryMessageHandler::Send(IPC::Message* msg) {
   utility_task_runner_->PostTask(FROM_HERE,
                                  base::Bind(&SendHostMessageOnUtilityThread,
                                             msg));
 }
 
 }  // namespace local_discovery