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

net/base/net_util_win.cc

 // Copyright (c) 2012 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/base/net_util.h"
 
 #include <iphlpapi.h>
 #include <wlanapi.h>
 
 #include <algorithm>
@@ skipping 43 matching lines @@
         ::GetProcAddress(module, "WlanQueryInterface"));
     free_memory_func = reinterpret_cast<WlanFreeMemoryFunc>(
         ::GetProcAddress(module, "WlanFreeMemory"));
     close_handle_func = reinterpret_cast<WlanCloseHandleFunc>(
         ::GetProcAddress(module, "WlanCloseHandle"));
     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;
   WlanOpenHandleFunc open_handle_func;
   WlanEnumInterfacesFunc enum_interfaces_func;
   WlanQueryInterfaceFunc query_interface_func;
   WlanFreeMemoryFunc free_memory_func;
   WlanCloseHandleFunc close_handle_func;
   bool initialized;
 };
 
 }  // namespace
@@ skipping 155 matching lines @@
     }
   };
 
   const WlanApi& wlanapi = lazy_wlanapi.Get();
   if (!wlanapi.initialized)
     return WIFI_PHY_LAYER_PROTOCOL_NONE;
 
   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;
 
   WLAN_INTERFACE_INFO_LIST* interface_list_ptr = NULL;
   result = wlanapi.enum_interfaces_func(client, NULL, &interface_list_ptr);
   if (result != ERROR_SUCCESS)
     return WIFI_PHY_LAYER_PROTOCOL_NONE;
   scoped_ptr<WLAN_INTERFACE_INFO_LIST, WlanApiDeleter> interface_list(
       interface_list_ptr);
 
@@ skipping 35 matching lines @@
     case dot11_phy_type_erp:
       return WIFI_PHY_LAYER_PROTOCOL_G;
     case dot11_phy_type_ht:
       return WIFI_PHY_LAYER_PROTOCOL_N;
     default:
       return WIFI_PHY_LAYER_PROTOCOL_UNKNOWN;
   }
 }
 
 }  // namespace net