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

Side by Side Diff: chrome/chrome_tests.gypi

Issue 300873002: Removed NPAPI plugin infobar, with Finch trial gate (disabled by default). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased to include new blocking page action UI Created 6 years, 6 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 unified diff | Download patch
OLDNEW
1 # Copyright 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 { 4 {
5 'includes': [ 5 'includes': [
6 'js_unittest_vars.gypi', 6 'js_unittest_vars.gypi',
7 ], 7 ],
8 'targets': [ 8 'targets': [
9 { 9 {
10 'target_name': 'interactive_ui_tests', 10 'target_name': 'interactive_ui_tests',
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 'browser/extensions/extension_fullscreen_apitest.cc', 69 'browser/extensions/extension_fullscreen_apitest.cc',
70 'browser/extensions/extension_function_test_utils.cc', 70 'browser/extensions/extension_function_test_utils.cc',
71 'browser/extensions/extension_commands_global_registry_apitest.cc', 71 'browser/extensions/extension_commands_global_registry_apitest.cc',
72 'browser/extensions/extension_keybinding_apitest.cc', 72 'browser/extensions/extension_keybinding_apitest.cc',
73 'browser/extensions/notifications_apitest.cc', 73 'browser/extensions/notifications_apitest.cc',
74 'browser/extensions/updater/extension_cache_fake.h', 74 'browser/extensions/updater/extension_cache_fake.h',
75 'browser/extensions/updater/extension_cache_fake.cc', 75 'browser/extensions/updater/extension_cache_fake.cc',
76 'browser/extensions/window_open_interactive_apitest.cc', 76 'browser/extensions/window_open_interactive_apitest.cc',
77 'browser/mouseleave_browsertest.cc', 77 'browser/mouseleave_browsertest.cc',
78 'browser/notifications/notification_browsertest.cc', 78 'browser/notifications/notification_browsertest.cc',
79 'browser/plugins/npapi_infobar_browsertest.cc',
79 'browser/password_manager/password_generation_interactive_uitest.cc', 80 'browser/password_manager/password_generation_interactive_uitest.cc',
80 'browser/renderer_context_menu/render_view_context_menu_browsertest_util .cc', 81 'browser/renderer_context_menu/render_view_context_menu_browsertest_util .cc',
81 'browser/renderer_context_menu/render_view_context_menu_browsertest_util .h', 82 'browser/renderer_context_menu/render_view_context_menu_browsertest_util .h',
82 'browser/task_manager/task_manager_browsertest_util.cc', 83 'browser/task_manager/task_manager_browsertest_util.cc',
83 'browser/ui/app_list/app_list_service_interactive_uitest.cc', 84 'browser/ui/app_list/app_list_service_interactive_uitest.cc',
84 'browser/ui/app_list/app_list_service_mac_interactive_uitest.mm', 85 'browser/ui/app_list/app_list_service_mac_interactive_uitest.mm',
85 'browser/ui/autofill/autofill_popup_controller_interactive_uitest.cc', 86 'browser/ui/autofill/autofill_popup_controller_interactive_uitest.cc',
86 'browser/ui/browser_focus_uitest.cc', 87 'browser/ui/browser_focus_uitest.cc',
87 'browser/ui/cocoa/apps/quit_with_apps_controller_mac_interactive_uitest. cc', 88 'browser/ui/cocoa/apps/quit_with_apps_controller_mac_interactive_uitest. cc',
88 'browser/ui/cocoa/panels/panel_cocoa_browsertest.mm', 89 'browser/ui/cocoa/panels/panel_cocoa_browsertest.mm',
(...skipping 1201 matching lines...) Expand 10 before | Expand all | Expand 10 after
1290 'browser/net/ftp_browsertest.cc', 1291 'browser/net/ftp_browsertest.cc',
1291 'browser/net/load_timing_browsertest.cc', 1292 'browser/net/load_timing_browsertest.cc',
1292 'browser/net/nss_context_chromeos_browsertest.cc', 1293 'browser/net/nss_context_chromeos_browsertest.cc',
1293 'browser/net/predictor_browsertest.cc', 1294 'browser/net/predictor_browsertest.cc',
1294 'browser/net/proxy_browsertest.cc', 1295 'browser/net/proxy_browsertest.cc',
1295 'browser/net/websocket_browsertest.cc', 1296 'browser/net/websocket_browsertest.cc',
1296 'browser/notifications/login_state_notification_blocker_chromeos_browser test.cc', 1297 'browser/notifications/login_state_notification_blocker_chromeos_browser test.cc',
1297 'browser/notifications/message_center_notifications_browsertest.cc', 1298 'browser/notifications/message_center_notifications_browsertest.cc',
1298 'browser/notifications/sync_notifier/sync_notifier_test_utils.cc', 1299 'browser/notifications/sync_notifier/sync_notifier_test_utils.cc',
1299 'browser/notifications/sync_notifier/sync_notifier_test_utils.h', 1300 'browser/notifications/sync_notifier/sync_notifier_test_utils.h',
1300 'browser/password_manager/password_manager_browsertest.cc', 1301 'browser/plugins/npapi_infobar_browsertest.cc',
Bernhard Bauer 2014/06/20 10:43:40 Wait, why is this in here twice now? Also, there'
limasdf 2014/06/20 14:10:16 and This should be alphabetically ordered.
Chris Thompson 2014/06/20 17:01:44 My mistake when adding them to the build. This sho
Chris Thompson 2014/06/20 17:01:44 Forgot to move it when I changed the parent folder
1302 » 'browser/password_manager/password_manager_browsertest.cc',
1301 'browser/performance_monitor/performance_monitor_browsertest.cc', 1303 'browser/performance_monitor/performance_monitor_browsertest.cc',
1302 'browser/policy/cloud/cloud_policy_browsertest.cc', 1304 'browser/policy/cloud/cloud_policy_browsertest.cc',
1303 'browser/policy/cloud/cloud_policy_manager_browsertest.cc', 1305 'browser/policy/cloud/cloud_policy_manager_browsertest.cc',
1304 'browser/policy/cloud/component_cloud_policy_browsertest.cc', 1306 'browser/policy/cloud/component_cloud_policy_browsertest.cc',
1305 'browser/policy/cloud/device_management_service_browsertest.cc', 1307 'browser/policy/cloud/device_management_service_browsertest.cc',
1306 'browser/policy/cloud/test_request_interceptor.cc', 1308 'browser/policy/cloud/test_request_interceptor.cc',
1307 'browser/policy/cloud/test_request_interceptor.h', 1309 'browser/policy/cloud/test_request_interceptor.h',
1308 'browser/policy/policy_browsertest.cc', 1310 'browser/policy/policy_browsertest.cc',
1309 'browser/policy/policy_prefs_browsertest.cc', 1311 'browser/policy/policy_prefs_browsertest.cc',
1310 'browser/prefetch/prefetch_browsertest.cc', 1312 'browser/prefetch/prefetch_browsertest.cc',
(...skipping 1651 matching lines...) Expand 10 before | Expand all | Expand 10 after
2962 ['enable_webrtc==1', { 2964 ['enable_webrtc==1', {
2963 'dependencies': [ 2965 'dependencies': [
2964 '../third_party/libjingle/libjingle.gyp:libjingle_webrtc' 2966 '../third_party/libjingle/libjingle.gyp:libjingle_webrtc'
2965 ] 2967 ]
2966 }], 2968 }],
2967 ], 2969 ],
2968 }] 2970 }]
2969 }], 2971 }],
2970 ], # 'conditions' 2972 ], # 'conditions'
2971 } 2973 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698