Rename network_prefix to prefix_length in NetworkInterface structure

net/base/net_util_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/net_util.h"
 
 #include <string.h>
 
 #include <ostream>
 
@@ skipping 813 matching lines @@
                 it->address.size() == kIPv6AddressSize)
         << "Invalid address of size " << it->address.size();
     bool all_zeroes = true;
     for (size_t i = 0; i < it->address.size(); ++i) {
       if (it->address[i] != 0) {
         all_zeroes = false;
         break;
       }
     }
     EXPECT_FALSE(all_zeroes);
-    EXPECT_GT(it->network_prefix, 1u);
-    EXPECT_LE(it->network_prefix, it->address.size() * 8);
+    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>(
@@ skipping 122 matching lines @@
   address_map.clear();
   ASSERT_TRUE(address_map.insert(std::make_pair(ipv6_address, msg)).second);
   EXPECT_TRUE(
       net::internal::GetNetworkListImpl(&results,
                                         INCLUDE_HOST_SCOPE_VIRTUAL_INTERFACES,
                                         online_links,
                                         address_map,
                                         GetInterfaceNameVM));
   EXPECT_EQ(results.size(), 1ul);
   EXPECT_EQ(results[0].name, ifname_vm);
-  EXPECT_EQ(results[0].network_prefix, 1ul);
+  EXPECT_EQ(results[0].prefix_length, 1ul);
   EXPECT_EQ(results[0].address, ipv6_address);
   results.clear();
 
   // vmware address should be trimmed out if policy specified so.
   address_map.clear();
   ASSERT_TRUE(address_map.insert(std::make_pair(ipv6_address, msg)).second);
   EXPECT_TRUE(
       net::internal::GetNetworkListImpl(&results,
                                         EXCLUDE_HOST_SCOPE_VIRTUAL_INTERFACES,
                                         online_links,
@@ skipping 21 matching lines @@
   msg.ifa_flags = IFA_F_TEMPORARY;
   ASSERT_TRUE(address_map.insert(std::make_pair(ipv6_address, msg)).second);
   EXPECT_TRUE(
       net::internal::GetNetworkListImpl(&results,
                                         INCLUDE_HOST_SCOPE_VIRTUAL_INTERFACES,
                                         online_links,
                                         address_map,
                                         GetInterfaceName));
   EXPECT_EQ(results.size(), 1ul);
   EXPECT_EQ(results[0].name, ifname_em1);
-  EXPECT_EQ(results[0].network_prefix, 1ul);
+  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 allowed attribute IFA_F_DEPRECATED should be returned and
   // attributes should be translated correctly.
   address_map.clear();
   msg.ifa_flags = IFA_F_DEPRECATED;
   ASSERT_TRUE(address_map.insert(std::make_pair(ipv6_address, msg)).second);
   EXPECT_TRUE(
       net::internal::GetNetworkListImpl(&results,
                                         INCLUDE_HOST_SCOPE_VIRTUAL_INTERFACES,
                                         online_links,
                                         address_map,
                                         GetInterfaceName));
   EXPECT_EQ(results.size(), 1ul);
   EXPECT_EQ(results[0].name, ifname_em1);
-  EXPECT_EQ(results[0].network_prefix, 1ul);
+  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();
 }
 
 #elif defined(OS_MACOSX)
 
 TEST(NetUtilTest, GetNetworkListTrimming) {
   IPAddressNumber ipv6_local_address(
       kIPv6LocalAddr, kIPv6LocalAddr + arraysize(kIPv6LocalAddr));
@@ skipping 23 matching lines @@
   EXPECT_EQ(results.size(), 0ul);
 
   // vmware address should return by default.
   ASSERT_TRUE(FillIfaddrs(&interface, ifname_vm, IFF_RUNNING, ipv6_address,
                           ipv6_netmask, addresses));
   EXPECT_TRUE(net::internal::GetNetworkListImpl(
       &results, INCLUDE_HOST_SCOPE_VIRTUAL_INTERFACES, &interface,
       &ip_attributes_getter));
   EXPECT_EQ(results.size(), 1ul);
   EXPECT_EQ(results[0].name, ifname_vm);
-  EXPECT_EQ(results[0].network_prefix, 1ul);
+  EXPECT_EQ(results[0].prefix_length, 1ul);
   EXPECT_EQ(results[0].address, ipv6_address);
   results.clear();
 
   // vmware address should be trimmed out if policy specified so.
   ASSERT_TRUE(FillIfaddrs(&interface, ifname_vm, IFF_RUNNING, ipv6_address,
                           ipv6_netmask, addresses));
   EXPECT_TRUE(net::internal::GetNetworkListImpl(
       &results, EXCLUDE_HOST_SCOPE_VIRTUAL_INTERFACES, &interface,
       &ip_attributes_getter));
   EXPECT_EQ(results.size(), 0ul);
@@ skipping 13 matching lines @@
   // Addresses with allowed attribute IFA_F_TEMPORARY should be returned and
   // attributes should be translated correctly.
   ip_attributes_getter.set_native_attributes(IN6_IFF_TEMPORARY);
   ASSERT_TRUE(FillIfaddrs(&interface, ifname_em1, IFF_RUNNING, ipv6_address,
                           ipv6_netmask, addresses));
   EXPECT_TRUE(net::internal::GetNetworkListImpl(
       &results, INCLUDE_HOST_SCOPE_VIRTUAL_INTERFACES, &interface,
       &ip_attributes_getter));
   EXPECT_EQ(results.size(), 1ul);
   EXPECT_EQ(results[0].name, ifname_em1);
-  EXPECT_EQ(results[0].network_prefix, 1ul);
+  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 allowed attribute IFA_F_DEPRECATED should be returned and
   // attributes should be translated correctly.
   ip_attributes_getter.set_native_attributes(IN6_IFF_DEPRECATED);
   ASSERT_TRUE(FillIfaddrs(&interface, ifname_em1, IFF_RUNNING, ipv6_address,
                           ipv6_netmask, addresses));
   EXPECT_TRUE(net::internal::GetNetworkListImpl(
       &results, INCLUDE_HOST_SCOPE_VIRTUAL_INTERFACES, &interface,
       &ip_attributes_getter));
   EXPECT_EQ(results.size(), 1ul);
   EXPECT_EQ(results[0].name, ifname_em1);
-  EXPECT_EQ(results[0].network_prefix, 1ul);
+  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_IOS
 }
 #elif defined(OS_WIN)  // !OS_MACOSX && !OS_WIN && !OS_NACL
 
 // Helper function to create a valid IP_ADAPTER_ADDRESSES with reasonable
 // default value. The output is the |adapter_address|. All the rests are input
 // to fill the |adapter_address|. |sock_addrs| are temporary storage used by
@@ skipping 88 matching lines @@
 
   // 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(net::internal::GetNetworkListImpl(
       &results, INCLUDE_HOST_SCOPE_VIRTUAL_INTERFACES, true, &adapter_address));
   EXPECT_EQ(results.size(), 1ul);
   EXPECT_EQ(results[0].name, ifname_vm);
