Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(365)

Unified Diff: net/socket/socket_descriptor.cc

Issue 1982263003: Remove Windows XP specific socket cleanup timer from net/socket. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: re-add tests Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/socket/client_socket_pool_base_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/socket_descriptor.cc
diff --git a/net/socket/socket_descriptor.cc b/net/socket/socket_descriptor.cc
index 0822d2d99831d743601a4b84ccf60ec29d42a45c..b10f2dcb41d6b682d48b9c63d5a3c9d3cec88e54 100644
--- a/net/socket/socket_descriptor.cc
+++ b/net/socket/socket_descriptor.cc
@@ -11,7 +11,6 @@
#if defined(OS_WIN)
#include <ws2tcpip.h>
-#include "base/win/windows_version.h"
#include "net/base/winsock_init.h"
#endif
@@ -22,8 +21,7 @@ SocketDescriptor CreatePlatformSocket(int family, int type, int protocol) {
EnsureWinsockInit();
SocketDescriptor result = ::WSASocket(family, type, protocol, nullptr, 0,
WSA_FLAG_OVERLAPPED);
- if (result != kInvalidSocket && family == AF_INET6 &&
- base::win::OSInfo::GetInstance()->version() >= base::win::VERSION_VISTA) {
+ if (result != kInvalidSocket && family == AF_INET6) {
DWORD value = 0;
if (setsockopt(result, IPPROTO_IPV6, IPV6_V6ONLY,
reinterpret_cast<const char*>(&value), sizeof(value))) {
« no previous file with comments | « net/socket/client_socket_pool_base_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698