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

chrome/browser/devtools/device/cast_device_provider.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/devtools/device/cast_device_provider.h"
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/thread_task_runner_handle.h"
 #include "net/base/host_port_pair.h"
-#include "net/base/ip_address_number.h"
+#include "net/base/ip_address.h"
 
 using local_discovery::ServiceDiscoverySharedClient;
 
 namespace {
 
 const int kCastInspectPort = 9222;
 const char kCastServiceType[] = "_googlecast._tcp.local";
 const char kUnknownCastDevice[] = "Unknown Cast Device";
 
 typedef std::map<std::string, std::string> ServiceTxtRecordMap;
@@ skipping 137 matching lines @@
   tcp_provider_->OpenSocket(serial, socket_name, callback);
 }
 
 void CastDeviceProvider::OnDeviceChanged(
     bool added,
     const ServiceDescription& service_description) {
   VLOG(1) << "Device " << (added ? "added: " : "changed: ")
           << service_description.service_name;
   if (service_description.service_type() != kCastServiceType)
     return;
-  net::IPAddressNumber ip_address = service_description.ip_address;
-  if (ip_address.size() != net::kIPv4AddressSize &&
-      ip_address.size() != net::kIPv6AddressSize) {
+  net::IPAddress ip_address = service_description.ip_address;
+  if (!ip_address.IsIPv4() && !ip_address.IsIPv6()) {

[palmer, 2015/12/22 01:09:10]

An IsValid (or is_valid) member function might make sense. (Up to you.)

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

Done.

     // An invalid IP address is not queryable.
     return;
   }
   std::string name = service_description.service_name;
-  std::string host = net::IPAddressToString(ip_address);
+  std::string host = ip_address.ToString();
   service_hostname_map_[name] = host;
   device_info_map_[host] = ServiceDescriptionToDeviceInfo(service_description);
 }
 
 void CastDeviceProvider::OnDeviceRemoved(const std::string& service_name) {
   VLOG(1) << "Device removed: " << service_name;
   auto it_hostname = service_hostname_map_.find(service_name);
   if (it_hostname == service_hostname_map_.end())
     return;
   std::string hostname = it_hostname->second;
   service_hostname_map_.erase(it_hostname);
   auto it_device = device_info_map_.find(hostname);
   if (it_device == device_info_map_.end())
     return;
   device_info_map_.erase(it_device);
 }
 
 void CastDeviceProvider::OnDeviceCacheFlushed() {
   VLOG(1) << "Device cache flushed";
   service_hostname_map_.clear();
   device_info_map_.clear();
 }