Move service_discovery_client_impl.* into chrome/common.

It's need to be used by utility and browser processes.

BUG=349645

Review URL: https://codereview.chromium.org/256923003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266487 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/local_discovery/DEPS

-specific_include_rules = {
-  # For tests, it's fine to include utility process code.
-  'test_service_discovery_client\.cc': [
-    "+chrome/utility/local_discovery/service_discovery_client_impl.h"
-   ],
-}
\ No newline at end of file

chrome/browser/local_discovery/test_service_discovery_client.cc

@@ -4,7 +4,7 @@
 
 #include "chrome/browser/local_discovery/test_service_discovery_client.h"
 
-#include "chrome/utility/local_discovery/service_discovery_client_impl.h"
+#include "chrome/common/local_discovery/service_discovery_client_impl.h"
 #include "net/dns/mdns_client_impl.h"
 
 namespace local_discovery {

chrome/chrome.gyp

@@ -360,8 +360,6 @@
             }],
             ['enable_mdns == 1', {
               'sources': [
-                'utility/local_discovery/service_discovery_client_impl.cc',
-                'utility/local_discovery/service_discovery_client_impl.h',
                 'utility/local_discovery/service_discovery_message_handler.cc',
                 'utility/local_discovery/service_discovery_message_handler.h',
               ]

chrome/chrome_common.gypi

@@ -240,8 +240,6 @@
         'common/instant_types.h',
         'common/localized_error.cc',
         'common/localized_error.h',
-        'common/local_discovery/service_discovery_client.cc',
-        'common/local_discovery/service_discovery_client.h',
         'common/logging_chrome.cc',
         'common/logging_chrome.h',
         'common/mac/app_mode_common.h',
@@ -426,6 +424,18 @@
             '<(DEPTH)/printing/printing.gyp:printing',
           ],
         }],
+        ['enable_service_discovery==1', {
+          'sources' : [
+            'common/local_discovery/service_discovery_client.cc',
+            'common/local_discovery/service_discovery_client.h',
+           ]
+        }],
+        ['enable_mdns==1', {
+          'sources' : [
+            'common/local_discovery/service_discovery_client_impl.cc',
+            'common/local_discovery/service_discovery_client_impl.h',
+          ]
+        }],
         ['OS=="android"', {
           'sources/': [
             ['exclude', '^common/chrome_version_info_posix.cc'],

chrome/chrome_tests_unit.gypi

@@ -2158,12 +2158,12 @@
         }],
         ['enable_mdns == 1', {
             'sources': [
-              'utility/local_discovery/local_domain_resolver_unittest.cc',
-              'utility/local_discovery/service_discovery_client_unittest.cc',
               'browser/local_discovery/privet_device_lister_unittest.cc',
               'browser/local_discovery/privet_notifications_unittest.cc',
               'browser/local_discovery/privet_local_printer_lister_unittest.cc',
               'browser/local_discovery/storage/privet_filesystem_attribute_cache_unittest.cc',
+              'common/local_discovery/local_domain_resolver_unittest.cc',
+              'common/local_discovery/service_discovery_client_unittest.cc',
             ]
         }],
         ['configuration_policy==0', {

chrome/utility/local_discovery/local_domain_resolver_unittest.cc → chrome/common/local_discovery/local_domain_resolver_unittest.cc

-// Copyright 2013 The Chromium Authors. All rights reserved.
+// 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/utility/local_discovery/service_discovery_client_impl.h"
+#include "chrome/common/local_discovery/service_discovery_client_impl.h"
 #include "net/dns/mdns_client_impl.h"
 #include "net/dns/mock_mdns_socket_factory.h"
 #include "testing/gmock/include/gmock/gmock.h"

chrome/utility/local_discovery/service_discovery_client_impl.cc → chrome/common/local_discovery/service_discovery_client_impl.cc

-// Copyright 2013 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -8,7 +8,7 @@
 #include "base/memory/singleton.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/stl_util.h"
-#include "chrome/utility/local_discovery/service_discovery_client_impl.h"
+#include "chrome/common/local_discovery/service_discovery_client_impl.h"
 #include "net/dns/dns_protocol.h"
 #include "net/dns/record_rdata.h"
 

chrome/utility/local_discovery/service_discovery_client_impl.h → chrome/common/local_discovery/service_discovery_client_impl.h

-// Copyright 2013 The Chromium Authors. All rights reserved.
+// 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_UTILITY_LOCAL_DISCOVERY_SERVICE_DISCOVERY_CLIENT_IMPL_H_
-#define CHROME_UTILITY_LOCAL_DISCOVERY_SERVICE_DISCOVERY_CLIENT_IMPL_H_
+#ifndef CHROME_COMMON_LOCAL_DISCOVERY_SERVICE_DISCOVERY_CLIENT_IMPL_H_
+#define CHROME_COMMON_LOCAL_DISCOVERY_SERVICE_DISCOVERY_CLIENT_IMPL_H_
 
 #include <map>
 #include <string>
@@ -270,4 +270,4 @@ class LocalDomainResolverImpl : public LocalDomainResolver {
 
 }  // namespace local_discovery
 
-#endif  // CHROME_UTILITY_LOCAL_DISCOVERY_SERVICE_DISCOVERY_CLIENT_IMPL_H_
+#endif  // CHROME_COMMON_LOCAL_DISCOVERY_SERVICE_DISCOVERY_CLIENT_IMPL_H_

chrome/utility/local_discovery/service_discovery_client_unittest.cc → chrome/common/local_discovery/service_discovery_client_unittest.cc

-// Copyright 2013 The Chromium Authors. All rights reserved.
+// 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 "base/memory/weak_ptr.h"
 #include "base/run_loop.h"
-#include "chrome/utility/local_discovery/service_discovery_client_impl.h"
+#include "chrome/common/local_discovery/service_discovery_client_impl.h"
 #include "net/base/net_errors.h"
 #include "net/dns/dns_protocol.h"
 #include "net/dns/mdns_client_impl.h"

chrome/tools/DEPS

 include_rules = [
   "+chrome/browser",
   "+chrome/third_party/hunspell/google",
-  "+chrome/utility/local_discovery",
   "+content/browser",
   "+content/public/browser",
   "+components/breakpad",

chrome/tools/service_discovery_sniffer/DEPS

 include_rules = [
-  "+chrome/utility/local_discovery",
+  "+chrome/common/local_discovery",
 ]

chrome/tools/service_discovery_sniffer/service_discovery_sniffer.cc

@@ -8,8 +8,8 @@
 #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 {

chrome/utility/local_discovery/service_discovery_message_handler.cc

@@ -8,7 +8,7 @@
 
 #include "base/lazy_instance.h"
 #include "chrome/common/local_discovery/local_discovery_messages.h"
-#include "chrome/utility/local_discovery/service_discovery_client_impl.h"
+#include "chrome/common/local_discovery/service_discovery_client_impl.h"
 #include "content/public/utility/utility_thread.h"
 #include "net/socket/socket_descriptor.h"
 #include "net/udp/datagram_server_socket.h"