Reverting until bots clear up.

runtime/bin/socket_win.h

Index: runtime/bin/socket_win.h
diff --git a/runtime/bin/socket_base_win.h b/runtime/bin/socket_win.h
similarity index 57%
rename from runtime/bin/socket_base_win.h
rename to runtime/bin/socket_win.h
index 55ab91d907e07c649ced43989a579e71c647d383..38aeea2d3a020c3296a7d4fe7c02c6c31b84f2a0 100644
--- a/runtime/bin/socket_base_win.h
+++ b/runtime/bin/socket_win.h
@@ -2,11 +2,11 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#ifndef RUNTIME_BIN_SOCKET_BASE_WIN_H_
-#define RUNTIME_BIN_SOCKET_BASE_WIN_H_
+#ifndef RUNTIME_BIN_SOCKET_WIN_H_
+#define RUNTIME_BIN_SOCKET_WIN_H_
 
-#if !defined(RUNTIME_BIN_SOCKET_BASE_H_)
-#error Do not include socket_base_win.h directly. Use socket_base.h.
+#if !defined(RUNTIME_BIN_SOCKET_H_)
+#error Do not include socket_win.h directly. Use socket.h.
 #endif
 
 #include <iphlpapi.h>
@@ -14,4 +14,4 @@
 #include <winsock2.h>
 #include <ws2tcpip.h>
 
-#endif  // RUNTIME_BIN_SOCKET_BASE_WIN_H_
+#endif  // RUNTIME_BIN_SOCKET_WIN_H_