Remove Windows Vista/XP specific code from net/base

net/base/network_interfaces_unittest.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/network_interfaces.h"
 
 #include <ostream>
 #include <string>
 #include <unordered_set>
 
@@ skipping 18 matching lines @@
 #include <netinet/in_var.h>
 #endif  // !OS_IOS
 #endif  // OS_MACOSX
 #endif  // !OS_NACL && !OS_WIN
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 
 #if defined(OS_WIN)
 #include <iphlpapi.h>
 #include <objbase.h>
 #include "base/win/windows_version.h"

[mmenke, 2016/05/17 11:25:23]

No longer needed.

[maksims (do not use this acc), 2016/05/18 09:12:06]

Done.

 #endif  // OS_WIN
 
 #if !defined(OS_MACOSX) && !defined(OS_NACL) && !defined(OS_WIN)
 #include "net/base/address_tracker_linux.h"
 #endif  // !OS_MACOSX && !OS_NACL && !OS_WIN
 
 #if defined(OS_WIN)
 #include "net/base/network_interfaces_win.h"
 #else  // OS_WIN
 #include "net/base/network_interfaces_posix.h"
@@ skipping 94 matching lines @@
     typedef NETIO_STATUS (WINAPI* ConvertInterfaceIndexToLuid)(NET_IFINDEX,
                                                                PNET_LUID);
     ConvertInterfaceIndexToLuid interface_to_luid =
         reinterpret_cast<ConvertInterfaceIndexToLuid>(
             phlpapi_lib.GetFunctionPointer("ConvertInterfaceIndexToLuid"));
 
     typedef NETIO_STATUS (WINAPI* ConvertInterfaceLuidToGuid)(NET_LUID*,
                                                               GUID*);
     ConvertInterfaceLuidToGuid luid_to_guid =
         reinterpret_cast<ConvertInterfaceLuidToGuid>(
             phlpapi_lib.GetFunctionPointer("ConvertInterfaceLuidToGuid"));

[mattmenke_gmail.com, 2016/05/17 12:34:39]

If you look at these, right now, we're trying to load these methods from a dll
at runtime, rather than when the test binary is loaded.  That's because these
methods don't exist on XP.  Now that we're not using them on XP, we no longer
need to do this.  So can remove this code, and use the methods directly. 
THey're declared in iphlpapi.h.  We're already linking to the requisite lib
file, so nothing else should be needed, I believe.

 
     if (interface_to_luid && luid_to_guid) {

[mmenke, 2016/05/17 11:25:23]

I think these should both be EXPECT_TRUE, now?

Actually, can we just include <Iphlpapi.h>, and statically link them?  Net's
already linked against iphlpapi.lib.

[maksims (do not use this acc), 2016/05/17 11:47:48]

Did not get the part about static linking. What do you exactly mean?

       NET_LUID luid;
       EXPECT_EQ(static_cast<DWORD>(NO_ERROR),
                 interface_to_luid(it->interface_index, &luid));
       GUID guid;
       EXPECT_EQ(static_cast<DWORD>(NO_ERROR), luid_to_guid(&luid, &guid));
       LPOLESTR name;
       StringFromCLSID(guid, &name);
       EXPECT_STREQ(base::UTF8ToWide(it->name).c_str(), name);
       CoTaskMemFree(name);
       continue;
-    } else {
-      EXPECT_LT(base::win::GetVersion(), base::win::VERSION_VISTA);
-      EXPECT_LT(it->interface_index, 1u << 24u);  // Must fit 0.x.x.x.
-      EXPECT_NE(it->interface_index, 0u);  // 0 means to use default.
     }
+
     if (it->type == NetworkChangeNotifier::CONNECTION_WIFI) {
       EXPECT_NE(WIFI_PHY_LAYER_PROTOCOL_NONE, GetWifiPHYLayerProtocol());
     }
 #elif !defined(OS_ANDROID)
     char name[IF_NAMESIZE];
     EXPECT_TRUE(if_indextoname(it->interface_index, name));
     EXPECT_STREQ(it->name.c_str(), name);
 #endif
   }
 }
@@ skipping 560 matching lines @@
   // We can't check the result of GetHostName() directly, since the result
   // will differ across machines. Our goal here is to simply exercise the
   // code path, and check that things "look about right".
   std::string hostname = GetHostName();
   EXPECT_FALSE(hostname.empty());
 }
 
 }  // namespace
 
 }  // namespace net