[net] Make IPEndPoint::GetFamily() return AddressFamily and add GetSockAddrFamily() to be used when…

net/base/address_list_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/address_list.h"
 
 #include "base/string_util.h"
 #include "base/sys_byteorder.h"
 #include "net/base/net_util.h"
 #include "net/base/sys_addrinfo.h"
@@ skipping 50 matching lines @@
     ai[i].ai_addrlen = storage[i].addr_len;
     ai[i].ai_addr = storage[i].addr;
     if (i + 1 < kNumElements)
       ai[i].ai_next = &ai[i + 1];
   }
 
   AddressList list = AddressList::CreateFromAddrinfo(&ai[0]);
 
   ASSERT_EQ(kNumElements, list.size());
   for (size_t i = 0; i < list.size(); ++i) {
-    EXPECT_EQ(AF_INET, list[i].GetFamily());
+    EXPECT_EQ(ADDRESS_FAMILY_IPV4, list[i].GetFamily());
     // Only check the first byte of the address.
     EXPECT_EQ(i, list[i].address()[0]);
     EXPECT_EQ(static_cast<int>(i << 2), list[i].port());
   }
 
   // Check if operator= works.
   AddressList copy;
   copy = list;
   ASSERT_EQ(kNumElements, copy.size());
 
@@ skipping 47 matching lines @@
 
   AddressList test_list = AddressList::CreateFromIPAddressList(ip_list,
                                                                kCanonicalName);
   std::string canonical_name;
   EXPECT_EQ(kCanonicalName, test_list.canonical_name());
   EXPECT_EQ(ARRAYSIZE_UNSAFE(tests), test_list.size());
 }
 
 }  // namespace
 }  // namespace net