| Index: net/base/net_util_win.h
|
| diff --git a/net/base/net_util_win.h b/net/base/net_util_win.h
|
| deleted file mode 100644
|
| index b0c2dd6217ee4a5fa095e15a1492b8d2052622ac..0000000000000000000000000000000000000000
|
| --- a/net/base/net_util_win.h
|
| +++ /dev/null
|
| @@ -1,93 +0,0 @@
|
| -// Copyright (c) 2014 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_BASE_NET_UTIL_WIN_H_
|
| -#define NET_BASE_NET_UTIL_WIN_H_
|
| -
|
| -// This file is only used to expose some of the internals
|
| -// of net_util_win.cc to tests.
|
| -
|
| -#include <iphlpapi.h>
|
| -#include <wlanapi.h>
|
| -
|
| -#include "base/win/scoped_handle.h"
|
| -#include "net/base/net_export.h"
|
| -#include "net/base/net_util.h"
|
| -
|
| -namespace net {
|
| -namespace internal {
|
| -
|
| -struct NET_EXPORT WlanApi {
|
| - typedef DWORD (WINAPI *WlanOpenHandleFunc)(
|
| - DWORD, VOID*, DWORD*, HANDLE*);
|
| - typedef DWORD (WINAPI *WlanEnumInterfacesFunc)(
|
| - HANDLE, VOID*, WLAN_INTERFACE_INFO_LIST**);
|
| - typedef DWORD (WINAPI *WlanQueryInterfaceFunc)(
|
| - HANDLE, const GUID*, WLAN_INTF_OPCODE, VOID*, DWORD*, VOID**,
|
| - WLAN_OPCODE_VALUE_TYPE*);
|
| - typedef DWORD (WINAPI *WlanSetInterfaceFunc)(
|
| - HANDLE, const GUID*, WLAN_INTF_OPCODE, DWORD, const VOID*, VOID*);
|
| - typedef VOID (WINAPI *WlanFreeMemoryFunc)(VOID*);
|
| - typedef DWORD (WINAPI *WlanCloseHandleFunc)(HANDLE, VOID*);
|
| -
|
| - WlanApi();
|
| - static WlanApi& GetInstance();
|
| -
|
| - template <typename T>
|
| - DWORD OpenHandle(DWORD client_version, DWORD* cur_version, T* handle) const {
|
| - HANDLE temp_handle;
|
| - DWORD result = open_handle_func(client_version, NULL, cur_version,
|
| - &temp_handle);
|
| - if (result != ERROR_SUCCESS)
|
| - return result;
|
| - handle->Set(temp_handle);
|
| - return ERROR_SUCCESS;
|
| - }
|
| -
|
| - HMODULE module;
|
| - WlanOpenHandleFunc open_handle_func;
|
| - WlanEnumInterfacesFunc enum_interfaces_func;
|
| - WlanQueryInterfaceFunc query_interface_func;
|
| - WlanSetInterfaceFunc set_interface_func;
|
| - WlanFreeMemoryFunc free_memory_func;
|
| - WlanCloseHandleFunc close_handle_func;
|
| - bool initialized;
|
| -};
|
| -
|
| -struct WlanApiHandleTraits {
|
| - typedef HANDLE Handle;
|
| -
|
| - static bool CloseHandle(HANDLE handle) {
|
| - return WlanApi::GetInstance().close_handle_func(handle, NULL) ==
|
| - ERROR_SUCCESS;
|
| - }
|
| - static bool IsHandleValid(HANDLE handle) {
|
| - return base::win::HandleTraits::IsHandleValid(handle);
|
| - }
|
| - static HANDLE NullHandle() {
|
| - return base::win::HandleTraits::NullHandle();
|
| - }
|
| -};
|
| -
|
| -typedef base::win::GenericScopedHandle<
|
| - WlanApiHandleTraits,
|
| - base::win::DummyVerifierTraits> WlanHandle;
|
| -
|
| -struct WlanApiDeleter {
|
| - inline void operator()(void* ptr) const {
|
| - WlanApi::GetInstance().free_memory_func(ptr);
|
| - }
|
| -};
|
| -
|
| -NET_EXPORT bool GetNetworkListImpl(
|
| - NetworkInterfaceList* networks,
|
| - int policy,
|
| - bool is_xp,
|
| - const IP_ADAPTER_ADDRESSES* ip_adapter_addresses);
|
| -
|
| -} // namespace internal
|
| -
|
| -} // namespace net
|
| -
|
| -#endif // NET_BASE_NET_UTIL_WIN_H_
|
|
|