net: move udp directory into socket

net/dns/address_sorter_posix.cc

Index: net/dns/address_sorter_posix.cc
diff --git a/net/dns/address_sorter_posix.cc b/net/dns/address_sorter_posix.cc
index 730fb4fb23a1f15721a1cd50cf66edbf1eae4002..18f0a3daf9b0b56299030b06a95ab4889d43d279 100644
--- a/net/dns/address_sorter_posix.cc
+++ b/net/dns/address_sorter_posix.cc
@@ -10,12 +10,12 @@
 #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>
@@ -25,7 +25,7 @@
 #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"