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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/chrome_tests.gypi

Issue 824373003: Add browser_tests to the GN build. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: More ChromeOS Created 5 years, 11 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 | « chrome/browser/extensions/extension_management_test_util.cc ('k') | chrome/chrome_tests_unit.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_tests.gypi
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 106ee75dcb22fc72831ff2addd2be141ffba4dd2..d262f445025060838700a85f6f0364472341fa4f 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -83,7 +83,6 @@
'browser/browsing_data/browsing_data_remover_browsertest.cc',
'browser/browsing_data/browsing_data_remover_test_util.cc',
'browser/browsing_data/browsing_data_remover_test_util.h',
- 'browser/captive_portal/captive_portal_browsertest.cc',
'browser/chrome_content_browser_client_browsertest.cc',
'browser/chrome_main_browsertest.cc',
'browser/chrome_plugin_browsertest.cc',
@@ -490,25 +489,6 @@
'browser/ui/toolbar/browser_actions_bar_browsertest.h',
'browser/ui/toolbar/test_toolbar_model.cc',
'browser/ui/toolbar/test_toolbar_model.h',
- 'browser/ui/views/autofill/autofill_dialog_view_tester_views.cc',
- 'browser/ui/views/autofill/autofill_dialog_view_tester_views.h',
- 'browser/ui/views/autofill/autofill_popup_base_view_browsertest.cc',
- 'browser/ui/views/autofill/password_generation_popup_view_tester_views.cc',
- 'browser/ui/views/autofill/password_generation_popup_view_tester_views.h',
- 'browser/ui/views/extensions/extension_install_dialog_view_browsertest.cc',
- 'browser/ui/views/extensions/extension_uninstall_dialog_view_browsertest.cc',
- 'browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc',
- 'browser/ui/views/frame/browser_view_browsertest.cc',
- 'browser/ui/views/frame/browser_window_property_manager_browsertest_win.cc',
- 'browser/ui/views/location_bar/zoom_bubble_view_browsertest.cc',
- 'browser/ui/views/profiles/avatar_menu_button_browsertest.cc',
- 'browser/ui/views/profiles/profile_chooser_view_browsertest.cc',
- 'browser/ui/views/select_file_dialog_extension_browsertest.cc',
- 'browser/ui/views/toolbar/browser_actions_container_browsertest.cc',
- 'browser/ui/views/toolbar/component_toolbar_actions_browsertest.cc',
- 'browser/ui/views/toolbar/toolbar_view_browsertest.cc',
- 'browser/ui/views/translate/translate_bubble_view_browsertest.cc',
- 'browser/ui/views/web_dialog_view_browsertest.cc',
'browser/ui/webui/bidi_checker_web_ui_test.cc',
'browser/ui/webui/bidi_checker_web_ui_test.h',
'browser/ui/webui/bookmarks_ui_browsertest.cc',
@@ -586,6 +566,27 @@
# is safe to run there. See http://crbug.com/78722 for details.
'../base/files/file_path_watcher_browsertest.cc',
],
+ 'chrome_browser_tests_views_sources': [
+ 'browser/ui/views/autofill/autofill_dialog_view_tester_views.cc',
+ 'browser/ui/views/autofill/autofill_dialog_view_tester_views.h',
+ 'browser/ui/views/autofill/autofill_popup_base_view_browsertest.cc',
+ 'browser/ui/views/autofill/password_generation_popup_view_tester_views.cc',
+ 'browser/ui/views/autofill/password_generation_popup_view_tester_views.h',
+ 'browser/ui/views/extensions/extension_install_dialog_view_browsertest.cc',
+ 'browser/ui/views/extensions/extension_uninstall_dialog_view_browsertest.cc',
+ 'browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc',
+ 'browser/ui/views/frame/browser_view_browsertest.cc',
+ 'browser/ui/views/frame/browser_window_property_manager_browsertest_win.cc',
+ 'browser/ui/views/location_bar/zoom_bubble_view_browsertest.cc',
+ 'browser/ui/views/profiles/avatar_menu_button_browsertest.cc',
+ 'browser/ui/views/profiles/profile_chooser_view_browsertest.cc',
+ 'browser/ui/views/select_file_dialog_extension_browsertest.cc',
+ 'browser/ui/views/toolbar/browser_actions_container_browsertest.cc',
+ 'browser/ui/views/toolbar/component_toolbar_actions_browsertest.cc',
+ 'browser/ui/views/toolbar/toolbar_view_browsertest.cc',
+ 'browser/ui/views/translate/translate_bubble_view_browsertest.cc',
+ 'browser/ui/views/web_dialog_view_browsertest.cc',
+ ],
'chrome_browser_tests_chromeos_sources': [
'browser/chromeos/accessibility/accessibility_manager_browsertest.cc',
'browser/chromeos/accessibility/magnification_manager_browsertest.cc',
@@ -2158,10 +2159,8 @@
'FULL_SAFE_BROWSING',
],
}],
- ['enable_captive_portal_detection!=1', {
- 'sources/': [
- ['exclude', '^browser/captive_portal/'],
- ],
+ ['enable_captive_portal_detection==1', {
+ 'sources': [ 'browser/captive_portal/captive_portal_browsertest.cc' ],
}],
['enable_webrtc==0', {
'sources!': [
@@ -2204,13 +2203,11 @@
# ash environment to run these unit tests.
#
# TODO: enable these on windows and linux.
- 'browser/chromeos/system/tray_accessibility_browsertest.cc',
'browser/ui/ash/accelerator_commands_browsertest.cc',
'browser/ui/ash/accelerator_controller_browsertest.cc',
'browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc',
'browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc',
'browser/ui/ash/shelf_browsertest.cc',
- 'browser/ui/views/frame/app_non_client_frame_view_ash_browsertest.cc',
'browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc',
],
}],
@@ -2279,9 +2276,14 @@
}], # OS=="mac"
['OS=="mac" or OS=="win"', {
'sources': [
+ 'browser/extensions/api/networking_private/networking_private_apitest.cc',
+ 'browser/extensions/api/networking_private/networking_private_service_client_apitest.cc',
'browser/media_galleries/fileapi/itunes_data_provider_browsertest.cc',
'browser/media_galleries/fileapi/picasa_data_provider_browsertest.cc',
],
+ 'dependencies': [
+ '../components/components.gyp:wifi_test_support',
+ ],
}],
['os_posix == 0 or chromeos == 1', {
'sources!': [
@@ -2303,32 +2305,17 @@
}],
],
}],
- ['OS=="win" or OS == "mac"', {
- 'dependencies': [
- '../components/components.gyp:wifi_test_support',
- ],
- }],
['chromeos == 1 and use_athena == 0', {
'sources': [
'browser/extensions/api/networking_private/networking_private_apitest.cc',
'browser/extensions/api/networking_private/networking_private_chromeos_apitest.cc',
],
}],
- ['OS=="win" or OS == "mac"', {
- 'sources': [
- 'browser/extensions/api/networking_private/networking_private_apitest.cc',
- 'browser/extensions/api/networking_private/networking_private_service_client_apitest.cc',
- ],
- }],
['toolkit_views==1', {
+ 'sources': [ '<@(chrome_browser_tests_views_sources)' ],
'dependencies': [
'../ui/views/views.gyp:views',
],
- }, { # else: toolkit_views == 0
- 'sources/': [
- ['exclude', '^../ui/views/'],
- ['exclude', '^browser/ui/views/'],
- ],
}],
['OS!="android" and OS!="ios" and use_athena==0', {
'sources': [
« no previous file with comments | « chrome/browser/extensions/extension_management_test_util.cc ('k') | chrome/chrome_tests_unit.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698