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

chrome/browser/local_discovery/service_discovery_client_mac.mm

 // 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/browser/local_discovery/service_discovery_client_mac.h"
 
 #import <arpa/inet.h>
 #import <Foundation/Foundation.h>
 #import <net/if_dl.h>
 
 #include "base/debug/dump_without_crashing.h"
 #include "base/memory/singleton.h"
 #include "base/metrics/histogram.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/threading/thread.h"
-#include "net/base/ip_address_number.h"
+#include "net/base/ip_address.h"
 #include "net/base/ip_endpoint.h"
 
 using local_discovery::ServiceWatcherImplMac;
 using local_discovery::ServiceResolverImplMac;
 
 @interface NetServiceBrowserDelegate
     : NSObject<NSNetServiceBrowserDelegate, NSNetServiceDelegate> {
  @private
   ServiceWatcherImplMac::NetServiceBrowserContainer* container_;  // weak.
   base::scoped_nsobject<NSMutableArray> services_;
@@ skipping 317 matching lines @@
   service_description_.service_name = service_name_;
 
   for (NSData* address in [service_ addresses]) {
     const void* bytes = [address bytes];
     int length = [address length];
     const sockaddr* socket = static_cast<const sockaddr*>(bytes);
     net::IPEndPoint end_point;
     if (end_point.FromSockAddr(socket, length)) {
       service_description_.address =
           net::HostPortPair::FromIPEndPoint(end_point);
-      service_description_.ip_address = end_point.address();
+      service_description_.ip_address = net::IPAddress(

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

net::IPAddress::address() needs to (eventually) return an IPAddress rather than
an IPAddressNumber.

I expect this is going to come up during several of the conversion.

Rather then adding lines such as this one, I recommend:

  (1) Rename net::IPEndPoint::address() to address_number(), and indicate it is
deprecated
  (2) Introduce IPEndPoint::address() as returning a const IPAddress&   (then
this line no longer needs to be changed)
  (3) address_number() can be implemented as {return address().byes();}

These changes would be done as separate CLs (not this one);

If you don't want to block this change on the above, then instead you can
introduce a constructor:

   IPAddress(const IPAddressNumber&) 

and then use that here. I think such a constructor is generally useful anyway.

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

Done.

+          &end_point.address().front(), end_point.address().size());
       break;
     }
   }
 
-  if (service_description_.address.host().empty()) {
+  if (!service_description_.address.host().size()) {
     VLOG(1) << "Service IP is not resolved: " << service_name_;
     callback_runner_->PostTask(
         FROM_HERE,
         base::Bind(callback_, STATUS_KNOWN_NONEXISTENT, ServiceDescription()));
     return;
   }
 
   ParseTxtRecord([service_ TXTRecordData], &service_description_.metadata);
 
   // TODO(justinlin): Implement last_seen.
@@ skipping 110 matching lines @@
   container_->OnResolveUpdate(local_discovery::ServiceResolver::STATUS_SUCCESS);
 }
 
 - (void)netService:(NSNetService *)sender
         didNotResolve:(NSDictionary *)errorDict {
   container_->OnResolveUpdate(
       local_discovery::ServiceResolver::STATUS_REQUEST_TIMEOUT);
 }
 
 @end