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

chrome/browser/local_discovery/service_discovery_client_impl.h

 // 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.
 
 #ifndef CHROME_BROWSER_LOCAL_DISCOVERY_SERVICE_DISCOVERY_CLIENT_IMPL_H_
 #define CHROME_BROWSER_LOCAL_DISCOVERY_SERVICE_DISCOVERY_CLIENT_IMPL_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 179 matching lines @@
 
   // Convert a TXT record to a vector of strings (metadata).
   const std::vector<std::string>& RecordToMetadata(
       const net::RecordParsed* record) const;
 
   // Convert an SRV record to a host and port pair.
   net::HostPortPair RecordToAddress(
       const net::RecordParsed* record) const;
 
   // Convert an A record to an IP address.
-  net::IPAddress RecordToIPAddress(const net::RecordParsed* record) const;
+  const net::IPAddressNumber& RecordToIPAddress(
+      const net::RecordParsed* record) const;
 
   // Convert an MDns status to a service discovery status.
   RequestStatus MDnsStatusToRequestStatus(
       net::MDnsTransaction::Result status) const;
 
   bool CreateTxtTransaction();
   bool CreateSrvTransaction();
   void CreateATransaction();
 
   std::string service_name_;
@@ skipping 40 matching lines @@
   net::AddressFamily address_family_;
   IPAddressCallback callback_;
 
   scoped_ptr<net::MDnsTransaction> transaction_a_;
   scoped_ptr<net::MDnsTransaction> transaction_aaaa_;
 
   int transactions_finished_;
 
   net::MDnsClient* mdns_client_;
 
-  net::IPAddress address_ipv4_;
-  net::IPAddress address_ipv6_;
+  net::IPAddressNumber address_ipv4_;
+  net::IPAddressNumber address_ipv6_;
 
   base::CancelableCallback<void()> timeout_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(LocalDomainResolverImpl);
 };
 
 
 }  // namespace local_discovery
 
 #endif  // CHROME_BROWSER_LOCAL_DISCOVERY_SERVICE_DISCOVERY_CLIENT_IMPL_H_