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

chrome/browser/local_discovery/service_discovery_client_mdns.cc

 // 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.
 
 #include "chrome/browser/local_discovery/service_discovery_client_mdns.h"
 
 #include <stddef.h>
 #include <utility>
 #include <vector>
 
 #include "base/location.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/histogram.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "chrome/browser/local_discovery/service_discovery_client_impl.h"
 #include "content/public/browser/browser_thread.h"
 #include "net/dns/mdns_client.h"
 #include "net/udp/datagram_server_socket.h"
 
-namespace net {
-class IPAddress;
-}
-
 namespace local_discovery {
 
 using content::BrowserThread;
 
 // Base class for objects returned by ServiceDiscoveryClient implementation.
 // Handles interaction of client code on UI thread end net code on mdns thread.
 class ServiceDiscoveryClientMdns::Proxy {
  public:
   typedef base::WeakPtr<Proxy> WeakPtr;
 
@@ skipping 269 matching lines @@
     if (implementation()) {
       PostToMdnsThread(base::Bind(&LocalDomainResolver::Start,
                                   base::Unretained(implementation())));
     }
   };
 
  private:
   static void OnCallback(const WeakPtr& proxy,
                          const LocalDomainResolver::IPAddressCallback& callback,
                          bool a1,
-                         const net::IPAddress& a2,
-                         const net::IPAddress& a3) {
+                         const net::IPAddressNumber& a2,
+                         const net::IPAddressNumber& a3) {
     DCHECK(!BrowserThread::CurrentlyOn(BrowserThread::UI));
     PostToUIThread(base::Bind(&Base::RunCallback, proxy,
                               base::Bind(callback, a1, a2, a3)));
   }
 
   DISALLOW_COPY_AND_ASSIGN(LocalDomainResolverProxy);
 };
 
 }  // namespace
 
@@ skipping 116 matching lines @@
   OnBeforeMdnsDestroy();
   // After calling |Proxy::OnMdnsDestroy| all references to client_ and mdns_
   // should be destroyed.
   if (client_)
     mdns_runner_->DeleteSoon(FROM_HERE, client_.release());
   if (mdns_)
     mdns_runner_->DeleteSoon(FROM_HERE, mdns_.release());
 }
 
 }  // namespace local_discovery