Index: chrome/chrome_tests.gypi |
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi |
index f9ee59bb5820d1507d0ef6ca072122841ead9773..f07c364ff5d53068bd5e0c45b656d9f39befad8f 100644 |
--- a/chrome/chrome_tests.gypi |
+++ b/chrome/chrome_tests.gypi |
@@ -1451,11 +1451,6 @@ |
'browser/net/sqlite_persistent_cookie_store_unittest.cc', |
'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', |
'browser/password_manager/encryptor_password_mac_unittest.cc', |
'browser/password_manager/encryptor_unittest.cc', |
@@ -1985,6 +1980,15 @@ |
'../webkit/fileapi/file_system_test_helper.h', |
], |
'conditions': [ |
+ ['enable_desktop_notifications==1', { |
+ 'sources': [ |
+ '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', |
+ ] |
+ }], |
['p2p_apis==1', { |
'sources': [ |
'../content/browser/renderer_host/p2p/socket_host_test_utils.h', |
@@ -2407,7 +2411,6 @@ |
'browser/extensions/extension_webstore_private_apitest.cc', |
'browser/extensions/extension_webstore_private_browsertest.cc', |
'browser/extensions/isolated_app_apitest.cc', |
- 'browser/extensions/notifications_apitest.cc', |
'browser/extensions/page_action_apitest.cc', |
'browser/extensions/permissions_apitest.cc', |
'browser/extensions/stubs_apitest.cc', |
@@ -2653,6 +2656,12 @@ |
'../webkit/webkit.gyp:copy_npapi_test_plugin', |
], |
}], |
+ ['enable_desktop_notifications==1', { |
+ 'sources': [ |
+ 'browser/extensions/notifications_apitest.cc', |
+ 'browser/task_manager/task_manager_notification_browsertest.cc', |
+ ] |
+ }], |
], # conditions |
}, # target browser_tests |
{ |