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

chrome/common/local_discovery/local_domain_resolver_unittest.cc

 // Copyright 2014 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 "base/location.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "chrome/common/local_discovery/service_discovery_client_impl.h"
 #include "net/dns/mdns_client_impl.h"
 #include "net/dns/mock_mdns_socket_factory.h"
@@ skipping 49 matching lines @@
   0x00, 0x01, 0x00, 0x02,
   0x00, 0x03, 0x00, 0x04,
 };
 
 class LocalDomainResolverTest : public testing::Test {
  public:
   void SetUp() override {
     mdns_client_.StartListening(&socket_factory_);
   }
 
-  std::string IPAddressToStringWithEmpty(const net::IPAddressNumber& address) {
-    if (address.empty()) return "";
-    return net::IPAddressToString(address);
+  std::string IPAddressToStringWithEmpty(const net::IPAddress& address) {
+    if (!address.IsIPv4() && !address.IsIPv6())

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

!IsValid()

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

Done.

+      return "";
+    return address.ToString();
   }
 
   void AddressCallback(bool resolved,
-                       const net::IPAddressNumber& address_ipv4,
-                       const net::IPAddressNumber& address_ipv6) {
+                       const net::IPAddress& address_ipv4,
+                       const net::IPAddress& address_ipv6) {
       AddressCallbackInternal(resolved,
                               IPAddressToStringWithEmpty(address_ipv4),
                               IPAddressToStringWithEmpty(address_ipv6));
   }
 
   void RunFor(base::TimeDelta time_period) {
     base::CancelableCallback<void()> callback(
         base::Bind(&base::MessageLoop::QuitWhenIdle,
                    base::Unretained(base::MessageLoop::current())));
     base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
@@ skipping 89 matching lines @@
   resolver.Start();
 
   EXPECT_CALL(*this, AddressCallbackInternal(false, "", ""));
 
   RunFor(base::TimeDelta::FromSeconds(4));
 }
 
 }  // namespace
 
 }  // namespace local_discovery