Revert of Move service_discovery_client_impl.* into chrome/common.

chrome/tools/service_discovery_sniffer/service_discovery_sniffer.cc

 // 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.
 
 #include <vector>
 
 #include "base/at_exit.h"
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
-#include "chrome/common/local_discovery/service_discovery_client_impl.h"
 #include "chrome/tools/service_discovery_sniffer/service_discovery_sniffer.h"
+#include "chrome/utility/local_discovery/service_discovery_client_impl.h"
 #include "net/dns/mdns_client.h"
 
 namespace local_discovery {
 
 ServicePrinter::ServicePrinter(ServiceDiscoveryClient* client,
                                const std::string& service_name)
     : changed_(false) {
   service_resolver_ =
       client->CreateServiceResolver(
           service_name,
@@ skipping 90 matching lines @@
   {
     // To guarantee/make explicit the ordering constraint.
     local_discovery::ServiceTypePrinter print_changes(
         service_discovery_client.get(),
         std::string(argv[1]) + "._tcp.local");
 
     print_changes.Start();
     message_loop.Run();
   }
 }