net: move udp directory into socket

net/dns/address_sorter_posix.cc

 // Copyright (c) 2012 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 "net/dns/address_sorter_posix.h"
 
 #include <netinet/in.h>
 
 #include <memory>
 #include <utility>
 
 #if defined(OS_MACOSX) || defined(OS_BSD)
-#include <sys/socket.h>  // Must be included before ifaddrs.h.
 #include <ifaddrs.h>
 #include <net/if.h>
 #include <netinet/in_var.h>
 #include <string.h>
 #include <sys/ioctl.h>
+#include <sys/socket.h>  // Must be included before ifaddrs.h.

[eroman, 2016/11/15 23:41:45]

The comment suggests this shouldn't be moved.

[tfarina, 2016/11/15 23:59:13]

No idea how that ended up here. I didn't run sort-headers.py on it. :/

 #endif
 
 #include <algorithm>
 #include <vector>
 
 #include "base/logging.h"
 #include "net/base/net_errors.h"
 #include "net/log/net_log_source.h"
 #include "net/socket/client_socket_factory.h"
-#include "net/udp/datagram_client_socket.h"
+#include "net/socket/datagram_client_socket.h"
 
 #if defined(OS_LINUX)
 #include "net/base/address_tracker_linux.h"
 #endif
 
 namespace net {
 
 namespace {
 
 // Address sorting is performed according to RFC3484 with revisions.
@@ skipping 352 matching lines @@
 }
 
 // static
 std::unique_ptr<AddressSorter> AddressSorter::CreateAddressSorter() {
   return std::unique_ptr<AddressSorter>(
       new AddressSorterPosix(ClientSocketFactory::GetDefaultFactory()));
 }
 
 }  // namespace net