net: move udp directory into socket

net/socket/udp_socket_win.h

 // 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.
 
-#ifndef NET_UDP_UDP_SOCKET_WIN_H_
-#define NET_UDP_UDP_SOCKET_WIN_H_
+#ifndef NET_SOCKET_UDP_SOCKET_WIN_H_
+#define NET_SOCKET_UDP_SOCKET_WIN_H_
 
 #include <qos2.h>
 #include <stdint.h>
 #include <winsock2.h>
 
 #include <memory>
 
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/threading/non_thread_safe.h"
 #include "base/win/object_watcher.h"
 #include "base/win/scoped_handle.h"
 #include "net/base/address_family.h"
 #include "net/base/completion_callback.h"
 #include "net/base/io_buffer.h"
 #include "net/base/ip_endpoint.h"
 #include "net/base/net_export.h"
 #include "net/base/network_change_notifier.h"
 #include "net/base/rand_callback.h"
 #include "net/log/net_log_with_source.h"
-#include "net/udp/datagram_socket.h"
-#include "net/udp/diff_serv_code_point.h"
+#include "net/socket/datagram_socket.h"
+#include "net/socket/diff_serv_code_point.h"
 
 namespace net {
 
 class IPAddress;
 class NetLog;
 struct NetLogSource;
 
 class NET_EXPORT UDPSocketWin
     : NON_EXPORTED_BASE(public base::NonThreadSafe),
       NON_EXPORTED_BASE(public base::win::ObjectWatcher::Delegate) {
@@ skipping 340 matching lines @@
   RemoveSocketFromFlowFn remove_socket_from_flow_func_;
   SetFlowFn set_flow_func_;
 
   FRIEND_TEST_ALL_PREFIXES(UDPSocketTest, SetDSCPFake);
   DISALLOW_COPY_AND_ASSIGN(QwaveAPI);
 };
 
 
 }  // namespace net
 
-#endif  // NET_UDP_UDP_SOCKET_WIN_H_
+#endif  // NET_SOCKET_UDP_SOCKET_WIN_H_