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"));
+    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);
 
-    typedef NETIO_STATUS (WINAPI* ConvertInterfaceLuidToGuid)(NET_LUID*,
-                                                              GUID*);
-    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.
-    }
     if (it->type == NetworkChangeNotifier::CONNECTION_WIFI) {
       EXPECT_NE(WIFI_PHY_LAYER_PROTOCOL_NONE, GetWifiPHYLayerProtocol());
     }

[mmenke, 2016/05/19 15:02:37]

Hrm...This code wasn't being run on non-XP systems before, because of the
continue line that you removed.  Since this code wasn't in the XP branch, I
strongly suspect that was a bug, and removing the continue line fixes it.  Just
adding this comment to point out the change in behavior (I do think the CL,
as-is, is exactly what we should land).

 #elif !defined(OS_ANDROID)
     char name[IF_NAMESIZE];
     EXPECT_TRUE(if_indextoname(it->interface_index, name));
     EXPECT_STREQ(it->name.c_str(), name);
 #endif
   }
 }
 
 static const char ifname_em1[] = "em1";
 #if defined(OS_WIN)
@@ skipping 298 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));
+      &results, INCLUDE_HOST_SCOPE_VIRTUAL_INTERFACES, &adapter_address));
 
   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;
 
   EXPECT_TRUE(internal::GetNetworkListImpl(
-      &results, INCLUDE_HOST_SCOPE_VIRTUAL_INTERFACES, true, &adapter_address));
+      &results, INCLUDE_HOST_SCOPE_VIRTUAL_INTERFACES, &adapter_address));
   EXPECT_EQ(results.size(), 0ul);
 
   // vmware address should return by default.
   ASSERT_TRUE(FillAdapterAddress(
       &adapter_address /* adapter_address */, ifname_vm /* ifname */,
       ipv6_address /* ip_address */, ipv6_prefix /* ip_netmask */,
       addresses /* sock_addrs */));
   EXPECT_TRUE(internal::GetNetworkListImpl(
-      &results, INCLUDE_HOST_SCOPE_VIRTUAL_INTERFACES, true, &adapter_address));
+      &results, INCLUDE_HOST_SCOPE_VIRTUAL_INTERFACES, &adapter_address));
   EXPECT_EQ(results.size(), 1ul);
   EXPECT_EQ(results[0].name, ifname_vm);
   EXPECT_EQ(results[0].prefix_length, 1ul);
   EXPECT_EQ(results[0].address, ipv6_address);
   EXPECT_EQ(results[0].ip_address_attributes, IP_ADDRESS_ATTRIBUTE_NONE);
   results.clear();
 
   // vmware address should be trimmed out if policy specified so.
   ASSERT_TRUE(FillAdapterAddress(
       &adapter_address /* adapter_address */, ifname_vm /* ifname */,
       ipv6_address /* ip_address */, ipv6_prefix /* ip_netmask */,
       addresses /* sock_addrs */));
   EXPECT_TRUE(internal::GetNetworkListImpl(
-      &results, EXCLUDE_HOST_SCOPE_VIRTUAL_INTERFACES, true, &adapter_address));
+      &results, EXCLUDE_HOST_SCOPE_VIRTUAL_INTERFACES, &adapter_address));
   EXPECT_EQ(results.size(), 0ul);
   results.clear();
 
   // Addresses with incompleted DAD 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.FirstUnicastAddress->DadState = IpDadStateTentative;
 
   EXPECT_TRUE(internal::GetNetworkListImpl(
-      &results, INCLUDE_HOST_SCOPE_VIRTUAL_INTERFACES, true, &adapter_address));
+      &results, INCLUDE_HOST_SCOPE_VIRTUAL_INTERFACES, &adapter_address));
   EXPECT_EQ(results.size(), 0ul);
   results.clear();
 
   // Addresses with allowed attribute IpSuffixOriginRandom should be returned
   // and attributes should be translated correctly to
   // IP_ADDRESS_ATTRIBUTE_TEMPORARY.
   ASSERT_TRUE(FillAdapterAddress(
       &adapter_address /* adapter_address */, ifname_em1 /* ifname */,
       ipv6_address /* ip_address */, ipv6_prefix /* ip_netmask */,
       addresses /* sock_addrs */));
   adapter_address.FirstUnicastAddress->PrefixOrigin =
       IpPrefixOriginRouterAdvertisement;
   adapter_address.FirstUnicastAddress->SuffixOrigin = IpSuffixOriginRandom;
 
   EXPECT_TRUE(internal::GetNetworkListImpl(
-      &results, INCLUDE_HOST_SCOPE_VIRTUAL_INTERFACES, true, &adapter_address));
+      &results, INCLUDE_HOST_SCOPE_VIRTUAL_INTERFACES, &adapter_address));
   EXPECT_EQ(results.size(), 1ul);
   EXPECT_EQ(results[0].name, ifname_em1);
   EXPECT_EQ(results[0].prefix_length, 1ul);
   EXPECT_EQ(results[0].address, ipv6_address);
   EXPECT_EQ(results[0].ip_address_attributes, IP_ADDRESS_ATTRIBUTE_TEMPORARY);
   results.clear();
 
   // Addresses with preferred lifetime 0 should be returned and
   // attributes should be translated correctly to
   // IP_ADDRESS_ATTRIBUTE_DEPRECATED.
   ASSERT_TRUE(FillAdapterAddress(
       &adapter_address /* adapter_address */, ifname_em1 /* ifname */,
       ipv6_address /* ip_address */, ipv6_prefix /* ip_netmask */,
       addresses /* sock_addrs */));
   adapter_address.FirstUnicastAddress->PreferredLifetime = 0;
   adapter_address.FriendlyName = const_cast<PWCHAR>(L"FriendlyInterfaceName");
   EXPECT_TRUE(internal::GetNetworkListImpl(
-      &results, INCLUDE_HOST_SCOPE_VIRTUAL_INTERFACES, true, &adapter_address));
+      &results, INCLUDE_HOST_SCOPE_VIRTUAL_INTERFACES, &adapter_address));
   EXPECT_EQ(results.size(), 1ul);
   EXPECT_EQ(results[0].friendly_name, "FriendlyInterfaceName");
   EXPECT_EQ(results[0].name, ifname_em1);
   EXPECT_EQ(results[0].prefix_length, 1ul);
   EXPECT_EQ(results[0].address, ipv6_address);
   EXPECT_EQ(results[0].ip_address_attributes, IP_ADDRESS_ATTRIBUTE_DEPRECATED);
   results.clear();
 }
 
 #endif  // !OS_MACOSX && !OS_WIN && !OS_NACL
@@ skipping 157 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