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"
 #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 81 matching lines @@
 
     // Verify that the address is correct.
     EXPECT_TRUE(it->address.IsValid()) << "Invalid address of size "
                                        << it->address.size();
     EXPECT_FALSE(it->address.IsZero());
     EXPECT_GT(it->prefix_length, 1u);
     EXPECT_LE(it->prefix_length, it->address.size() * 8);
 
 #if defined(OS_WIN)
     // On Windows |name| is NET_LUID.
-    base::ScopedNativeLibrary phlpapi_lib(
-        base::FilePath(FILE_PATH_LITERAL("iphlpapi.dll")));
-    ASSERT_TRUE(phlpapi_lib.is_valid());
     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*);

[mmenke, 2016/05/18 17:54:03]

Actually, you need to remove these two typedefs as well.

Basically what was happening is that Windows Vista and later have
ConvertInterfaceIndexToLuid and ConvertInterfaceLuidToGuid methods.  Windows XP
does not.  So to use the methods in tests, we had to create typedefs for
function pointers to methods with their prototyes, and create pointers of those
types, and try to load those functions (And their pointers) from a DLL while the
test was running.  If they failed to load, we verified we were on XP.

Now that we're not supporting XP, we can get rid of the typedefs and loading the
functions.

One thing that made this confusing is that "ConvertInterfaceIndexToLuid" is the
name of the function, but here we're using the same string for the typedef of a
pointer to the real function, so the typedef overrides the global
"ConvertInterfaceIndexToLuid" function, which is what we really want to use.

Hope you can follow this explanation - DLL loading and function pointers are a
bit weird.

[maksims (do not use this acc), 2016/05/19 05:58:31]

Done. Thank you for explanations!

-    ConvertInterfaceLuidToGuid luid_to_guid =
-        reinterpret_cast<ConvertInterfaceLuidToGuid>(
-            phlpapi_lib.GetFunctionPointer("ConvertInterfaceLuidToGuid"));
 
-    if (interface_to_luid && luid_to_guid) {
-      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.
-    }
+    NET_LUID luid;
+    EXPECT_EQ(static_cast<DWORD>(NO_ERROR),
+              ConvertInterfaceIndexToLuid(it->interface_index, &luid));
+    GUID guid;
+    EXPECT_EQ(static_cast<DWORD>(NO_ERROR),
+              ConvertInterfaceLuidToGuid(&luid, &guid));
+    LPOLESTR name;
+    StringFromCLSID(guid, &name);
+    EXPECT_STREQ(base::UTF8ToWide(it->name).c_str(), name);
+    CoTaskMemFree(name);
+
     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 301 matching lines @@
   adapter_address.FirstPrefix = &adapter_prefix;
 
   // Address of offline links should be ignored.
   ASSERT_TRUE(FillAdapterAddress(
       &adapter_address /* adapter_address */, ifname_em1 /* ifname */,
       ipv6_address /* ip_address */, ipv6_prefix /* ip_netmask */,
       addresses /* sock_addrs */));
   adapter_address.OperStatus = IfOperStatusDown;
 
   EXPECT_TRUE(internal::GetNetworkListImpl(
       &results, INCLUDE_HOST_SCOPE_VIRTUAL_INTERFACES, true, &adapter_address));

[mmenke, 2016/05/18 17:54:03]

All 7 of the "internal::GetNetworkListImpl" calls in this test should have their
3rd parameter (the "true") removed, since you're removing the "is_xp" argument. 
No other test needs to be updated (Other than GetNetworkList, of course)

[maksims (do not use this acc), 2016/05/19 05:58:31]

Done.

 
   EXPECT_EQ(results.size(), 0ul);
 
   // Address on loopback interface should be trimmed out.
   ASSERT_TRUE(FillAdapterAddress(
       &adapter_address /* adapter_address */, ifname_em1 /* ifname */,
       ipv6_local_address /* ip_address */, ipv6_prefix /* ip_netmask */,
       addresses /* sock_addrs */));
   adapter_address.IfType = IF_TYPE_SOFTWARE_LOOPBACK;
 
@@ skipping 238 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