Roll Mojo to b88737ed62969ce3203085748f0d53ff4f09ba5b.

mojo/services/network/host_resolver_impl.cc

 // Copyright 2015 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 "mojo/services/network/host_resolver_impl.h"
 
 #include "mojo/services/network/net_adapters.h"
 #include "mojo/services/network/net_address_type_converters.h"
 #include "net/base/address_family.h"
 #include "net/base/address_list.h"
@@ skipping 67 matching lines @@
       resolver_(net::HostResolver::CreateDefaultResolver(nullptr).Pass()) {
   DCHECK(resolver_);
 }
 
 HostResolverImpl::~HostResolverImpl() {
   DCHECK(thread_checker_.CalledOnValidThread());
 }
 
 static net::AddressFamily ConvertFamily(NetAddressFamily family) {
   switch (family) {
-    case NET_ADDRESS_FAMILY_UNSPECIFIED:
+    case NetAddressFamily::UNSPECIFIED:
       return net::ADDRESS_FAMILY_UNSPECIFIED;
-    case NET_ADDRESS_FAMILY_IPV4:
+    case NetAddressFamily::IPV4:
       return net::ADDRESS_FAMILY_IPV4;
-    case NET_ADDRESS_FAMILY_IPV6:
+    case NetAddressFamily::IPV6:
       return net::ADDRESS_FAMILY_IPV6;
     default:
       NOTREACHED();
       return net::ADDRESS_FAMILY_UNSPECIFIED;
   }
 }
 
 void HostResolverImpl::GetHostAddresses(const mojo::String& host,
                                NetAddressFamily family,
                                const GetHostAddressesCallback& callback) {
   DCHECK(thread_checker_.CalledOnValidThread());
   net::HostPortPair host_port_pair(host, 0);
   net::HostResolver::RequestInfo request_info(host_port_pair);
   request_info.set_address_family(ConvertFamily(family));
   HostResolverImplJob* job = new HostResolverImplJob(request_info, callback);
   job->Start(resolver_.get());
 }
 
 }  // namespace mojo