| Index: net/socket/socket_descriptor.cc
|
| diff --git a/net/socket/socket_descriptor.cc b/net/socket/socket_descriptor.cc
|
| deleted file mode 100644
|
| index 81787a29d259feb645bfd53978cd33e71fadfd7c..0000000000000000000000000000000000000000
|
| --- a/net/socket/socket_descriptor.cc
|
| +++ /dev/null
|
| @@ -1,61 +0,0 @@
|
| -// Copyright 2013 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/socket/socket_descriptor.h"
|
| -
|
| -#if defined(OS_POSIX)
|
| -#include <sys/types.h>
|
| -#include <sys/socket.h>
|
| -#endif
|
| -
|
| -#include "base/basictypes.h"
|
| -
|
| -#if defined(OS_WIN)
|
| -#include <ws2tcpip.h>
|
| -#include "base/win/windows_version.h"
|
| -#include "net/base/winsock_init.h"
|
| -#endif
|
| -
|
| -namespace net {
|
| -
|
| -PlatformSocketFactory* g_socket_factory = NULL;
|
| -
|
| -PlatformSocketFactory::PlatformSocketFactory() {
|
| -}
|
| -
|
| -PlatformSocketFactory::~PlatformSocketFactory() {
|
| -}
|
| -
|
| -void PlatformSocketFactory::SetInstance(PlatformSocketFactory* factory) {
|
| - g_socket_factory = factory;
|
| -}
|
| -
|
| -SocketDescriptor CreateSocketDefault(int family, int type, int protocol) {
|
| -#if defined(OS_WIN)
|
| - EnsureWinsockInit();
|
| - SocketDescriptor result = ::WSASocket(family, type, protocol, NULL, 0,
|
| - WSA_FLAG_OVERLAPPED);
|
| - if (result != kInvalidSocket && family == AF_INET6 &&
|
| - base::win::OSInfo::GetInstance()->version() >= base::win::VERSION_VISTA) {
|
| - DWORD value = 0;
|
| - if (setsockopt(result, IPPROTO_IPV6, IPV6_V6ONLY,
|
| - reinterpret_cast<const char*>(&value), sizeof(value))) {
|
| - closesocket(result);
|
| - return kInvalidSocket;
|
| - }
|
| - }
|
| - return result;
|
| -#else // OS_WIN
|
| - return ::socket(family, type, protocol);
|
| -#endif // OS_WIN
|
| -}
|
| -
|
| -SocketDescriptor CreatePlatformSocket(int family, int type, int protocol) {
|
| - if (g_socket_factory)
|
| - return g_socket_factory->CreateSocket(family, type, protocol);
|
| - else
|
| - return CreateSocketDefault(family, type, protocol);
|
| -}
|
| -
|
| -} // namespace net
|
|
|