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

Unified Diff: net/base/net_util_win.cc

Issue 90963002: Revert of Base: Remove Receive() from ScopedHandle. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 1 month 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 | « device/bluetooth/bluetooth_task_manager_win.cc ('k') | printing/backend/win_helper.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/base/net_util_win.cc
diff --git a/net/base/net_util_win.cc b/net/base/net_util_win.cc
index b44836ce3b569b9faf35099b9e6423b1300dee58..bbe165515c049f86bd559621943a1d7b02bf7560 100644
--- a/net/base/net_util_win.cc
+++ b/net/base/net_util_win.cc
@@ -59,17 +59,6 @@
initialized = open_handle_func && enum_interfaces_func &&
query_interface_func && free_memory_func &&
close_handle_func;
- }
-
- 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;
@@ -247,7 +236,8 @@
WlanHandle client;
DWORD cur_version = 0;
const DWORD kMaxClientVersion = 2;
- DWORD result = wlanapi.OpenHandle(kMaxClientVersion, &cur_version, &client);
+ DWORD result = wlanapi.open_handle_func(kMaxClientVersion, NULL, &cur_version,
+ client.Receive());
if (result != ERROR_SUCCESS)
return WIFI_PHY_LAYER_PROTOCOL_NONE;
« no previous file with comments | « device/bluetooth/bluetooth_task_manager_win.cc ('k') | printing/backend/win_helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698