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

net/socket/transport_client_socket_pool_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/socket/transport_client_socket_pool.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/compiler_specific.h"
@@ skipping 53 matching lines @@
   }
   virtual bool IsConnectedAndIdle() const {
     return connected_;
   }
   virtual int GetPeerAddress(IPEndPoint* address) const {
     return ERR_UNEXPECTED;
   }
   virtual int GetLocalAddress(IPEndPoint* address) const {
     if (!connected_)
       return ERR_SOCKET_NOT_CONNECTED;
-    if (addrlist_.front().GetFamily() == AF_INET)
+    if (addrlist_.front().GetFamily() == ADDRESS_FAMILY_IPV4)
       SetIPv4Address(address);
     else
       SetIPv6Address(address);
     return OK;
   }
   virtual const BoundNetLog& NetLog() const {
     return net_log_;
   }
 
   virtual void SetSubresourceSpeculation() {}
@@ skipping 130 matching lines @@
   }
   virtual bool IsConnectedAndIdle() const {
     return is_connected_;
   }
   virtual int GetPeerAddress(IPEndPoint* address) const {
     return ERR_UNEXPECTED;
   }
   virtual int GetLocalAddress(IPEndPoint* address) const {
     if (!is_connected_)
       return ERR_SOCKET_NOT_CONNECTED;
-    if (addrlist_.front().GetFamily() == AF_INET)
+    if (addrlist_.front().GetFamily() == ADDRESS_FAMILY_IPV4)
       SetIPv4Address(address);
     else
       SetIPv6Address(address);
     return OK;
   }
   virtual const BoundNetLog& NetLog() const {
     return net_log_;
   }
 
   virtual void SetSubresourceSpeculation() {}
@@ skipping 225 matching lines @@
   IPEndPoint addrlist_v6_2(ip_number, 80);
 
   AddressList addrlist;
 
   // Test 1: IPv4 only.  Expect no change.
   addrlist.clear();
   addrlist.push_back(addrlist_v4_1);
   addrlist.push_back(addrlist_v4_2);
   TransportConnectJob::MakeAddressListStartWithIPv4(&addrlist);
   ASSERT_EQ(2u, addrlist.size());
-  EXPECT_EQ(AF_INET, addrlist[0].GetFamily());
-  EXPECT_EQ(AF_INET, addrlist[1].GetFamily());
+  EXPECT_EQ(ADDRESS_FAMILY_IPV4, addrlist[0].GetFamily());
+  EXPECT_EQ(ADDRESS_FAMILY_IPV4, addrlist[1].GetFamily());
 
   // Test 2: IPv6 only.  Expect no change.
   addrlist.clear();
   addrlist.push_back(addrlist_v6_1);
   addrlist.push_back(addrlist_v6_2);
   TransportConnectJob::MakeAddressListStartWithIPv4(&addrlist);
   ASSERT_EQ(2u, addrlist.size());
-  EXPECT_EQ(AF_INET6, addrlist[0].GetFamily());
-  EXPECT_EQ(AF_INET6, addrlist[1].GetFamily());
+  EXPECT_EQ(ADDRESS_FAMILY_IPV6, addrlist[0].GetFamily());
+  EXPECT_EQ(ADDRESS_FAMILY_IPV6, addrlist[1].GetFamily());
 
   // Test 3: IPv4 then IPv6.  Expect no change.
   addrlist.clear();
   addrlist.push_back(addrlist_v4_1);
   addrlist.push_back(addrlist_v4_2);
   addrlist.push_back(addrlist_v6_1);
   addrlist.push_back(addrlist_v6_2);
   TransportConnectJob::MakeAddressListStartWithIPv4(&addrlist);
   ASSERT_EQ(4u, addrlist.size());