-  EXPECT_EQ(results[0].network_prefix, 1ul);
+  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(net::internal::GetNetworkListImpl(
@@ skipping 21 matching lines @@
       ipv6_address /* ip_address */, ipv6_prefix /* ip_netmask */,
       addresses /* sock_addrs */));
   adapter_address.FirstUnicastAddress->PrefixOrigin =
       IpPrefixOriginRouterAdvertisement;
   adapter_address.FirstUnicastAddress->SuffixOrigin = IpSuffixOriginRandom;
 
   EXPECT_TRUE(net::internal::GetNetworkListImpl(
       &results, INCLUDE_HOST_SCOPE_VIRTUAL_INTERFACES, true, &adapter_address));
   EXPECT_EQ(results.size(), 1ul);
   EXPECT_EQ(results[0].name, ifname_em1);
-  EXPECT_EQ(results[0].network_prefix, 1ul);
+  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 = L"FriendlyInterfaceName";
   EXPECT_TRUE(net::internal::GetNetworkListImpl(
       &results, INCLUDE_HOST_SCOPE_VIRTUAL_INTERFACES, true, &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].network_prefix, 1ul);
+  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
 
 namespace {
 
 #if defined(OS_WIN)
@@ skipping 177 matching lines @@
 TEST_P(NetUtilNonUniqueNameTest, IsHostnameNonUnique) {
   const NonUniqueNameTestData& test_data = GetParam();
 
   EXPECT_EQ(test_data.is_unique, IsUnique(test_data.hostname));
 }
 
 INSTANTIATE_TEST_CASE_P(, NetUtilNonUniqueNameTest,
                         testing::ValuesIn(kNonUniqueNameTestData));
 
 }  // namespace net