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

Unified Diff: chrome/chrome_tests.gypi

Issue 7552029: Revert 96098 - ui_tests began crashing (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 4 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
Index: chrome/chrome_tests.gypi
===================================================================
--- chrome/chrome_tests.gypi (revision 96106)
+++ chrome/chrome_tests.gypi (working copy)
@@ -1509,6 +1509,8 @@
'browser/net/url_fixer_upper_unittest.cc',
'browser/net/url_info_unittest.cc',
'browser/notifications/desktop_notification_service_unittest.cc',
+ 'browser/notifications/desktop_notifications_unittest.cc',
+ 'browser/notifications/desktop_notifications_unittest.h',
'browser/notifications/notification_exceptions_table_model_unittest.cc',
'browser/notifications/notifications_prefs_cache_unittest.cc',
'browser/parsers/metadata_parser_filebase_unittest.cc',
@@ -2112,6 +2114,7 @@
}],
['chromeos==1', {
'sources/': [
+ ['exclude', '^browser/notifications/desktop_notifications_unittest.cc'],
['exclude', '^browser/password_manager/native_backend_gnome_x_unittest.cc'],
['exclude', '^browser/renderer_host/gtk_key_bindings_handler_unittest.cc'],
# TODO(thestig) Enable PrintPreviewUI tests on CrOS when
@@ -2556,8 +2559,6 @@
'browser/magic_iframe_browsertest.cc',
'browser/net/cookie_policy_browsertest.cc',
'browser/net/ftp_browsertest.cc',
- 'browser/notifications/desktop_notifications_unittest.cc',
- 'browser/notifications/desktop_notifications_unittest.h',
'browser/plugin_data_remover_browsertest.cc',
'browser/policy/device_management_backend_mock.cc',
'browser/policy/device_management_backend_mock.h',
@@ -2669,7 +2670,6 @@
],
}, { #else: OS == "chromeos"
'sources!': [
- 'browser/notifications/desktop_notifications_unittest.cc',
'browser/service/service_process_control_browsertest.cc',
'browser/ui/webui/print_preview.js',
],
« no previous file with comments | « chrome/browser/ui/views/extensions/browser_action_drag_data_unittest.cc ('k') | chrome/test/base/chrome_test_suite.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698