-  EXPECT_EQ(AF_INET, addrlist[0].GetFamily());
-  EXPECT_EQ(AF_INET, addrlist[1].GetFamily());
-  EXPECT_EQ(AF_INET6, addrlist[2].GetFamily());
-  EXPECT_EQ(AF_INET6, addrlist[3].GetFamily());
+  EXPECT_EQ(ADDRESS_FAMILY_IPV4, addrlist[0].GetFamily());
+  EXPECT_EQ(ADDRESS_FAMILY_IPV4, addrlist[1].GetFamily());
+  EXPECT_EQ(ADDRESS_FAMILY_IPV6, addrlist[2].GetFamily());
+  EXPECT_EQ(ADDRESS_FAMILY_IPV6, addrlist[3].GetFamily());
 
   // Test 4: IPv6, IPv4, IPv6, IPv4.  Expect first IPv6 moved to the end.
   addrlist.clear();
   addrlist.push_back(addrlist_v6_1);
   addrlist.push_back(addrlist_v4_1);
   addrlist.push_back(addrlist_v6_2);
   addrlist.push_back(addrlist_v4_2);
   TransportConnectJob::MakeAddressListStartWithIPv4(&addrlist);
   ASSERT_EQ(4u, addrlist.size());
-  EXPECT_EQ(AF_INET, addrlist[0].GetFamily());
-  EXPECT_EQ(AF_INET6, addrlist[1].GetFamily());
-  EXPECT_EQ(AF_INET, addrlist[2].GetFamily());
-  EXPECT_EQ(AF_INET6, addrlist[3].GetFamily());
+  EXPECT_EQ(ADDRESS_FAMILY_IPV4, addrlist[0].GetFamily());
+  EXPECT_EQ(ADDRESS_FAMILY_IPV6, addrlist[1].GetFamily());
+  EXPECT_EQ(ADDRESS_FAMILY_IPV4, addrlist[2].GetFamily());
+  EXPECT_EQ(ADDRESS_FAMILY_IPV6, addrlist[3].GetFamily());
 
   // Test 5: IPv6, IPv6, IPv4, IPv4.  Expect first two IPv6's moved to the end.
   addrlist.clear();
   addrlist.push_back(addrlist_v6_1);
   addrlist.push_back(addrlist_v6_2);
   addrlist.push_back(addrlist_v4_1);
   addrlist.push_back(addrlist_v4_2);
   TransportConnectJob::MakeAddressListStartWithIPv4(&addrlist);
   ASSERT_EQ(4u, addrlist.size());
-  EXPECT_EQ(AF_INET, addrlist[0].GetFamily());
-  EXPECT_EQ(AF_INET, addrlist[1].GetFamily());
-  EXPECT_EQ(AF_INET6, addrlist[2].GetFamily());
-  EXPECT_EQ(AF_INET6, addrlist[3].GetFamily());
+  EXPECT_EQ(ADDRESS_FAMILY_IPV4, addrlist[0].GetFamily());
+  EXPECT_EQ(ADDRESS_FAMILY_IPV4, addrlist[1].GetFamily());
+  EXPECT_EQ(ADDRESS_FAMILY_IPV6, addrlist[2].GetFamily());
+  EXPECT_EQ(ADDRESS_FAMILY_IPV6, addrlist[3].GetFamily());
 }
 
 TEST_F(TransportClientSocketPoolTest, Basic) {
   TestCompletionCallback callback;
   ClientSocketHandle handle;
   int rv = handle.Init("a", low_params_, LOW, callback.callback(), &pool_,
                        BoundNetLog());
   EXPECT_EQ(ERR_IO_PENDING, rv);
   EXPECT_FALSE(handle.is_initialized());
   EXPECT_FALSE(handle.socket());
@@ skipping 743 matching lines @@
   EXPECT_TRUE(handle.socket());
   IPEndPoint endpoint;
   handle.socket()->GetLocalAddress(&endpoint);
   EXPECT_EQ(kIPv4AddressSize, endpoint.address().size());
   EXPECT_EQ(1, client_socket_factory_.allocation_count());
 }
 
 }  // namespace
 
 }  // namespace net