Cleanup: Switch some unit_tests gyp conditions from excluding to including.

chrome/chrome_tests_unit.gypi

 # Copyright 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 {
   'targets': [
     {
       # This target contains mocks and test utilities that don't belong in
       # production libraries but are used by more than one test executable.
       'target_name': 'test_support_common',
       'type': 'static_library',
@@ skipping 53 matching lines @@
         'browser/browsing_data/mock_browsing_data_file_system_helper.cc',
         'browser/browsing_data/mock_browsing_data_file_system_helper.h',
         'browser/browsing_data/mock_browsing_data_flash_lso_helper.cc',
         'browser/browsing_data/mock_browsing_data_flash_lso_helper.h',
         'browser/browsing_data/mock_browsing_data_indexed_db_helper.cc',
         'browser/browsing_data/mock_browsing_data_indexed_db_helper.h',
         'browser/browsing_data/mock_browsing_data_local_storage_helper.cc',
         'browser/browsing_data/mock_browsing_data_local_storage_helper.h',
         'browser/browsing_data/mock_browsing_data_quota_helper.cc',
         'browser/browsing_data/mock_browsing_data_quota_helper.h',
-        'browser/chromeos/app_mode/fake_cws.cc',
-        'browser/chromeos/app_mode/fake_cws.h',
-        'browser/chromeos/input_method/mock_candidate_window_controller.cc',
-        'browser/chromeos/input_method/mock_candidate_window_controller.h',
-        'browser/chromeos/input_method/mock_input_method_engine.cc',
-        'browser/chromeos/input_method/mock_input_method_engine.h',
-        'browser/chromeos/input_method/mock_input_method_manager.cc',
-        'browser/chromeos/input_method/mock_input_method_manager.h',
-        'browser/chromeos/login/fake_login_utils.cc',
-        'browser/chromeos/login/fake_login_utils.h',
-        'browser/chromeos/login/auth/mock_url_fetchers.cc',
-        'browser/chromeos/login/auth/mock_url_fetchers.h',
-        'browser/chromeos/login/mock_login_utils.cc',
-        'browser/chromeos/login/mock_login_utils.h',
-        'browser/chromeos/login/users/avatar/mock_user_image_manager.cc',
-        'browser/chromeos/login/users/avatar/mock_user_image_manager.h',
-        'browser/chromeos/login/users/fake_supervised_user_manager.cc',
-        'browser/chromeos/login/users/fake_supervised_user_manager.h',
-        'browser/chromeos/login/users/fake_user_manager.cc',
-        'browser/chromeos/login/users/fake_user_manager.h',
-        'browser/chromeos/login/users/mock_user_manager.cc',
-        'browser/chromeos/login/users/mock_user_manager.h',
-        'browser/chromeos/login/test/oobe_screen_waiter.cc',
-        'browser/chromeos/login/test/oobe_screen_waiter.h',
-        'browser/chromeos/login/test/js_checker.cc',
-        'browser/chromeos/login/test/js_checker.h',
-        'browser/chromeos/login/ui/mock_login_display.cc',
-        'browser/chromeos/login/ui/mock_login_display.h',
-        'browser/chromeos/login/ui/mock_login_display_host.cc',
-        'browser/chromeos/login/ui/mock_login_display_host.h',
-        'browser/chromeos/net/network_portal_detector_test_utils.cc',
-        'browser/chromeos/net/network_portal_detector_test_utils.h',
-        'browser/chromeos/policy/cloud_external_data_manager_base_test_util.cc',
-        'browser/chromeos/policy/cloud_external_data_manager_base_test_util.h',
-        'browser/chromeos/policy/device_policy_builder.cc',
-        'browser/chromeos/policy/device_policy_builder.h',
-        'browser/chromeos/policy/stub_enterprise_install_attributes.cc',
-        'browser/chromeos/policy/stub_enterprise_install_attributes.h',
-        'browser/chromeos/settings/device_settings_test_helper.cc',
-        'browser/chromeos/settings/device_settings_test_helper.h',
-        'browser/chromeos/settings/mock_owner_key_util.cc',
-        'browser/chromeos/settings/mock_owner_key_util.h',
-        'browser/chromeos/system/fake_input_device_settings.cc',
-        'browser/chromeos/system/fake_input_device_settings.h',
         # The only thing used from browser is Browser::Type.
         'browser/download/download_test_file_activity_observer.cc',
         'browser/download/download_test_file_activity_observer.h',
         'browser/download/test_download_shelf.cc',
         'browser/download/test_download_shelf.h',
-        'browser/drive/dummy_drive_service.cc',
-        'browser/drive/dummy_drive_service.h',
-        'browser/drive/fake_drive_service.cc',
-        'browser/drive/fake_drive_service.h',
-        'browser/drive/test_util.cc',
-        '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/fake_safe_browsing_database_manager.cc',
-        'browser/extensions/fake_safe_browsing_database_manager.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',
         'browser/media/fake_desktop_media_list.h',
-        'browser/media_galleries/media_galleries_test_util.cc',
-        'browser/media_galleries/media_galleries_test_util.h',
         'browser/net/dns_probe_test_util.cc',
         'browser/net/dns_probe_test_util.h',
         'browser/net/url_request_mock_util.cc',
         'browser/net/url_request_mock_util.h',
         'browser/notifications/notification_test_util.cc',
         'browser/notifications/notification_test_util.h',
         'browser/password_manager/mock_password_store_service.cc',
         'browser/password_manager/mock_password_store_service.h',
         'browser/password_manager/null_password_store_service.cc',
         'browser/password_manager/null_password_store_service.h',
         'browser/password_manager/test_password_store_service.cc',
         'browser/password_manager/test_password_store_service.h',
-        'browser/policy/test/local_policy_test_server.cc',
-        'browser/policy/test/local_policy_test_server.h',
         'browser/prefs/pref_service_mock_factory.cc',
         'browser/prefs/pref_service_mock_factory.h',
         'browser/profile_resetter/profile_resetter_test_base.cc',
         'browser/profile_resetter/profile_resetter_test_base.h',
         'browser/search_engines/template_url_service_factory_test_util.cc',
         'browser/search_engines/template_url_service_factory_test_util.h',
         'browser/search_engines/template_url_service_test_util.cc',
         'browser/search_engines/template_url_service_test_util.h',
         'browser/sessions/session_service_test_helper.cc',
         'browser/sessions/session_service_test_helper.h',
         'browser/signin/fake_account_reconcilor.cc',
         'browser/signin/fake_account_reconcilor.h',
         'browser/signin/fake_profile_oauth2_token_service.cc',
         'browser/signin/fake_profile_oauth2_token_service.h',
         'browser/signin/fake_profile_oauth2_token_service_builder.cc',
         'browser/signin/fake_profile_oauth2_token_service_builder.h',
         'browser/signin/fake_signin_manager.cc',
         'browser/signin/fake_signin_manager.h',
         'browser/ssl/ssl_client_auth_requestor_mock.cc',
         'browser/ssl/ssl_client_auth_requestor_mock.h',
         'browser/sync/glue/local_device_info_provider_mock.cc',
         'browser/sync/glue/local_device_info_provider_mock.h',
         'browser/sync/profile_sync_components_factory_mock.cc',
         'browser/sync/profile_sync_components_factory_mock.h',
         'browser/sync/profile_sync_service_mock.cc',
         'browser/sync/profile_sync_service_mock.h',
-        'browser/ui/app_list/test/chrome_app_list_test_support.cc',
-        'browser/ui/app_list/test/chrome_app_list_test_support.h',
         'browser/ui/browser.h',
         'browser/ui/cocoa/find_bar/find_bar_host_unittest_util_cocoa.mm',
         'browser/ui/cocoa/run_loop_testing.h',
         'browser/ui/cocoa/run_loop_testing.mm',
         'browser/ui/find_bar/find_bar_host_unittest_util.h',
         'browser/ui/fullscreen/fullscreen_controller_state_test.cc',
         'browser/ui/fullscreen/fullscreen_controller_state_test.h',
         'browser/ui/fullscreen/fullscreen_controller_state_tests.h',
         'browser/ui/fullscreen/fullscreen_controller_test.cc',
         'browser/ui/fullscreen/fullscreen_controller_test.h',
         'browser/ui/login/login_prompt_test_utils.cc',
         'browser/ui/login/login_prompt_test_utils.h',
         'browser/ui/passwords/manage_passwords_ui_controller_mock.cc',
         'browser/ui/passwords/manage_passwords_ui_controller_mock.h',
         'browser/ui/pdf/pdf_browsertest_base.cc',
         'browser/ui/pdf/pdf_browsertest_base.h',
         'browser/ui/test/test_confirm_bubble_model.cc',
         'browser/ui/test/test_confirm_bubble_model.h',
         'browser/ui/views/find_bar_host_unittest_util_views.cc',
         'browser/ui/website_settings/mock_permission_bubble_request.cc',
         'browser/ui/website_settings/mock_permission_bubble_request.h',
         'common/extensions/extension_test_util.cc',
         'common/extensions/extension_test_util.h',
         'renderer/chrome_mock_render_thread.cc',
         'renderer/chrome_mock_render_thread.h',
-        'renderer/media/mock_webrtc_logging_message_filter.cc',
-        'renderer/media/mock_webrtc_logging_message_filter.h',
-        'renderer/printing/mock_printer.cc',
-        'renderer/printing/mock_printer.h',
         'renderer/safe_browsing/mock_feature_extractor_clock.cc',
         'renderer/safe_browsing/mock_feature_extractor_clock.h',
         'renderer/safe_browsing/test_utils.cc',
         'renderer/safe_browsing/test_utils.h',
         'test/base/chrome_process_util.cc',
         'test/base/chrome_process_util.h',
         'test/base/chrome_process_util_mac.cc',
         'test/base/chrome_render_view_host_test_harness.cc',
         'test/base/chrome_render_view_host_test_harness.h',
         'test/base/chrome_test_launcher.cc',
@@ skipping 41 matching lines @@
         'test/logging/win/file_logger.cc',
         'test/logging/win/file_logger.h',
         'test/logging/win/log_file_printer.cc',
         'test/logging/win/log_file_printer.h',
         'test/logging/win/log_file_reader.cc',
         'test/logging/win/log_file_reader.h',
         'test/logging/win/mof_data_parser.cc',
         'test/logging/win/mof_data_parser.h',
         'test/logging/win/test_log_collector.cc',
         'test/logging/win/test_log_collector.h',
-        'test/ppapi/ppapi_test.cc',
-        'test/ppapi/ppapi_test.h',
         '../ui/gfx/image/image_unittest_util.cc',
         '../ui/gfx/image/image_unittest_util.h',
       ],
       'conditions': [
         ['OS!="ios"', {
           'dependencies': [
             'common/extensions/api/api.gyp:chrome_api',
             'plugin',
             'renderer',
             'utility',
             '../content/content.gyp:content_gpu',
             '../content/content.gyp:content_plugin',
             '../content/content.gyp:content_ppapi_plugin',
             '../content/content.gyp:content_renderer',
             '../content/content.gyp:content_utility',
             '../components/components.gyp:autofill_core_test_support',
             '../components/components.gyp:captive_portal_test_support',
             '../components/components.gyp:sessions_test_support',
-            '../components/components.gyp:storage_monitor_test_support',
             '../extensions/extensions.gyp:extensions_test_support',
             '../google_apis/google_apis.gyp:google_apis_test_support',
             '../ipc/ipc.gyp:test_support_ipc',
             '../media/media.gyp:media_test_support',
             '../ppapi/ppapi_internal.gyp:ppapi_shared',
             '../sql/sql.gyp:test_support_sql',
             '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
           ],
           'export_dependent_settings': [
             'renderer',
           ],
         }, {  # OS=="ios"
           'sources/': [
             # Exclude everything but iOS-specific files.
             ['exclude', '\\.(cc|mm)$'],
             ['include', '_ios\\.(cc|mm)$'],
             ['include', '(^|/)ios/'],
             # TODO(ios): Add files here as they are updated to compile on iOS.
             ['include', '^test/base/chrome_test_suite\\.cc$'],
             ['include', '^test/base/chrome_unit_test_suite\\.cc$'],
             ['include', '^test/base/testing_browser_process'],
           ],
         }],
-        ['chromeos==0', {
-          'sources/': [
-            ['exclude', '^browser/chromeos'],
-          ],
-        }, {  # chromeos==1
+        ['chromeos==1', {
           'dependencies': [
             '../build/linux/system.gyp:dbus',
             '../chromeos/chromeos.gyp:chromeos_test_support',
           ],
-        }],
-        ['configuration_policy==0', {
-          'sources/': [
-            ['exclude', '^browser/policy'],
-            ['exclude', 'browser/net/disk_cache_dir_policy_handler_unittest.cc'],
+          'sources': [
+            'browser/chromeos/app_mode/fake_cws.cc',
+            'browser/chromeos/app_mode/fake_cws.h',
+            'browser/chromeos/input_method/mock_candidate_window_controller.cc',
+            'browser/chromeos/input_method/mock_candidate_window_controller.h',
+            'browser/chromeos/input_method/mock_input_method_engine.cc',
+            'browser/chromeos/input_method/mock_input_method_engine.h',
+            'browser/chromeos/input_method/mock_input_method_manager.cc',
+            'browser/chromeos/input_method/mock_input_method_manager.h',
+            'browser/chromeos/login/fake_login_utils.cc',
+            'browser/chromeos/login/fake_login_utils.h',
+            'browser/chromeos/login/auth/mock_url_fetchers.cc',
+            'browser/chromeos/login/auth/mock_url_fetchers.h',
+            'browser/chromeos/login/mock_login_utils.cc',
+            'browser/chromeos/login/mock_login_utils.h',
+            'browser/chromeos/login/users/avatar/mock_user_image_manager.cc',
+            'browser/chromeos/login/users/avatar/mock_user_image_manager.h',
+            'browser/chromeos/login/users/fake_supervised_user_manager.cc',
+            'browser/chromeos/login/users/fake_supervised_user_manager.h',
+            'browser/chromeos/login/users/fake_user_manager.cc',
+            'browser/chromeos/login/users/fake_user_manager.h',
+            'browser/chromeos/login/users/mock_user_manager.cc',
+            'browser/chromeos/login/users/mock_user_manager.h',
+            'browser/chromeos/login/test/oobe_screen_waiter.cc',
+            'browser/chromeos/login/test/oobe_screen_waiter.h',
+            'browser/chromeos/login/test/js_checker.cc',
+            'browser/chromeos/login/test/js_checker.h',
+            'browser/chromeos/login/ui/mock_login_display.cc',
+            'browser/chromeos/login/ui/mock_login_display.h',
+            'browser/chromeos/login/ui/mock_login_display_host.cc',
+            'browser/chromeos/login/ui/mock_login_display_host.h',
+            'browser/chromeos/net/network_portal_detector_test_utils.cc',
+            'browser/chromeos/net/network_portal_detector_test_utils.h',
+            'browser/chromeos/policy/cloud_external_data_manager_base_test_util.cc',
+            'browser/chromeos/policy/cloud_external_data_manager_base_test_util.h',
+            'browser/chromeos/policy/device_policy_builder.cc',
+            'browser/chromeos/policy/device_policy_builder.h',
+            'browser/chromeos/policy/stub_enterprise_install_attributes.cc',
+            'browser/chromeos/policy/stub_enterprise_install_attributes.h',
+            'browser/chromeos/settings/device_settings_test_helper.cc',
+            'browser/chromeos/settings/device_settings_test_helper.h',
+            'browser/chromeos/settings/mock_owner_key_util.cc',
+            'browser/chromeos/settings/mock_owner_key_util.h',
+            'browser/chromeos/system/fake_input_device_settings.cc',
+            'browser/chromeos/system/fake_input_device_settings.h',
           ],
         }],
         ['configuration_policy==1', {
           'dependencies': [
             '../components/components.gyp:policy_component_test_support',
             '../components/components.gyp:policy_test_support',
           ],
           'export_dependent_settings': [
             '../components/components.gyp:policy_component_test_support',
             '../components/components.gyp:policy_test_support',
           ],
+          'sources': [
+            'browser/policy/test/local_policy_test_server.cc',
+            'browser/policy/test/local_policy_test_server.h',
+          ],
         }],
-        ['safe_browsing!=1', {
-          'sources/': [
-            ['exclude', '^browser/extensions/blacklist_unittest.cc'],
-            ['exclude', '^browser/extensions/fake_safe_browsing_database_manager.cc'],
-            ['exclude', '^browser/extensions/fake_safe_browsing_database_manager.h'],
+        ['safe_browsing==1', {
+          'sources': [
+            'browser/extensions/fake_safe_browsing_database_manager.cc',
+            'browser/extensions/fake_safe_browsing_database_manager.h',
           ],
         }],
         ['OS=="linux"', {
           'dependencies': [
             '../build/linux/system.gyp:ssl',
           ],
         }],
         ['enable_printing==1', {
           'dependencies': [
             'service',
           ],
         }],
-        ['enable_printing==0', {
-          'sources/': [
-            ['exclude', '^renderer/printing/mock_printer.cc'],
-            ['exclude', '^renderer/printing/mock_printer.h'],
+        ['enable_printing!=0', {
+          'sources': [
+            'renderer/printing/mock_printer.cc',
+            'renderer/printing/mock_printer.h',
           ],
         }],
-        ['enable_extensions==0', {
-          'sources/': [
-            ['exclude', '^browser/drive/'],
-            ['exclude', '^browser/extensions/api/messaging/native_messaging_'],
-            ['exclude', '^browser/media_galleries/'],
+        ['enable_extensions==1', {
+          'dependencies': [
+            '../components/components.gyp:storage_monitor_test_support',
           ],
-        }],
-        ['OS=="android"', {
-          'dependencies!': [
-            '../components/components.gyp:storage_monitor_test_support',
+          'sources': [
+            'browser/drive/dummy_drive_service.cc',
+            'browser/drive/dummy_drive_service.h',
+            'browser/drive/fake_drive_service.cc',
+            'browser/drive/fake_drive_service.h',
+            'browser/drive/test_util.cc',
+            'browser/drive/test_util.h',
+            'browser/extensions/api/messaging/native_messaging_test_util.cc',
+            'browser/extensions/api/messaging/native_messaging_test_util.h',
+            'browser/media_galleries/media_galleries_test_util.cc',
+            'browser/media_galleries/media_galleries_test_util.h',
           ],
         }],
         ['OS=="win"', {
           'dependencies': [
             '../ui/snapshot/snapshot.gyp:snapshot_test_support',
           ],
           'include_dirs': [
             '<(DEPTH)/third_party/wtl/include',
           ],
           'conditions': [
@@ skipping 18 matching lines @@
             '../breakpad/breakpad.gyp:breakpad',
             '../components/components.gyp:breakpad_component',
           ],
           'sources': [
             'app/chrome_breakpad_client.cc',
             'app/chrome_breakpad_client_mac.mm',
             'app/chrome_main_mac.mm',
           ],
         }],
         ['enable_mdns==1', {
-            'sources': [
-              'browser/local_discovery/test_service_discovery_client.cc',
-              'browser/local_discovery/test_service_discovery_client.h',
-            ]
-        }],
-        ['enable_app_list==0', {
-          'sources/': [
-            ['exclude', '^browser/ui/app_list/'],
+          'sources': [
+            'browser/local_discovery/test_service_discovery_client.cc',
+            'browser/local_discovery/test_service_discovery_client.h',
           ],
         }],
-        ['enable_webrtc==0', {
-          'sources!': [
+        ['enable_app_list==1', {
+          'sources': [
+            'browser/ui/app_list/test/chrome_app_list_test_support.cc',
+            'browser/ui/app_list/test/chrome_app_list_test_support.h',
+          ],
+        }],
+        ['enable_webrtc==1', {
+          'sources': [
             'renderer/media/mock_webrtc_logging_message_filter.cc',
             'renderer/media/mock_webrtc_logging_message_filter.h',
           ],
         }],
         ['enable_wifi_bootstrapping', {
           "sources" : [
              'browser/local_discovery/wifi/mock_wifi_manager.cc',
              'browser/local_discovery/wifi/mock_wifi_manager.h',
-          ]
-        }]
+          ],
+        }],
+        ['enable_plugins==1', {
+          "sources" : [
+            'test/ppapi/ppapi_test.cc',
+            'test/ppapi/ppapi_test.h',
+          ],
+        }],
       ],
     },
     {
       'target_name': 'test_support_unit',
       'type': 'static_library',
       'dependencies': [
         'chrome_resources.gyp:chrome_resources',
         'chrome_resources.gyp:chrome_strings',
         'browser',
         'common',
@@ skipping 491 matching lines @@
         'browser/extensions/api/streams_private/streams_private_manifest_unittest.cc',
         'browser/extensions/api/synced_notifications_private/synced_notifications_shim_unittest.cc',
         'browser/extensions/api/system_display/display_info_provider_chromeos_unittest.cc',
         'browser/extensions/api/web_navigation/frame_navigation_state_unittest.cc',
         'browser/extensions/api/web_request/form_data_parser_unittest.cc',
         'browser/extensions/api/web_request/upload_data_presenter_unittest.cc',
         'browser/extensions/api/web_request/web_request_api_unittest.cc',
         'browser/extensions/api/web_request/web_request_permissions_unittest.cc',
         'browser/extensions/api/web_request/web_request_time_tracker_unittest.cc',
         'browser/extensions/app_sync_data_unittest.cc',
-        'browser/extensions/blacklist_unittest.cc',
         'browser/extensions/blacklist_state_fetcher_unittest.cc',
         'browser/extensions/bookmark_app_helper_unittest.cc',
         'browser/extensions/browser_permissions_policy_delegate_unittest.cc',
         'browser/extensions/chrome_app_sorting_unittest.cc',
         'browser/extensions/component_loader_unittest.cc',
         'browser/extensions/convert_user_script_unittest.cc',
         'browser/extensions/convert_web_app_unittest.cc',
         'browser/extensions/default_apps_unittest.cc',
         'browser/extensions/error_console/error_console_unittest.cc',
         'browser/extensions/event_router_forwarder_unittest.cc',
@@ skipping 1766 matching lines @@
             # OpenSSL build does not support firefox importer. See
             # http://crbug.com/64926
             ['exclude', '^browser/importer/'],
           ],
         }],
         ['enable_managed_users!=1', {
           'sources/': [
             ['exclude', '^browser/supervised_user/'],
           ],
         }],
-        ['safe_browsing!=1', {
-          'sources/': [
-            ['exclude', '^browser/extensions/blacklist_unittest.cc'],
+        ['safe_browsing==1', {
+          'sources': [
+            'browser/extensions/blacklist_unittest.cc',
           ],
         }],
         ['cld_version==0 or cld_version==1', {
           'defines': [
             'CLD_WINDOWS',
           ],
           'direct_dependent_settings': {
             'defines': [
               'CLD_WINDOWS',
             ],
@@ skipping 152 matching lines @@
               'dependencies': [
                 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
               ],
             }],
           ],
         },
       ],
     }],
   ],  # 'conditions'
 }