From a1bc6f33efae54491df22c333ed65d1aa13cb280 Mon Sep 17 00:00:00 2001
From: wolfbeast <mcwerewolf@gmail.com>
Date: Mon, 19 Feb 2018 20:29:13 +0100
Subject: Remove obsolete WinXPWifiScanner class.

Tag #22
---
 netwerk/wifi/nsWifiScannerWin.cpp | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

(limited to 'netwerk/wifi/nsWifiScannerWin.cpp')

diff --git a/netwerk/wifi/nsWifiScannerWin.cpp b/netwerk/wifi/nsWifiScannerWin.cpp
index ef18706e4..6089c45c6 100644
--- a/netwerk/wifi/nsWifiScannerWin.cpp
+++ b/netwerk/wifi/nsWifiScannerWin.cpp
@@ -12,8 +12,6 @@
 #include "nsServiceManagerUtils.h"
 #include "nsWifiAccessPoint.h"
 #include "win_wifiScanner.h"
-#include "win_xp_wifiScanner.h"
-#include "mozilla/WindowsVersion.h"
 
 using namespace mozilla;
 
@@ -31,14 +29,7 @@ nsresult
 nsWifiMonitor::DoScan()
 {
     if (!mWinWifiScanner) {
-      if (IsWin2003OrLater()) {
-        mWinWifiScanner = new WinWifiScanner();
-        LOG(("Using Windows 2003+ wifi scanner."));
-      } else {
-        mWinWifiScanner = new WinXPWifiScanner();
-        LOG(("Using Windows XP wifi scanner."));
-      }
-
+      mWinWifiScanner = new WinWifiScanner();
       if (!mWinWifiScanner) {
         // TODO: Probably return OOM error
         return NS_ERROR_FAILURE;
-- 
cgit v1.2.3