Migrate Local Discovery from net::IPAddressNumber to net::IPAddress.

chrome/browser/local_discovery/endpoint_resolver.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 "chrome/browser/local_discovery/endpoint_resolver.h"
 
 #include "base/command_line.h"
 #include "base/debug/dump_without_crashing.h"
 #include "chrome/browser/local_discovery/service_discovery_shared_client.h"
 #include "chrome/common/chrome_switches.h"
+#include "net/base/ip_address.h"
 #include "net/base/ip_endpoint.h"
-#include "net/base/net_util.h"
 
 namespace local_discovery {
 
 EndpointResolver::EndpointResolver() {
   service_discovery_client_ = ServiceDiscoverySharedClient::GetInstance();
 }
 
 EndpointResolver::~EndpointResolver() {}
 
 void EndpointResolver::Start(const std::string& service_name,
@@ skipping 10 matching lines @@
     const ServiceDescription& description) {
   if (result != ServiceResolver::STATUS_SUCCESS)
     return callback.Run(net::IPEndPoint());
 
   Start(description.address, callback);
 }
 
 void EndpointResolver::Start(const net::HostPortPair& address,
                              const ResultCallback& callback) {
 #if defined(OS_MACOSX)
-  net::IPAddressNumber ip_address;
-  if (!net::ParseIPLiteralToNumber(address.host(), &ip_address)) {
+  net::IPAddress ip_address;
+  if (!net::IPAddress::FromIPLiteral(address.host(), &ip_address)) {
     NOTREACHED() << address.ToString();
     // Unexpected, but could be a reason for crbug.com/513505
     base::debug::DumpWithoutCrashing();
     return callback.Run(net::IPEndPoint());
   }
 
   // OSX already has IP there.
   callback.Run(net::IPEndPoint(ip_address, address.port()));
 #else   // OS_MACOSX
   net::AddressFamily address_family = net::ADDRESS_FAMILY_UNSPECIFIED;
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kPrivetIPv6Only)) {
     address_family = net::ADDRESS_FAMILY_IPV6;
   }
 
   domain_resolver_ = service_discovery_client_->CreateLocalDomainResolver(
       address.host(), address_family,
       base::Bind(&EndpointResolver::DomainResolveComplete,
                  base::Unretained(this), address.port(), callback));
   domain_resolver_->Start();
 #endif  // OS_MACOSX
 }
 
 void EndpointResolver::DomainResolveComplete(
     uint16 port,
     const ResultCallback& callback,
     bool success,
-    const net::IPAddressNumber& address_ipv4,
-    const net::IPAddressNumber& address_ipv6) {
+    const net::IPAddress& address_ipv4,
+    const net::IPAddress& address_ipv6) {
   if (!success)
     return callback.Run(net::IPEndPoint());
 
-  net::IPAddressNumber address = address_ipv4;
-  if (address.empty())
+  net::IPAddress address = address_ipv4;
+  if (!address.IsIPv4())

[eroman, 2015/12/21 20:47:33]

This does not quite have the same meaning as before.

Without knowing more about this code, please match the same semantics as before.
Options for accomplishing that are:

  * Add an empty() or is_null() method, which returns true if the address is
empty.
  * Add an IsValid() method as described earlier, and use that.

[martijnc, 2016/01/27 22:50:52]

Done.

     address = address_ipv6;
 
-  DCHECK(!address.empty());
+  DCHECK(address.IsIPv4() || address.IsIPv6());

[eroman, 2015/12/21 20:47:33]

address.IsValid()  or !address.is_null()

[martijnc, 2016/01/27 22:50:52]

Done.

 
   callback.Run(net::IPEndPoint(address, port));
 }
 
 }  // namespace local_discovery