Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(162)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/chrome_tests_unit.gypi

Issue 435603006: Cleanup: Switch some unit_tests gyp conditions from excluding to including. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: flip a conditional Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_tests_unit.gypi
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index 5a5ccd1bcb550c3e7c4f819b862380a4eae69cc8..0f5dc9903c08005c1b5133d8457c3b8bf0bb8226 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -71,69 +71,15 @@
'browser/browsing_data/mock_browsing_data_local_storage_helper.h',
'browser/browsing_data/mock_browsing_data_quota_helper.cc',
'browser/browsing_data/mock_browsing_data_quota_helper.h',
- 'browser/chromeos/app_mode/fake_cws.cc',
- 'browser/chromeos/app_mode/fake_cws.h',
- 'browser/chromeos/input_method/mock_candidate_window_controller.cc',
- 'browser/chromeos/input_method/mock_candidate_window_controller.h',
- 'browser/chromeos/input_method/mock_input_method_engine.cc',
- 'browser/chromeos/input_method/mock_input_method_engine.h',
- 'browser/chromeos/input_method/mock_input_method_manager.cc',
- 'browser/chromeos/input_method/mock_input_method_manager.h',
- 'browser/chromeos/login/fake_login_utils.cc',
- 'browser/chromeos/login/fake_login_utils.h',
- 'browser/chromeos/login/auth/mock_url_fetchers.cc',
- 'browser/chromeos/login/auth/mock_url_fetchers.h',
- 'browser/chromeos/login/mock_login_utils.cc',
- 'browser/chromeos/login/mock_login_utils.h',
- 'browser/chromeos/login/users/avatar/mock_user_image_manager.cc',
- 'browser/chromeos/login/users/avatar/mock_user_image_manager.h',
- 'browser/chromeos/login/users/fake_supervised_user_manager.cc',
- 'browser/chromeos/login/users/fake_supervised_user_manager.h',
- 'browser/chromeos/login/users/fake_user_manager.cc',
- 'browser/chromeos/login/users/fake_user_manager.h',
- 'browser/chromeos/login/users/mock_user_manager.cc',
- 'browser/chromeos/login/users/mock_user_manager.h',
- 'browser/chromeos/login/test/oobe_screen_waiter.cc',
- 'browser/chromeos/login/test/oobe_screen_waiter.h',
- 'browser/chromeos/login/test/js_checker.cc',
- 'browser/chromeos/login/test/js_checker.h',
- 'browser/chromeos/login/ui/mock_login_display.cc',
- 'browser/chromeos/login/ui/mock_login_display.h',
- 'browser/chromeos/login/ui/mock_login_display_host.cc',
- 'browser/chromeos/login/ui/mock_login_display_host.h',
- 'browser/chromeos/net/network_portal_detector_test_utils.cc',
- 'browser/chromeos/net/network_portal_detector_test_utils.h',
- 'browser/chromeos/policy/cloud_external_data_manager_base_test_util.cc',
- 'browser/chromeos/policy/cloud_external_data_manager_base_test_util.h',
- 'browser/chromeos/policy/device_policy_builder.cc',
- 'browser/chromeos/policy/device_policy_builder.h',
- 'browser/chromeos/policy/stub_enterprise_install_attributes.cc',
- 'browser/chromeos/policy/stub_enterprise_install_attributes.h',
- 'browser/chromeos/settings/device_settings_test_helper.cc',
- 'browser/chromeos/settings/device_settings_test_helper.h',
- 'browser/chromeos/settings/mock_owner_key_util.cc',
- 'browser/chromeos/settings/mock_owner_key_util.h',
- 'browser/chromeos/system/fake_input_device_settings.cc',
- 'browser/chromeos/system/fake_input_device_settings.h',
# The only thing used from browser is Browser::Type.
'browser/download/download_test_file_activity_observer.cc',
'browser/download/download_test_file_activity_observer.h',
'browser/download/test_download_shelf.cc',
'browser/download/test_download_shelf.h',
- 'browser/drive/dummy_drive_service.cc',
- 'browser/drive/dummy_drive_service.h',
- 'browser/drive/fake_drive_service.cc',
- 'browser/drive/fake_drive_service.h',
- 'browser/drive/test_util.cc',
- 'browser/drive/test_util.h',
- 'browser/extensions/api/messaging/native_messaging_test_util.cc',
- 'browser/extensions/api/messaging/native_messaging_test_util.h',
'browser/extensions/extension_notification_observer.cc',
'browser/extensions/extension_notification_observer.h',
'browser/extensions/extension_test_message_listener.cc',
'browser/extensions/extension_test_message_listener.h',
- 'browser/extensions/fake_safe_browsing_database_manager.cc',
- 'browser/extensions/fake_safe_browsing_database_manager.h',
'browser/extensions/mock_extension_special_storage_policy.cc',
'browser/extensions/mock_extension_special_storage_policy.h',
'browser/extensions/test_blacklist.cc',
@@ -152,8 +98,6 @@
'browser/invalidation/fake_invalidation_service.h',
'browser/media/fake_desktop_media_list.cc',
'browser/media/fake_desktop_media_list.h',
- 'browser/media_galleries/media_galleries_test_util.cc',
- 'browser/media_galleries/media_galleries_test_util.h',
'browser/net/dns_probe_test_util.cc',
'browser/net/dns_probe_test_util.h',
'browser/net/url_request_mock_util.cc',
@@ -166,8 +110,6 @@
'browser/password_manager/null_password_store_service.h',
'browser/password_manager/test_password_store_service.cc',
'browser/password_manager/test_password_store_service.h',
- 'browser/policy/test/local_policy_test_server.cc',
- 'browser/policy/test/local_policy_test_server.h',
'browser/prefs/pref_service_mock_factory.cc',
'browser/prefs/pref_service_mock_factory.h',
'browser/profile_resetter/profile_resetter_test_base.cc',
@@ -194,8 +136,6 @@
'browser/sync/profile_sync_components_factory_mock.h',
'browser/sync/profile_sync_service_mock.cc',
'browser/sync/profile_sync_service_mock.h',
- 'browser/ui/app_list/test/chrome_app_list_test_support.cc',
- 'browser/ui/app_list/test/chrome_app_list_test_support.h',
'browser/ui/browser.h',
'browser/ui/cocoa/find_bar/find_bar_host_unittest_util_cocoa.mm',
'browser/ui/cocoa/run_loop_testing.h',
@@ -221,10 +161,6 @@
'common/extensions/extension_test_util.h',
'renderer/chrome_mock_render_thread.cc',
'renderer/chrome_mock_render_thread.h',
- 'renderer/media/mock_webrtc_logging_message_filter.cc',
- 'renderer/media/mock_webrtc_logging_message_filter.h',
- 'renderer/printing/mock_printer.cc',
- 'renderer/printing/mock_printer.h',
'renderer/safe_browsing/mock_feature_extractor_clock.cc',
'renderer/safe_browsing/mock_feature_extractor_clock.h',
'renderer/safe_browsing/test_utils.cc',
@@ -286,8 +222,6 @@
'test/logging/win/mof_data_parser.h',
'test/logging/win/test_log_collector.cc',
'test/logging/win/test_log_collector.h',
- 'test/ppapi/ppapi_test.cc',
- 'test/ppapi/ppapi_test.h',
'../ui/gfx/image/image_unittest_util.cc',
'../ui/gfx/image/image_unittest_util.h',
],
@@ -306,7 +240,6 @@
'../components/components.gyp:autofill_core_test_support',
'../components/components.gyp:captive_portal_test_support',
'../components/components.gyp:sessions_test_support',
- '../components/components.gyp:storage_monitor_test_support',
'../extensions/extensions.gyp:extensions_test_support',
'../google_apis/google_apis.gyp:google_apis_test_support',
'../ipc/ipc.gyp:test_support_ipc',
@@ -330,20 +263,56 @@
['include', '^test/base/testing_browser_process'],
],
}],
- ['chromeos==0', {
- 'sources/': [
- ['exclude', '^browser/chromeos'],
- ],
- }, { # chromeos==1
+ ['chromeos==1', {
'dependencies': [
'../build/linux/system.gyp:dbus',
'../chromeos/chromeos.gyp:chromeos_test_support',
],
- }],
- ['configuration_policy==0', {
- 'sources/': [
- ['exclude', '^browser/policy'],
- ['exclude', 'browser/net/disk_cache_dir_policy_handler_unittest.cc'],
+ 'sources': [
+ 'browser/chromeos/app_mode/fake_cws.cc',
+ 'browser/chromeos/app_mode/fake_cws.h',
+ 'browser/chromeos/input_method/mock_candidate_window_controller.cc',
+ 'browser/chromeos/input_method/mock_candidate_window_controller.h',
+ 'browser/chromeos/input_method/mock_input_method_engine.cc',
+ 'browser/chromeos/input_method/mock_input_method_engine.h',
+ 'browser/chromeos/input_method/mock_input_method_manager.cc',
+ 'browser/chromeos/input_method/mock_input_method_manager.h',
+ 'browser/chromeos/login/fake_login_utils.cc',
+ 'browser/chromeos/login/fake_login_utils.h',
+ 'browser/chromeos/login/auth/mock_url_fetchers.cc',
+ 'browser/chromeos/login/auth/mock_url_fetchers.h',
+ 'browser/chromeos/login/mock_login_utils.cc',
+ 'browser/chromeos/login/mock_login_utils.h',
+ 'browser/chromeos/login/users/avatar/mock_user_image_manager.cc',
+ 'browser/chromeos/login/users/avatar/mock_user_image_manager.h',
+ 'browser/chromeos/login/users/fake_supervised_user_manager.cc',
+ 'browser/chromeos/login/users/fake_supervised_user_manager.h',
+ 'browser/chromeos/login/users/fake_user_manager.cc',
+ 'browser/chromeos/login/users/fake_user_manager.h',
+ 'browser/chromeos/login/users/mock_user_manager.cc',
+ 'browser/chromeos/login/users/mock_user_manager.h',
+ 'browser/chromeos/login/test/oobe_screen_waiter.cc',
+ 'browser/chromeos/login/test/oobe_screen_waiter.h',
+ 'browser/chromeos/login/test/js_checker.cc',
+ 'browser/chromeos/login/test/js_checker.h',
+ 'browser/chromeos/login/ui/mock_login_display.cc',
+ 'browser/chromeos/login/ui/mock_login_display.h',
+ 'browser/chromeos/login/ui/mock_login_display_host.cc',
+ 'browser/chromeos/login/ui/mock_login_display_host.h',
+ 'browser/chromeos/net/network_portal_detector_test_utils.cc',
+ 'browser/chromeos/net/network_portal_detector_test_utils.h',
+ 'browser/chromeos/policy/cloud_external_data_manager_base_test_util.cc',
+ 'browser/chromeos/policy/cloud_external_data_manager_base_test_util.h',
+ 'browser/chromeos/policy/device_policy_builder.cc',
+ 'browser/chromeos/policy/device_policy_builder.h',
+ 'browser/chromeos/policy/stub_enterprise_install_attributes.cc',
+ 'browser/chromeos/policy/stub_enterprise_install_attributes.h',
+ 'browser/chromeos/settings/device_settings_test_helper.cc',
+ 'browser/chromeos/settings/device_settings_test_helper.h',
+ 'browser/chromeos/settings/mock_owner_key_util.cc',
+ 'browser/chromeos/settings/mock_owner_key_util.h',
+ 'browser/chromeos/system/fake_input_device_settings.cc',
+ 'browser/chromeos/system/fake_input_device_settings.h',
],
}],
['configuration_policy==1', {
@@ -355,12 +324,15 @@
'../components/components.gyp:policy_component_test_support',
'../components/components.gyp:policy_test_support',
],
+ 'sources': [
+ 'browser/policy/test/local_policy_test_server.cc',
+ 'browser/policy/test/local_policy_test_server.h',
+ ],
}],
- ['safe_browsing!=1', {
- 'sources/': [
- ['exclude', '^browser/extensions/blacklist_unittest.cc'],
- ['exclude', '^browser/extensions/fake_safe_browsing_database_manager.cc'],
- ['exclude', '^browser/extensions/fake_safe_browsing_database_manager.h'],
+ ['safe_browsing==1', {
+ 'sources': [
+ 'browser/extensions/fake_safe_browsing_database_manager.cc',
+ 'browser/extensions/fake_safe_browsing_database_manager.h',
],
}],
['OS=="linux"', {
@@ -373,23 +345,28 @@
'service',
],
}],
- ['enable_printing==0', {
- 'sources/': [
- ['exclude', '^renderer/printing/mock_printer.cc'],
- ['exclude', '^renderer/printing/mock_printer.h'],
- ],
- }],
- ['enable_extensions==0', {
- 'sources/': [
- ['exclude', '^browser/drive/'],
- ['exclude', '^browser/extensions/api/messaging/native_messaging_'],
- ['exclude', '^browser/media_galleries/'],
+ ['enable_printing!=0', {
+ 'sources': [
+ 'renderer/printing/mock_printer.cc',
+ 'renderer/printing/mock_printer.h',
],
}],
- ['OS=="android"', {
- 'dependencies!': [
+ ['enable_extensions==1', {
+ 'dependencies': [
'../components/components.gyp:storage_monitor_test_support',
],
+ 'sources': [
+ 'browser/drive/dummy_drive_service.cc',
+ 'browser/drive/dummy_drive_service.h',
+ 'browser/drive/fake_drive_service.cc',
+ 'browser/drive/fake_drive_service.h',
+ 'browser/drive/test_util.cc',
+ 'browser/drive/test_util.h',
+ 'browser/extensions/api/messaging/native_messaging_test_util.cc',
+ 'browser/extensions/api/messaging/native_messaging_test_util.h',
+ 'browser/media_galleries/media_galleries_test_util.cc',
+ 'browser/media_galleries/media_galleries_test_util.h',
+ ],
}],
['OS=="win"', {
'dependencies': [
@@ -427,18 +404,19 @@
],
}],
['enable_mdns==1', {
- 'sources': [
- 'browser/local_discovery/test_service_discovery_client.cc',
- 'browser/local_discovery/test_service_discovery_client.h',
- ]
+ 'sources': [
+ 'browser/local_discovery/test_service_discovery_client.cc',
+ 'browser/local_discovery/test_service_discovery_client.h',
+ ],
}],
- ['enable_app_list==0', {
- 'sources/': [
- ['exclude', '^browser/ui/app_list/'],
+ ['enable_app_list==1', {
+ 'sources': [
+ 'browser/ui/app_list/test/chrome_app_list_test_support.cc',
+ 'browser/ui/app_list/test/chrome_app_list_test_support.h',
],
}],
- ['enable_webrtc==0', {
- 'sources!': [
+ ['enable_webrtc==1', {
+ 'sources': [
'renderer/media/mock_webrtc_logging_message_filter.cc',
'renderer/media/mock_webrtc_logging_message_filter.h',
],
@@ -447,8 +425,14 @@
"sources" : [
'browser/local_discovery/wifi/mock_wifi_manager.cc',
'browser/local_discovery/wifi/mock_wifi_manager.h',
- ]
- }]
+ ],
+ }],
+ ['enable_plugins==1', {
+ "sources" : [
+ 'test/ppapi/ppapi_test.cc',
+ 'test/ppapi/ppapi_test.h',
+ ],
+ }],
],
},
{
@@ -960,7 +944,6 @@
'browser/extensions/api/web_request/web_request_permissions_unittest.cc',
'browser/extensions/api/web_request/web_request_time_tracker_unittest.cc',
'browser/extensions/app_sync_data_unittest.cc',
- 'browser/extensions/blacklist_unittest.cc',
'browser/extensions/blacklist_state_fetcher_unittest.cc',
'browser/extensions/bookmark_app_helper_unittest.cc',
'browser/extensions/browser_permissions_policy_delegate_unittest.cc',
@@ -2747,9 +2730,9 @@
['exclude', '^browser/supervised_user/'],
],
}],
- ['safe_browsing!=1', {
- 'sources/': [
- ['exclude', '^browser/extensions/blacklist_unittest.cc'],
+ ['safe_browsing==1', {
+ 'sources': [
+ 'browser/extensions/blacklist_unittest.cc',
],
}],
['cld_version==0 or cld_version==1', {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698