Merge 237541 "Revert of https://codereview.chromium.org/71013004/"

net/base/net_util_win.cc

Index: net/base/net_util_win.cc
===================================================================
--- net/base/net_util_win.cc	(revision 237598)
+++ net/base/net_util_win.cc	(working copy)
@@ -61,17 +61,6 @@
                   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;
   WlanOpenHandleFunc open_handle_func;
   WlanEnumInterfacesFunc enum_interfaces_func;
@@ -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;