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

chrome/browser/local_discovery/endpoint_resolver.cc

Index: chrome/browser/local_discovery/endpoint_resolver.cc
diff --git a/chrome/browser/local_discovery/endpoint_resolver.cc b/chrome/browser/local_discovery/endpoint_resolver.cc
index ad5f7c0e8f1e0c33d482a7e093970b45de9ec99e..c9b878356fae2f696ad17d8885b3abe5e9b7a5b1 100644
--- a/chrome/browser/local_discovery/endpoint_resolver.cc
+++ b/chrome/browser/local_discovery/endpoint_resolver.cc
@@ -8,8 +8,8 @@
 #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 {
 
@@ -40,8 +40,8 @@ void EndpointResolver::ServiceResolveComplete(
 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();
@@ -69,16 +69,16 @@ 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));
 }