Migrate chrome/browser/net/* to net::IPAddress.

chrome/browser/net/dns_probe_service.cc

 // Copyright (c) 2012 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/net/dns_probe_service.h"
 
 #include <utility>
 
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/string_number_conversions.h"
+#include "net/base/ip_address.h"
 #include "net/base/ip_endpoint.h"
 #include "net/dns/dns_client.h"
 #include "net/dns/dns_config_service.h"
 #include "net/dns/dns_protocol.h"
 
 using base::FieldTrialList;
 using base::StringToInt;
 using error_page::DnsProbeStatus;
 using net::DnsClient;
 using net::DnsConfig;
-using net::IPAddressNumber;
+using net::IPAddress;
 using net::ParseIPLiteralToNumber;
 using net::NetworkChangeNotifier;
 
 namespace chrome_browser_net {
 
 namespace {
 
 // How long the DnsProbeService will cache the probe result for.
 // If it's older than this and we get a probe request, the service expires it
 // and starts a new probe.
 const int kMaxResultAgeMs = 5000;
 
 // The public DNS servers used by the DnsProbeService to verify internet
 // connectivity.
 const char kGooglePublicDns1[] = "8.8.8.8";
 const char kGooglePublicDns2[] = "8.8.4.4";
 
 net::IPEndPoint MakeDnsEndPoint(const std::string& dns_ip_literal) {
-  IPAddressNumber dns_ip_number;
-  bool rv = ParseIPLiteralToNumber(dns_ip_literal, &dns_ip_number);
+  IPAddress dns_ip_address;
+  bool rv = dns_ip_address.AssignFromIPLiteral(dns_ip_literal);

[eroman, 2016/03/15 22:30:17]

We can probably replace this whole thing with something more like:


const uint8_t  kGooglePublicDns1[] = {8, 8, 8, 8};

...

net::IPEndPoint(net::IPAddress(kGooglePublicDns1),
net::dns_protocol::kDefaultPort);


Maybe it is more readable as it is now though, feel free to leave it as you have
it now.

[martijnc, 2016/03/16 20:01:04]

Done. Seems a good idea to avoid the AssignFromIPliteral call.

   DCHECK(rv);
-  return net::IPEndPoint(dns_ip_number, net::dns_protocol::kDefaultPort);
+  return net::IPEndPoint(dns_ip_address, net::dns_protocol::kDefaultPort);
 }
 
 DnsProbeStatus EvaluateResults(DnsProbeRunner::Result system_result,
                                DnsProbeRunner::Result public_result) {
   // If the system DNS is working, assume the domain doesn't exist.
   if (system_result == DnsProbeRunner::CORRECT)
     return error_page::DNS_PROBE_FINISHED_NXDOMAIN;
 
   // If the system DNS is unknown (e.g. on Android), but the public server is
   // reachable, assume the domain doesn't exist.
@@ skipping 166 matching lines @@
 bool DnsProbeService::CachedResultIsExpired() const {
   if (state_ != STATE_RESULT_CACHED)
     return false;
 
   const base::TimeDelta kMaxResultAge =
       base::TimeDelta::FromMilliseconds(kMaxResultAgeMs);
   return base::Time::Now() - probe_start_time_ > kMaxResultAge;
 }
 
 }  // namespace chrome_browser_net