Massively simplify the NetworkChangeNotifier infrastructure:...

chrome/chrome_tests.gypi

 # Copyright (c) 2010 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.
 
 {
   'variables' : {
     'browser_tests_sources_views_specific': [
       'browser/extensions/browser_action_test_util_views.cc',
       'browser/views/browser_actions_container_browsertest.cc',
     ],
@@ skipping 486 matching lines @@
       'type': 'executable',
       'msvs_guid': 'ECFC2BEC-9FC0-4AD9-9649-5F26793F65FC',
       'dependencies': [
         'browser',
         'browser/sync/protocol/sync_proto.gyp:sync_proto_cpp',
         'chrome',
         'chrome_gpu',
         'chrome_resources',
         'chrome_strings',
         'common',
-        'common_net_test_support',
         'debugger',
         'profile_import',
         'renderer',
         'service',
         'test_support_unit',
         'utility',
         '../app/app.gyp:app_base',
         '../app/app.gyp:app_resources',
         '../ipc/ipc.gyp:ipc',
         '../net/net.gyp:net_resources',
@@ skipping 423 matching lines @@
         'browser/sync/glue/extension_data_type_controller_unittest.cc',
         'browser/sync/glue/extension_util_unittest.cc',
         'browser/sync/glue/http_bridge_unittest.cc',
         'browser/sync/glue/preference_data_type_controller_unittest.cc',
         'browser/sync/glue/preference_model_associator_unittest.cc',
         'browser/sync/glue/sync_backend_host_mock.h',
         'browser/sync/glue/theme_data_type_controller_unittest.cc',
         'browser/sync/glue/theme_util_unittest.cc',
         'browser/sync/glue/typed_url_model_associator_unittest.cc',
         'browser/sync/glue/ui_model_worker_unittest.cc',
-        'browser/sync/net/network_change_notifier_io_thread_unittest.cc',
         'browser/sync/profile_sync_factory_impl_unittest.cc',
         'browser/sync/profile_sync_factory_mock.cc',
         'browser/sync/profile_sync_factory_mock.h',
         'browser/sync/profile_sync_service_autofill_unittest.cc',
         'browser/sync/profile_sync_service_mock.h',
         'browser/sync/profile_sync_service_password_unittest.cc',
         'browser/sync/profile_sync_service_preference_unittest.cc',
         'browser/sync/profile_sync_service_startup_unittest.cc',
         'browser/sync/profile_sync_service_typed_url_unittest.cc',
         'browser/sync/profile_sync_service_unittest.cc',
@@ skipping 45 matching lines @@
         'common/extensions/extension_unittest.cc',
         'common/extensions/extension_unpacker_unittest.cc',
         'common/extensions/update_manifest_unittest.cc',
         'common/extensions/url_pattern_unittest.cc',
         'common/extensions/user_script_unittest.cc',
         'common/font_descriptor_mac_unittest.mm',
         'common/important_file_writer_unittest.cc',
         'common/json_pref_store_unittest.cc',
         'common/json_value_serializer_unittest.cc',
         'common/mru_cache_unittest.cc',
-        # TODO(sanjeevr): Move the 2 below files to common_net_unit_tests
         'common/net/gaia/gaia_authenticator_unittest.cc',
         'common/net/url_fetcher_unittest.cc',
         'common/net/test_url_fetcher_factory.cc',
         'common/net/test_url_fetcher_factory.h',
         'common/notification_service_unittest.cc',
         'common/process_watcher_unittest.cc',
         'common/property_bag_unittest.cc',
         'common/render_messages_unittest.cc',
         'common/resource_dispatcher_unittest.cc',
         'common/sandbox_mac_diraccess_unittest.mm',
@@ skipping 20 matching lines @@
         'renderer/render_thread_unittest.cc',
         'renderer/render_view_unittest.cc',
         'renderer/render_view_unittest_mac.mm',
         'renderer/render_widget_unittest.cc',
         'renderer/renderer_about_handler_unittest.cc',
         'renderer/renderer_main_unittest.cc',
         'renderer/spellchecker/spellcheck_unittest.cc',
         'renderer/spellchecker/spellcheck_worditerator_unittest.cc',
         'renderer/translate_helper_unittest.cc',
         'service/cloud_print/cloud_print_helpers_unittest.cc',
-        'service/net/service_network_change_notifier_thread_unittest.cc',
         'test/browser_with_test_window_test.cc',
         'test/browser_with_test_window_test.h',
         'test/file_test_utils.cc',
         'test/file_test_utils.h',
         'test/menu_model_test.cc',
         'test/menu_model_test.h',
         'test/render_view_test.cc',
         'test/render_view_test.h',
         'test/sync/test_http_bridge_factory.h',
         'test/test_notification_tracker.cc',
@@ skipping 697 matching lines @@
           'include_dirs': [
             '<(DEPTH)/third_party/wtl/include',
           ],
           'dependencies': [
             '<(allocator_target)',
           ],
         }], # OS="win"
       ], # conditions
     },
     {
-      'target_name': 'common_net_test_support',
-      'type': '<(library)',
-      'sources': [
-        'common/net/fake_network_change_notifier_thread.cc',
-        'common/net/fake_network_change_notifier_thread.h',
-        'common/net/thread_blocker.cc',
-        'common/net/thread_blocker.h',
-      ],
-      'dependencies': [
-        'common_net',
-        '../base/base.gyp:base',
-        '../net/net.gyp:net_base',
-      ],
-    },
-    {
-      # TODO(akalin): Add this to all.gyp.
-      'target_name': 'common_net_unit_tests',
-      'type': 'executable',
-      'sources': [
-        # TODO(akalin): Write our own test suite and runner.
-        '../base/test/run_all_unittests.cc',
-        '../base/test/test_suite.h',
-        'common/net/fake_network_change_notifier_thread_unittest.cc',
-        'common/net/mock_network_change_observer.h',
-        'common/net/network_change_notifier_proxy_unittest.cc',
-        'common/net/network_change_observer_proxy_unittest.cc',
-        'common/net/thread_blocker_unittest.cc',
-      ],
-      'include_dirs': [
-        '..',
-      ],
-      'dependencies': [
-        'common_net',
-        'common_net_test_support',
-        '../build/temp_gyp/googleurl.gyp:googleurl',
-        '../testing/gmock.gyp:gmock',
-        '../testing/gtest.gyp:gtest',
-      ],
-      # TODO(akalin): Remove this once we have our own test suite and
-      # runner.
-      'conditions': [
-        ['OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', {
-          'dependencies': [
-            # Needed to handle the #include chain:
-            #   base/test/test_suite.h
-            #   gtk/gtk.h
-            '../build/linux/system.gyp:gtk',
-          ],
-        }],
-      ],
-    },
-    {
       'target_name': 'notifier_unit_tests',
       'type': 'executable',
       'sources': [
         # TODO(akalin): Write our own test suite and runner.
         '../base/test/run_all_unittests.cc',
         '../base/test/test_suite.h',
         'common/net/notifier/listener/talk_mediator_unittest.cc',
         'common/net/notifier/listener/send_update_task_unittest.cc',
         'common/net/notifier/listener/subscribe_task_unittest.cc',
         'common/net/notifier/listener/xml_element_util_unittest.cc',
       ],
       'include_dirs': [
         '..',
       ],
       'dependencies': [
-        'common_net_test_support',
         'notifier',
         '../base/base.gyp:base',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         '../third_party/libjingle/libjingle.gyp:libjingle',
       ],
       # TODO(akalin): Remove this once we have our own test suite and
       # runner.
       'conditions': [
         ['OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', {
@@ skipping 54 matching lines @@
         '<(protoc_out_dir)',
       ],
       'defines' : [
         'SYNC_ENGINE_VERSION_STRING="Unknown"',
         '_CRT_SECURE_NO_WARNINGS',
         '_USE_32BIT_TIME_T',
       ],
       'dependencies': [
         'browser/sync/protocol/sync_proto.gyp:sync_proto_cpp',
         'common',
-        'common_net_test_support',
         'debugger',
         '../skia/skia.gyp:skia',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         '../third_party/bzip2/bzip2.gyp:bzip2',
         '../third_party/libjingle/libjingle.gyp:libjingle',
         'profile_import',
         'syncapi',
         'test_support_unit',
       ],
@@ skipping 626 matching lines @@
       ]
     }],  # 'coverage!=0'
   ],  # 'conditions'
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: