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

chrome/utility/local_discovery/service_discovery_message_handler.cc

 // Copyright 2013 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/utility/local_discovery/service_discovery_message_handler.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/lazy_instance.h"
 #include "base/location.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/single_thread_task_runner.h"
 #include "chrome/common/local_discovery/local_discovery_messages.h"
 #include "chrome/common/local_discovery/service_discovery_client_impl.h"
 #include "content/public/utility/utility_thread.h"
-#include "net/base/net_util.h"
+#include "net/base/ip_address.h"
 #include "net/socket/socket_descriptor.h"
 #include "net/udp/datagram_server_socket.h"
 
 namespace local_discovery {
 
 namespace {
 
 void ClosePlatformSocket(net::SocketDescriptor socket);
 
 // Sets socket factory used by |net::CreatePlatformSocket|. Implemetation
@@ skipping 427 matching lines @@
           << ", status=" << ResolverStatusToString(status)
           << ", name=" << description.service_name;
 
   DCHECK(service_discovery_client_);
   Send(new LocalDiscoveryHostMsg_ResolverCallback(id, status, description));
 }
 
 void ServiceDiscoveryMessageHandler::OnLocalDomainResolved(
     uint64 id,
     bool success,
-    const net::IPAddressNumber& address_ipv4,
-    const net::IPAddressNumber& address_ipv6) {
+    const net::IPAddress& address_ipv4,
+    const net::IPAddress& address_ipv6) {
   VLOG(1) << "OnLocalDomainResolved, id=" << id
-          << ", IPv4=" << (address_ipv4.empty() ? "" :
-                           net::IPAddressToString(address_ipv4))
-          << ", IPv6=" << (address_ipv6.empty() ? "" :
-                           net::IPAddressToString(address_ipv6));
+          << ", IPv4=" << (address_ipv4.IsIPv4() ? address_ipv4.ToString() : "")

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

This is not a direct translation. Prefer to use an .empty() or is_null() method
so this remains strictly a refactor.

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

(This code has been removed.)

+          << ", IPv6="
+          << (address_ipv6.IsIPv6() ? address_ipv6.ToString() : "");
 
   DCHECK(service_discovery_client_);
   Send(new LocalDiscoveryHostMsg_LocalDomainResolverCallback(
           id, success, address_ipv4, address_ipv6));
 }
 
 void ServiceDiscoveryMessageHandler::Send(IPC::Message* msg) {
   utility_task_runner_->PostTask(FROM_HERE,
                                  base::Bind(&SendHostMessageOnUtilityThread,
                                             msg));
 }
 
 }  // namespace local_discovery