Index: chrome/chrome_tests_unit.gypi |
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi |
index 7240d307fa33d0a62e61745b472c0ae138b187ec..04792f390816424b2b66ee2d6bc84125dc37e890 100644 |
--- a/chrome/chrome_tests_unit.gypi |
+++ b/chrome/chrome_tests_unit.gypi |
@@ -76,24 +76,6 @@ |
'browser/download/download_test_file_activity_observer.h', |
'browser/download/test_download_shelf.cc', |
'browser/download/test_download_shelf.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/mock_extension_special_storage_policy.cc', |
- 'browser/extensions/mock_extension_special_storage_policy.h', |
- 'browser/extensions/test_blacklist.cc', |
- 'browser/extensions/test_blacklist.h', |
- 'browser/extensions/test_blacklist_state_fetcher.cc', |
- 'browser/extensions/test_blacklist_state_fetcher.h', |
- 'browser/extensions/test_extension_environment.cc', |
- 'browser/extensions/test_extension_environment.h', |
- 'browser/extensions/test_extension_prefs.cc', |
- 'browser/extensions/test_extension_prefs.h', |
- 'browser/extensions/test_extension_service.cc', |
- 'browser/extensions/test_extension_service.h', |
- 'browser/extensions/test_extension_system.cc', |
- 'browser/extensions/test_extension_system.h', |
'browser/invalidation/fake_invalidation_service.cc', |
'browser/invalidation/fake_invalidation_service.h', |
'browser/media/fake_desktop_media_list.cc', |
@@ -364,6 +346,24 @@ |
'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/mock_extension_special_storage_policy.cc', |
+ 'browser/extensions/mock_extension_special_storage_policy.h', |
+ 'browser/extensions/test_blacklist.cc', |
+ 'browser/extensions/test_blacklist.h', |
+ 'browser/extensions/test_blacklist_state_fetcher.cc', |
+ 'browser/extensions/test_blacklist_state_fetcher.h', |
+ 'browser/extensions/test_extension_environment.cc', |
+ 'browser/extensions/test_extension_environment.h', |
+ 'browser/extensions/test_extension_prefs.cc', |
+ 'browser/extensions/test_extension_prefs.h', |
+ 'browser/extensions/test_extension_service.cc', |
+ 'browser/extensions/test_extension_service.h', |
+ 'browser/extensions/test_extension_system.cc', |
+ 'browser/extensions/test_extension_system.h', |
'browser/media_galleries/media_galleries_test_util.cc', |
'browser/media_galleries/media_galleries_test_util.h', |
], |
@@ -2062,10 +2062,10 @@ |
'sources/': [ |
['exclude', '^../apps/'], |
['exclude', '^../extensions/'], |
+ ['exclude', '^browser/apps/'], |
['exclude', '^browser/drive/'], |
['exclude', '^browser/extensions/activity_log/'], |
- ['exclude', '^browser/extensions/api/'], |
- ['exclude', '^browser/extensions/error_console/'], |
+ ['exclude', '^browser/extensions/'], |
['exclude', '^browser/sync/glue/extensions_activity_monitor_unittest.cc'], |
['exclude', '^browser/sync_file_system/'], |
['exclude', '^common/extensions/api/'], |
@@ -2702,7 +2702,7 @@ |
['exclude', '^browser/supervised_user/'], |
], |
}], |
- ['safe_browsing==1', { |
+ ['safe_browsing==1 and enable_extensions==1', { |
'sources': [ |
'browser/extensions/blacklist_unittest.cc', |
], |