Roll Mojo to b88737ed62969ce3203085748f0d53ff4f09ba5b.

mojo/services/network/host_resolver_apptest.cc

Index: mojo/services/network/host_resolver_apptest.cc
diff --git a/mojo/services/network/host_resolver_apptest.cc b/mojo/services/network/host_resolver_apptest.cc
index 959f7bd328f47a97ebf341aa9ec21cbdbd4c4ad7..7ff7b0b1792d6a0ba027bf9090ce13adff6501ff 100644
--- a/mojo/services/network/host_resolver_apptest.cc
+++ b/mojo/services/network/host_resolver_apptest.cc
@@ -23,7 +23,7 @@ namespace mojo {
 class HostResolverTestHelper {
  public:
   static bool Match4(uint8_t* expected_ipv4, const NetAddressPtr& address) {
-    EXPECT_EQ(NET_ADDRESS_FAMILY_IPV4, address->family);
+    EXPECT_EQ(NetAddressFamily::IPV4, address->family);
     for (size_t i = 0; i < address->ipv4->addr.size(); i++) {
       if (address->ipv4->addr[i] != expected_ipv4[i]) {
         return false;
@@ -33,7 +33,7 @@ class HostResolverTestHelper {
   }
 
   static bool Match6(uint8_t* expected_ipv6, const NetAddressPtr& address) {
-    EXPECT_EQ(NET_ADDRESS_FAMILY_IPV6, address->family);
+    EXPECT_EQ(NetAddressFamily::IPV6, address->family);
     for (size_t i = 0; i < address->ipv6->addr.size(); i++) {
       if (address->ipv6->addr[i] != expected_ipv6[i]) {
         return false;
@@ -43,7 +43,7 @@ class HostResolverTestHelper {
   }
 
   static void DebugPrint(const NetAddressPtr& address) {
-    if (address->family == NET_ADDRESS_FAMILY_IPV4) {
+    if (address->family == NetAddressFamily::IPV4) {
       for (size_t i = 0; i < address->ipv4->addr.size(); i++) {
         if (i > 0) {
           printf(".");
@@ -51,7 +51,7 @@ class HostResolverTestHelper {
         printf("%d", address->ipv4->addr[i]);
       }
       printf("\n");
-    } else if (address->family == NET_ADDRESS_FAMILY_IPV6) {
+    } else if (address->family == NetAddressFamily::IPV6) {
       for (size_t i = 0; i < address->ipv6->addr.size(); i++) {
         if ((i > 0) && ((i % 2) == 0)) {
           printf(":");
@@ -92,7 +92,7 @@ TEST_F(HostResolverImplTest, Create) {
 TEST_F(HostResolverImplTest, LocalhostV4) {
   HostResolverPtr host_resolver;
   network_service_->CreateHostResolver(GetProxy(&host_resolver));
-  host_resolver->GetHostAddresses("localhost", NET_ADDRESS_FAMILY_IPV4,
+  host_resolver->GetHostAddresses("localhost", NetAddressFamily::IPV4,
       [](NetworkErrorPtr error, Array<NetAddressPtr> addresses) {
     EXPECT_EQ(net::OK, error->code);
     EXPECT_GT(addresses.size(), 0U);
@@ -105,7 +105,7 @@ TEST_F(HostResolverImplTest, LocalhostV4) {
 TEST_F(HostResolverImplTest, LocalhostV6) {
   HostResolverPtr host_resolver;
   network_service_->CreateHostResolver(GetProxy(&host_resolver));
-  host_resolver->GetHostAddresses("localhost", NET_ADDRESS_FAMILY_IPV6,
+  host_resolver->GetHostAddresses("localhost", NetAddressFamily::IPV6,
       [](NetworkErrorPtr error, Array<NetAddressPtr> addresses) {
     uint8_t localhost6[] = {0, 0, 0, 0, 0, 0, 0, 0,
                             0, 0, 0, 0, 0, 0, 0, 1};
@@ -123,7 +123,7 @@ TEST_F(HostResolverImplTest, LocalhostV6) {
 TEST_F(HostResolverImplTest, NameNotResolved) {
   HostResolverPtr host_resolver;
   network_service_->CreateHostResolver(GetProxy(&host_resolver));
-  host_resolver->GetHostAddresses("local.77778888", NET_ADDRESS_FAMILY_IPV4,
+  host_resolver->GetHostAddresses("local.77778888", NetAddressFamily::IPV4,
       [](NetworkErrorPtr error, Array<NetAddressPtr> addresses) {
     EXPECT_EQ(net::ERR_NAME_NOT_RESOLVED, error->code);
     EXPECT_EQ(0U, addresses.size());
@@ -133,7 +133,7 @@ TEST_F(HostResolverImplTest, NameNotResolved) {
 TEST_F(HostResolverImplTest, DropOnFloor) {
   HostResolverPtr host_resolver;
   network_service_->CreateHostResolver(GetProxy(&host_resolver));
-  host_resolver->GetHostAddresses("localhost", NET_ADDRESS_FAMILY_IPV4,
+  host_resolver->GetHostAddresses("localhost", NetAddressFamily::IPV4,
       [](NetworkErrorPtr error, Array<NetAddressPtr> addresses) {
   });
 }