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

chrome/browser/local_discovery/service_discovery_client.h

 // 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.
 
 #ifndef CHROME_BROWSER_LOCAL_DISCOVERY_SERVICE_DISCOVERY_CLIENT_H_
 #define CHROME_BROWSER_LOCAL_DISCOVERY_SERVICE_DISCOVERY_CLIENT_H_
 
 #include <string>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
 #include "net/base/address_family.h"
 #include "net/base/host_port_pair.h"
-#include "net/base/ip_address.h"
+#include "net/base/ip_address_number.h"
 
 namespace net {
 class MDnsClient;
 }
 
 namespace local_discovery {
 
 struct ServiceDescription {
  public:
   ServiceDescription();
   ~ServiceDescription();
 
   // Convenience function to get useful parts of the service name. A service
   // name follows the format <instance_name>.<service_type>.
   std::string instance_name() const;
   std::string service_type() const;
 
   // The name of the service.
   std::string service_name;
   // The address (in host/port format) for the service (from SRV record).
   net::HostPortPair address;
   // The metadata (from TXT record) of the service.
   std::vector<std::string> metadata;
   // IP address of the service, if available from cache. May be empty.
-  net::IPAddress ip_address;
+  net::IPAddressNumber ip_address;
   // Last time the service was seen.
   base::Time last_seen;
 };
 
 // Lets users browse the network for services of interest or listen for changes
 // in the services they are interested in. See
 // |ServiceDiscoveryClient::CreateServiceWatcher|.
 class ServiceWatcher {
  public:
   enum UpdateType {
@@ skipping 41 matching lines @@
 
   // Start the service reader.
   virtual void StartResolving() = 0;
 
   virtual std::string GetName() const = 0;
 };
 
 class LocalDomainResolver {
  public:
   typedef base::Callback<void(bool /*success*/,
-                              const net::IPAddress& /*address_ipv4*/,
-                              const net::IPAddress& /*address_ipv6*/)>
+                              const net::IPAddressNumber& /*address_ipv4*/,
+                              const net::IPAddressNumber& /*address_ipv6*/)>
       IPAddressCallback;
 
   virtual ~LocalDomainResolver() {}
 
   virtual void Start() = 0;
 };
 
 class ServiceDiscoveryClient {
  public:
   virtual ~ServiceDiscoveryClient() {}
@@ skipping 13 matching lines @@
   // Create a resolver for local domain, both ipv4 or ipv6.
   virtual scoped_ptr<LocalDomainResolver> CreateLocalDomainResolver(
       const std::string& domain,
       net::AddressFamily address_family,
       const LocalDomainResolver::IPAddressCallback& callback) = 0;
 };
 
 }  // namespace local_discovery
 
 #endif  // CHROME_BROWSER_LOCAL_DISCOVERY_SERVICE_DISCOVERY_CLIENT_H_