Revert of Revert of Move service_discovery_client_impl.* into chrome/common.

chrome/chrome_tests_unit.gypi

 # Copyright 2012 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.
 {
   'targets': [
     {
       # This target contains mocks and test utilities that don't belong in
       # production libraries but are used by more than one test executable.
       'target_name': 'test_support_common',
       'type': 'static_library',
@@ skipping 2134 matching lines @@
             'browser/extensions/image_loader_unittest.cc',
             # TODO(zturner): Enable this on Windows.  See
             # BrowserWithTestWindowTest::SetUp() for a comment explaining why
             # this is broken.
             'browser/ui/views/frame/immersive_mode_controller_ash_unittest.cc',
             'browser/ui/views/select_file_dialog_extension_unittest.cc',
           ],
         }],
         ['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', {
           'sources!': [
             'browser/extensions/api/storage/policy_value_store_unittest.cc',
             'browser/extensions/policy_handlers_unittest.cc',
             'browser/net/proxy_policy_handler_unittest.cc',
             'browser/prefs/proxy_policy_unittest.cc',
             'browser/profiles/incognito_mode_policy_handler_unittest.cc',
             'browser/search_engines/default_search_policy_handler_unittest.cc',
@@ skipping 673 matching lines @@
             'browser/ui/app_list/test/fake_profile_store.h',
             'browser/ui/app_list/test/fast_show_pickler_unittest.cc',
             'browser/ui/views/app_list/linux/app_list_linux_unittest.cc',
             'browser/ui/views/app_list/win/app_list_win_unittest.cc',
           ],
         },
       ],
     }],
   ],  # 'conditions'
 }