diff options
13 files changed, 28 insertions, 27 deletions
diff --git a/chrome/browser/local_discovery/DEPS b/chrome/browser/local_discovery/DEPS deleted file mode 100644 index cc56ec5b..0000000 --- a/chrome/browser/local_discovery/DEPS +++ /dev/null @@ -1,6 +0,0 @@ -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 diff --git a/chrome/browser/local_discovery/test_service_discovery_client.cc b/chrome/browser/local_discovery/test_service_discovery_client.cc index 23a4aa2..ecb2cd4 100644 --- a/chrome/browser/local_discovery/test_service_discovery_client.cc +++ b/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 { diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 646ca47..a09103e 100644 --- a/chrome/chrome.gyp +++ b/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', ] diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi index 4d95f87..4e5447d 100644 --- a/chrome/chrome_common.gypi +++ b/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'], diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi index 0f6df3f..9ffd3ba 100644 --- a/chrome/chrome_tests_unit.gypi +++ b/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', { diff --git a/chrome/utility/local_discovery/local_domain_resolver_unittest.cc b/chrome/common/local_discovery/local_domain_resolver_unittest.cc index a3785ae..cc65ab3 100644 --- a/chrome/utility/local_discovery/local_domain_resolver_unittest.cc +++ b/chrome/common/local_discovery/local_domain_resolver_unittest.cc @@ -1,8 +1,8 @@ -// 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" diff --git a/chrome/utility/local_discovery/service_discovery_client_impl.cc b/chrome/common/local_discovery/service_discovery_client_impl.cc index 4aa5878..c86f726 100644 --- a/chrome/utility/local_discovery/service_discovery_client_impl.cc +++ b/chrome/common/local_discovery/service_discovery_client_impl.cc @@ -1,4 +1,4 @@ -// 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" diff --git a/chrome/utility/local_discovery/service_discovery_client_impl.h b/chrome/common/local_discovery/service_discovery_client_impl.h index bb6128c..29e42c7 100644 --- a/chrome/utility/local_discovery/service_discovery_client_impl.h +++ b/chrome/common/local_discovery/service_discovery_client_impl.h @@ -1,9 +1,9 @@ -// 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_ diff --git a/chrome/utility/local_discovery/service_discovery_client_unittest.cc b/chrome/common/local_discovery/service_discovery_client_unittest.cc index 93df245..5033fbdd 100644 --- a/chrome/utility/local_discovery/service_discovery_client_unittest.cc +++ b/chrome/common/local_discovery/service_discovery_client_unittest.cc @@ -1,10 +1,10 @@ -// 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" diff --git a/chrome/tools/DEPS b/chrome/tools/DEPS index adf68b9..6c22d41 100644 --- a/chrome/tools/DEPS +++ b/chrome/tools/DEPS @@ -1,7 +1,6 @@ include_rules = [ "+chrome/browser", "+chrome/third_party/hunspell/google", - "+chrome/utility/local_discovery", "+content/browser", "+content/public/browser", "+components/breakpad", diff --git a/chrome/tools/service_discovery_sniffer/DEPS b/chrome/tools/service_discovery_sniffer/DEPS index e002118..8e70642 100644 --- a/chrome/tools/service_discovery_sniffer/DEPS +++ b/chrome/tools/service_discovery_sniffer/DEPS @@ -1,3 +1,3 @@ include_rules = [ - "+chrome/utility/local_discovery", + "+chrome/common/local_discovery", ] diff --git a/chrome/tools/service_discovery_sniffer/service_discovery_sniffer.cc b/chrome/tools/service_discovery_sniffer/service_discovery_sniffer.cc index 691160d..4a32dfb 100644 --- a/chrome/tools/service_discovery_sniffer/service_discovery_sniffer.cc +++ b/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 { diff --git a/chrome/utility/local_discovery/service_discovery_message_handler.cc b/chrome/utility/local_discovery/service_discovery_message_handler.cc index eb0572d..badb1ae 100644 --- a/chrome/utility/local_discovery/service_discovery_message_handler.cc +++ b/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" |