diff options
author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-25 21:30:38 +0000 |
---|---|---|
committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-25 21:30:38 +0000 |
commit | 66761b95332549f825999e482c17c94675275f49 (patch) | |
tree | fc5307808a2c62f1eff2a9f37db3aff11c5455d9 /chrome/chrome_tests.gypi | |
parent | e313f3b11360902a3da9b3b1cc0df2a4792d0867 (diff) | |
download | chromium_src-66761b95332549f825999e482c17c94675275f49.zip chromium_src-66761b95332549f825999e482c17c94675275f49.tar.gz chromium_src-66761b95332549f825999e482c17c94675275f49.tar.bz2 |
Massively simplify the NetworkChangeNotifier infrastructure:
* Use a process-wide object (singleton pattern)
* Create/destroy this object on the main thread, make it outlive all consumers
* Make observer-related functions threadsafe
As a result, the notifier can now be used by any thread (eliminating things like NetworkChangeObserverProxy and NetworkChangeNotifierProxy, and expanding its usefulness); its creation and inner workings are much simplified (eliminating implementation-specific classes); and it is simpler to access (eliminating things like NetworkChangeNotifierThread and a LOT of passing pointers around).
BUG=none
TEST=Unittests; network changes still trigger notifications
Review URL: http://codereview.chromium.org/2802015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50895 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_tests.gypi')
-rw-r--r-- | chrome/chrome_tests.gypi | 58 |
1 files changed, 0 insertions, 58 deletions
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index 0c96a6b..bb49425 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -520,7 +520,6 @@ 'chrome_resources', 'chrome_strings', 'common', - 'common_net_test_support', 'debugger', 'profile_import', 'renderer', @@ -964,7 +963,6 @@ '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', @@ -1029,7 +1027,6 @@ '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', @@ -1070,7 +1067,6 @@ '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', @@ -1806,58 +1802,6 @@ ], # 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': [ @@ -1873,7 +1817,6 @@ '..', ], 'dependencies': [ - 'common_net_test_support', 'notifier', '../base/base.gyp:base', '../testing/gmock.gyp:gmock', @@ -1948,7 +1891,6 @@ 'dependencies': [ 'browser/sync/protocol/sync_proto.gyp:sync_proto_cpp', 'common', - 'common_net_test_support', 'debugger', '../skia/skia.gyp:skia', '../testing/gmock.gyp:gmock', |