diff options
| -rw-r--r-- | build/all.gyp | 6 | ||||
| -rw-r--r-- | extensions/BUILD.gn | 62 | ||||
| -rw-r--r-- | extensions/extensions.gyp | 152 | ||||
| -rw-r--r-- | extensions/extensions_tests.gyp | 233 | ||||
| -rw-r--r-- | extensions/shell/app_shell.gyp | 68 | ||||
| -rw-r--r-- | extensions/shell/test/shell_test.cc | 2 | ||||
| -rw-r--r-- | extensions/test/data/system/cpu/test_cpu_api.js | 2 | ||||
| -rw-r--r-- | extensions/test/data/system/display/test_display_api.js | 2 | ||||
| -rw-r--r-- | extensions/test/data/system/memory/test_memory_api.js | 2 | ||||
| -rw-r--r-- | extensions/test/data/system/storage/test_storage_api.js | 2 | ||||
| -rw-r--r-- | extensions/test/data/system/storage_attachment/test_storage_api.js | 2 | ||||
| -rw-r--r-- | testing/buildbot/chromium.chromiumos.json | 6 | ||||
| -rw-r--r-- | testing/buildbot/chromium.linux.json | 6 | ||||
| -rw-r--r-- | testing/buildbot/chromium.memory.fyi.json | 4 | ||||
| -rw-r--r-- | testing/buildbot/chromium.memory.json | 2 | ||||
| -rw-r--r-- | testing/buildbot/chromium.webkit.json | 4 | ||||
| -rw-r--r-- | testing/buildbot/chromium.win.json | 10 | ||||
| -rw-r--r-- | testing/buildbot/chromium_trybot.json | 2 |
18 files changed, 323 insertions, 244 deletions
diff --git a/build/all.gyp b/build/all.gyp index e157cd2..0888d8c 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -323,7 +323,8 @@ '../content/content_shell_and_tests.gyp:content_shell', '../content/content_shell_and_tests.gyp:content_unittests', '../device/device_tests.gyp:device_unittests', - '../extensions/extensions.gyp:extensions_unittests', + '../extensions/extensions_tests.gyp:extensions_browsertests', + '../extensions/extensions_tests.gyp:extensions_unittests', '../gin/gin.gyp:gin_unittests', '../google_apis/google_apis.gyp:google_apis_unittests', '../gpu/gles2_conform_support/gles2_conform_support.gyp:gles2_conform_support', @@ -1150,7 +1151,8 @@ '../courgette/courgette.gyp:courgette_unittests', '../crypto/crypto.gyp:crypto_unittests', '../device/device_tests.gyp:device_unittests', - '../extensions/extensions.gyp:extensions_unittests', + '../extensions/extensions_tests.gyp:extensions_browsertests', + '../extensions/extensions_tests.gyp:extensions_unittests', '../gin/gin.gyp:gin_shell', '../gin/gin.gyp:gin_unittests', '../google_apis/gcm/gcm.gyp:gcm_unit_tests', diff --git a/extensions/BUILD.gn b/extensions/BUILD.gn index 9f69856..108511a 100644 --- a/extensions/BUILD.gn +++ b/extensions/BUILD.gn @@ -289,3 +289,65 @@ if (false) { } } } + +test("extensions_browsertests") { + sources = [ + "browser/api/audio/audio_apitest.cc", + "browser/api/dns/dns_apitest.cc", + "browser/api/hid/hid_apitest.cc", + "browser/api/socket/socket_apitest.cc", + "browser/api/sockets_tcp/sockets_tcp_apitest.cc", + "browser/api/sockets_udp/sockets_udp_apitest.cc", + "browser/api/system_cpu/system_cpu_apitest.cc", + "browser/api/system_display/system_display_apitest.cc", + "browser/api/system_memory/system_memory_apitest.cc", + "browser/api/system_network/system_network_apitest.cc", + "browser/api/system_storage/storage_api_test_util.cc", + "browser/api/system_storage/storage_api_test_util.h", + "browser/api/system_storage/system_storage_apitest.cc", + "browser/api/system_storage/system_storage_eject_apitest.cc", + "browser/api/usb/usb_apitest.cc", + "browser/guest_view/app_view/app_view_apitest.cc", + "browser/guest_view/web_view/web_view_apitest.h", + "browser/guest_view/web_view/web_view_apitest.cc", + "browser/guest_view/web_view/web_view_media_access_apitest.cc", + "browser/updater/update_service_browsertest.cc", + "shell/browser/geolocation/geolocation_apitest.cc", + "shell/browser/shell_browsertest.cc", + "shell/test/shell_apitest.cc", + "shell/test/shell_apitest.h", + "shell/test/shell_test.cc", + "shell/test/shell_test.h", + "shell/test/shell_test_launcher_delegate.cc", + "shell/test/shell_test_launcher_delegate.h", + "shell/test/shell_tests_main.cc", + ] + + defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ] + + deps = [ + ":test_support", + "shell:app_shell_lib", + + # TODO(yoz): find the right deps + "//base", + "//base:prefs_test_support", + "//base/test:test_support", + "//components/storage_monitor:test_support", + "//content/test:test_support", + "//mojo/environment:chromium", + "//testing/gmock", + "//testing/gtest", + "//third_party/mojo/src/mojo/edk/js", + "//third_party/mojo/src/mojo/edk/system", + "//third_party/mojo/src/mojo/public/cpp/bindings", + ] + + if (is_win) { + deps += [ "//base/allocator" ] + } + + if (is_mac) { + deps += [ "shell:app_shell" ] # Needed for App Shell.app's Helper. + } +} diff --git a/extensions/extensions.gyp b/extensions/extensions.gyp index cac677e..edd9a7d 100644 --- a/extensions/extensions.gyp +++ b/extensions/extensions.gyp @@ -1103,7 +1103,7 @@ 'browser/guest_view/test_guest_view_manager.cc', 'browser/guest_view/test_guest_view_manager.h', 'browser/mock_extension_system.cc', - 'browser/mock_extension_system.h', + 'browser/mock_extension_system.h', 'browser/test_extension_registry_observer.cc', 'browser/test_extension_registry_observer.h', 'browser/test_extensions_browser_client.cc', @@ -1179,155 +1179,5 @@ }, ], }, - { - 'target_name': 'extensions_unittests', - 'type': 'executable', - 'dependencies': [ - '../base/base.gyp:base', - '../base/base.gyp:test_support_base', - '../components/components.gyp:keyed_service_content', - '../components/components.gyp:user_prefs', - '../content/content_shell_and_tests.gyp:test_support_content', - '../device/bluetooth/bluetooth.gyp:device_bluetooth_mocks', - '../device/serial/serial.gyp:device_serial', - '../device/serial/serial.gyp:device_serial_test_util', - '../mojo/mojo_base.gyp:mojo_environment_chromium', - '../testing/gmock.gyp:gmock', - '../testing/gtest.gyp:gtest', - '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase', - '../third_party/mojo/mojo_edk.gyp:mojo_js_lib', - '../third_party/mojo/mojo_edk.gyp:mojo_system_impl', - '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings', - 'common/api/api.gyp:cast_channel_proto', - 'extensions_common', - 'extensions_renderer', - 'extensions_resources.gyp:extensions_resources', - 'extensions_shell_and_test_pak', - 'extensions_strings.gyp:extensions_strings', - 'extensions_test_support', - 'extensions_utility', - ], - # Needed for third_party libraries like leveldb. - 'include_dirs': [ - '..', - ], - 'sources': [ - 'browser/api/api_resource_manager_unittest.cc', - 'browser/api/bluetooth/bluetooth_event_router_unittest.cc', - 'browser/api/cast_channel/cast_auth_ica_unittest.cc', - 'browser/api/cast_channel/cast_auth_util_unittest.cc', - 'browser/api/cast_channel/cast_channel_api_unittest.cc', - 'browser/api/cast_channel/cast_framer_unittest.cc', - 'browser/api/cast_channel/cast_socket_unittest.cc', - 'browser/api/cast_channel/cast_transport_unittest.cc', - 'browser/api/cast_channel/keep_alive_delegate_unittest.cc', - 'browser/api/cast_channel/logger_unittest.cc', - 'browser/api/cast_channel/test_util.cc', - 'browser/api/cast_channel/test_util.h', - 'browser/api/declarative/declarative_rule_unittest.cc', - 'browser/api/declarative/deduping_factory_unittest.cc', - 'browser/api/declarative/rules_registry_unittest.cc', - 'browser/api/declarative_webrequest/webrequest_condition_unittest.cc', - 'browser/api/declarative_webrequest/webrequest_condition_attribute_unittest.cc', - 'browser/api/idle/idle_api_unittest.cc', - 'browser/api/power/power_api_unittest.cc', - 'browser/api/sockets_tcp/sockets_tcp_api_unittest.cc', - 'browser/api/sockets_udp/sockets_udp_api_unittest.cc', - 'browser/api/storage/settings_quota_unittest.cc', - 'browser/api/storage/storage_api_unittest.cc', - 'browser/api/storage/storage_frontend_unittest.cc', - 'browser/api/web_request/form_data_parser_unittest.cc', - 'browser/api/web_request/upload_data_presenter_unittest.cc', - 'browser/api/web_request/web_request_time_tracker_unittest.cc', - 'browser/app_window/app_window_geometry_cache_unittest.cc', - 'browser/computed_hashes_unittest.cc', - 'browser/content_hash_tree_unittest.cc', - 'browser/event_listener_map_unittest.cc', - 'browser/event_router_unittest.cc', - 'browser/error_map_unittest.cc', - 'browser/extension_icon_image_unittest.cc', - 'browser/extension_pref_value_map_unittest.cc', - 'browser/extension_registry_unittest.cc', - 'browser/file_highlighter_unittest.cc', - 'browser/file_reader_unittest.cc', - 'browser/guest_view/guest_view_manager_unittest.cc', - 'browser/image_loader_unittest.cc', - 'browser/info_map_unittest.cc', - 'browser/lazy_background_task_queue_unittest.cc', - 'browser/management_policy_unittest.cc', - 'browser/mojo/keep_alive_impl_unittest.cc', - 'browser/mojo/stash_backend_unittest.cc', - 'browser/process_manager_unittest.cc', - 'browser/process_map_unittest.cc', - 'browser/quota_service_unittest.cc', - 'browser/runtime_data_unittest.cc', - 'browser/value_store/leveldb_value_store_unittest.cc', - 'browser/value_store/testing_value_store_unittest.cc', - 'browser/value_store/value_store_change_unittest.cc', - 'browser/value_store/value_store_frontend_unittest.cc', - 'browser/value_store/value_store_unittest.cc', - 'browser/value_store/value_store_unittest.h', - 'browser/verified_contents_unittest.cc', - 'browser/warning_service_unittest.cc', - 'common/api/sockets/sockets_manifest_permission_unittest.cc', - 'common/csp_validator_unittest.cc', - 'common/event_filter_unittest.cc', - 'common/extension_l10n_util_unittest.cc', - 'common/extension_resource_unittest.cc', - 'common/extension_set_unittest.cc', - 'common/features/base_feature_provider_unittest.cc', - 'common/features/complex_feature_unittest.cc', - 'common/features/simple_feature_unittest.cc', - 'common/file_util_unittest.cc', - 'common/image_util_unittest.cc', - 'common/manifest_handler_unittest.cc', - 'common/manifest_handlers/content_capabilities_manifest_unittest.cc', - 'common/manifest_handlers/default_locale_manifest_unittest.cc', - 'common/manifest_handlers/externally_connectable_unittest.cc', - 'common/manifest_handlers/file_handler_manifest_unittest.cc', - 'common/manifest_handlers/oauth2_manifest_unittest.cc', - 'common/manifest_handlers/shared_module_manifest_unittest.cc', - 'common/message_bundle_unittest.cc', - 'common/one_shot_event_unittest.cc', - 'common/permissions/api_permission_set_unittest.cc', - 'common/permissions/manifest_permission_set_unittest.cc', - 'common/permissions/socket_permission_unittest.cc', - 'common/permissions/usb_device_permission_unittest.cc', - 'common/stack_frame_unittest.cc', - 'common/url_pattern_set_unittest.cc', - 'common/url_pattern_unittest.cc', - 'common/user_script_unittest.cc', - 'renderer/activity_log_converter_strategy_unittest.cc', - 'renderer/api/mojo_private/mojo_private_unittest.cc', - 'renderer/api/serial/data_receiver_unittest.cc', - 'renderer/api/serial/data_sender_unittest.cc', - 'renderer/api/serial/serial_api_unittest.cc', - 'renderer/api_test_base.cc', - 'renderer/api_test_base.h', - 'renderer/api_test_base_unittest.cc', - 'renderer/event_unittest.cc', - 'renderer/json_schema_unittest.cc', - 'renderer/mojo/keep_alive_client_unittest.cc', - 'renderer/messaging_utils_unittest.cc', - 'renderer/module_system_test.cc', - 'renderer/module_system_test.h', - 'renderer/module_system_unittest.cc', - 'renderer/safe_builtins_unittest.cc', - 'renderer/script_context_set_unittest.cc', - 'renderer/script_context_unittest.cc', - 'renderer/utils_unittest.cc', - 'test/extensions_unittests_main.cc', - 'utility/unpacker_unittest.cc', - ], - # Disable c4267 warnings until we fix size_t to int truncations. - 'msvs_disabled_warnings': [ 4267, ], - 'conditions': [ - ['OS=="win" and win_use_allocator_shim==1', { - 'dependencies': [ - '../base/allocator/allocator.gyp:allocator', - ], - }], - ], - }, ] } diff --git a/extensions/extensions_tests.gyp b/extensions/extensions_tests.gyp new file mode 100644 index 0000000..aa5ad0e --- /dev/null +++ b/extensions/extensions_tests.gyp @@ -0,0 +1,233 @@ +{ + 'variables': { + # Product name is used for Mac bundle. + 'app_shell_product_name': 'App Shell', + # The version is high enough to be supported by Omaha (at least 31) + # but fake enough to be obviously not a Chrome release. + 'app_shell_version': '38.1234.5678.9', + 'chromium_code': 1, + }, + 'targets': [ + { + 'target_name': 'extensions_unittests', + 'type': 'executable', + 'dependencies': [ + '../base/base.gyp:base', + '../base/base.gyp:test_support_base', + '../components/components.gyp:keyed_service_content', + '../components/components.gyp:user_prefs', + '../content/content_shell_and_tests.gyp:test_support_content', + '../device/bluetooth/bluetooth.gyp:device_bluetooth_mocks', + '../device/serial/serial.gyp:device_serial', + '../device/serial/serial.gyp:device_serial_test_util', + '../mojo/mojo_base.gyp:mojo_environment_chromium', + '../testing/gmock.gyp:gmock', + '../testing/gtest.gyp:gtest', + '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase', + '../third_party/mojo/mojo_edk.gyp:mojo_js_lib', + '../third_party/mojo/mojo_edk.gyp:mojo_system_impl', + '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings', + 'common/api/api.gyp:cast_channel_proto', + 'extensions.gyp:extensions_common', + 'extensions.gyp:extensions_renderer', + 'extensions.gyp:extensions_shell_and_test_pak', + 'extensions.gyp:extensions_test_support', + 'extensions.gyp:extensions_utility', + 'extensions_resources.gyp:extensions_resources', + 'extensions_strings.gyp:extensions_strings', + ], + # Needed for third_party libraries like leveldb. + 'include_dirs': [ + '..', + ], + 'sources': [ + 'browser/api/api_resource_manager_unittest.cc', + 'browser/api/bluetooth/bluetooth_event_router_unittest.cc', + 'browser/api/cast_channel/cast_auth_ica_unittest.cc', + 'browser/api/cast_channel/cast_auth_util_unittest.cc', + 'browser/api/cast_channel/cast_channel_api_unittest.cc', + 'browser/api/cast_channel/cast_framer_unittest.cc', + 'browser/api/cast_channel/cast_socket_unittest.cc', + 'browser/api/cast_channel/cast_transport_unittest.cc', + 'browser/api/cast_channel/keep_alive_delegate_unittest.cc', + 'browser/api/cast_channel/logger_unittest.cc', + 'browser/api/cast_channel/test_util.cc', + 'browser/api/cast_channel/test_util.h', + 'browser/api/declarative/declarative_rule_unittest.cc', + 'browser/api/declarative/deduping_factory_unittest.cc', + 'browser/api/declarative/rules_registry_unittest.cc', + 'browser/api/declarative_webrequest/webrequest_condition_unittest.cc', + 'browser/api/declarative_webrequest/webrequest_condition_attribute_unittest.cc', + 'browser/api/idle/idle_api_unittest.cc', + 'browser/api/power/power_api_unittest.cc', + 'browser/api/sockets_tcp/sockets_tcp_api_unittest.cc', + 'browser/api/sockets_udp/sockets_udp_api_unittest.cc', + 'browser/api/storage/settings_quota_unittest.cc', + 'browser/api/storage/storage_api_unittest.cc', + 'browser/api/storage/storage_frontend_unittest.cc', + 'browser/api/web_request/form_data_parser_unittest.cc', + 'browser/api/web_request/upload_data_presenter_unittest.cc', + 'browser/api/web_request/web_request_time_tracker_unittest.cc', + 'browser/app_window/app_window_geometry_cache_unittest.cc', + 'browser/computed_hashes_unittest.cc', + 'browser/content_hash_tree_unittest.cc', + 'browser/event_listener_map_unittest.cc', + 'browser/event_router_unittest.cc', + 'browser/error_map_unittest.cc', + 'browser/extension_icon_image_unittest.cc', + 'browser/extension_pref_value_map_unittest.cc', + 'browser/extension_registry_unittest.cc', + 'browser/file_highlighter_unittest.cc', + 'browser/file_reader_unittest.cc', + 'browser/guest_view/guest_view_manager_unittest.cc', + 'browser/image_loader_unittest.cc', + 'browser/info_map_unittest.cc', + 'browser/lazy_background_task_queue_unittest.cc', + 'browser/management_policy_unittest.cc', + 'browser/mojo/keep_alive_impl_unittest.cc', + 'browser/mojo/stash_backend_unittest.cc', + 'browser/process_manager_unittest.cc', + 'browser/process_map_unittest.cc', + 'browser/quota_service_unittest.cc', + 'browser/runtime_data_unittest.cc', + 'browser/value_store/leveldb_value_store_unittest.cc', + 'browser/value_store/testing_value_store_unittest.cc', + 'browser/value_store/value_store_change_unittest.cc', + 'browser/value_store/value_store_frontend_unittest.cc', + 'browser/value_store/value_store_unittest.cc', + 'browser/value_store/value_store_unittest.h', + 'browser/verified_contents_unittest.cc', + 'browser/warning_service_unittest.cc', + 'common/api/sockets/sockets_manifest_permission_unittest.cc', + 'common/csp_validator_unittest.cc', + 'common/event_filter_unittest.cc', + 'common/extension_l10n_util_unittest.cc', + 'common/extension_resource_unittest.cc', + 'common/extension_set_unittest.cc', + 'common/features/base_feature_provider_unittest.cc', + 'common/features/complex_feature_unittest.cc', + 'common/features/simple_feature_unittest.cc', + 'common/file_util_unittest.cc', + 'common/image_util_unittest.cc', + 'common/manifest_handler_unittest.cc', + 'common/manifest_handlers/content_capabilities_manifest_unittest.cc', + 'common/manifest_handlers/default_locale_manifest_unittest.cc', + 'common/manifest_handlers/externally_connectable_unittest.cc', + 'common/manifest_handlers/file_handler_manifest_unittest.cc', + 'common/manifest_handlers/oauth2_manifest_unittest.cc', + 'common/manifest_handlers/shared_module_manifest_unittest.cc', + 'common/message_bundle_unittest.cc', + 'common/one_shot_event_unittest.cc', + 'common/permissions/api_permission_set_unittest.cc', + 'common/permissions/manifest_permission_set_unittest.cc', + 'common/permissions/socket_permission_unittest.cc', + 'common/permissions/usb_device_permission_unittest.cc', + 'common/stack_frame_unittest.cc', + 'common/url_pattern_set_unittest.cc', + 'common/url_pattern_unittest.cc', + 'common/user_script_unittest.cc', + 'renderer/activity_log_converter_strategy_unittest.cc', + 'renderer/api/mojo_private/mojo_private_unittest.cc', + 'renderer/api/serial/data_receiver_unittest.cc', + 'renderer/api/serial/data_sender_unittest.cc', + 'renderer/api/serial/serial_api_unittest.cc', + 'renderer/api_test_base.cc', + 'renderer/api_test_base.h', + 'renderer/api_test_base_unittest.cc', + 'renderer/event_unittest.cc', + 'renderer/json_schema_unittest.cc', + 'renderer/mojo/keep_alive_client_unittest.cc', + 'renderer/messaging_utils_unittest.cc', + 'renderer/module_system_test.cc', + 'renderer/module_system_test.h', + 'renderer/module_system_unittest.cc', + 'renderer/safe_builtins_unittest.cc', + 'renderer/script_context_set_unittest.cc', + 'renderer/script_context_unittest.cc', + 'renderer/utils_unittest.cc', + 'test/extensions_unittests_main.cc', + 'utility/unpacker_unittest.cc', + ], + # Disable c4267 warnings until we fix size_t to int truncations. + 'msvs_disabled_warnings': [ 4267, ], + 'conditions': [ + ['OS=="win" and win_use_allocator_shim==1', { + 'dependencies': [ + '../base/allocator/allocator.gyp:allocator', + ], + }], + ], + }, + { + # GN version: //extensions:extensions_browsertests + 'target_name': 'extensions_browsertests', + 'type': '<(gtest_target_type)', + 'dependencies': [ + 'extensions.gyp:extensions_test_support', + 'shell/app_shell.gyp:app_shell_lib', + # TODO(yoz): find the right deps + '<(DEPTH)/base/base.gyp:test_support_base', + '<(DEPTH)/content/content.gyp:content_app_both', + '<(DEPTH)/content/content_shell_and_tests.gyp:content_browser_test_support', + '<(DEPTH)/content/content_shell_and_tests.gyp:test_support_content', + '<(DEPTH)/testing/gmock.gyp:gmock', + '<(DEPTH)/testing/gtest.gyp:gtest', + ], + 'defines': [ + 'HAS_OUT_OF_PROC_TEST_RUNNER', + ], + 'sources': [ + 'browser/api/audio/audio_apitest.cc', + 'browser/api/dns/dns_apitest.cc', + 'browser/api/hid/hid_apitest.cc', + 'browser/api/printer_provider/printer_provider_apitest.cc', + 'browser/api/socket/socket_apitest.cc', + 'browser/api/sockets_tcp/sockets_tcp_apitest.cc', + 'browser/api/sockets_tcp_server/sockets_tcp_server_apitest.cc', + 'browser/api/sockets_udp/sockets_udp_apitest.cc', + 'browser/api/system_cpu/system_cpu_apitest.cc', + 'browser/api/system_display/system_display_apitest.cc', + 'browser/api/system_memory/system_memory_apitest.cc', + 'browser/api/system_network/system_network_apitest.cc', + 'browser/api/system_storage/storage_api_test_util.cc', + 'browser/api/system_storage/storage_api_test_util.h', + 'browser/api/system_storage/system_storage_apitest.cc', + 'browser/api/system_storage/system_storage_eject_apitest.cc', + 'browser/api/usb/usb_apitest.cc', + 'browser/guest_view/app_view/app_view_apitest.cc', + 'browser/guest_view/web_view/web_view_apitest.h', + 'browser/guest_view/web_view/web_view_apitest.cc', + 'browser/guest_view/web_view/web_view_media_access_apitest.cc', + 'browser/updater/update_service_browsertest.cc', + 'shell/browser/geolocation/geolocation_apitest.cc', + 'shell/browser/shell_browsertest.cc', + 'shell/test/shell_apitest.cc', + 'shell/test/shell_apitest.h', + 'shell/test/shell_test.cc', + 'shell/test/shell_test.h', + 'shell/test/shell_test_launcher_delegate.cc', + 'shell/test/shell_test_launcher_delegate.h', + 'shell/test/shell_tests_main.cc', + ], + 'conditions': [ + ['OS=="win" and win_use_allocator_shim==1', { + 'dependencies': [ + '<(DEPTH)/base/allocator/allocator.gyp:allocator', + ], + }], + ['OS=="mac"', { + 'dependencies': [ + 'shell/app_shell.gyp:app_shell', # Needed for App Shell.app's Helper. + ], + }], + # This is only here to keep gyp happy. This target never builds on + # mobile platforms. + ['OS != "ios" and OS != "android"', { + 'dependencies': [ + '<(DEPTH)/components/components.gyp:storage_monitor_test_support', + ], + }], + ] + }, + ], +} diff --git a/extensions/shell/app_shell.gyp b/extensions/shell/app_shell.gyp index f8ef6ef..1666e43 100644 --- a/extensions/shell/app_shell.gyp +++ b/extensions/shell/app_shell.gyp @@ -289,74 +289,6 @@ }], ], }, - - { - 'target_name': 'app_shell_browsertests', - 'type': '<(gtest_target_type)', - 'dependencies': [ - 'app_shell_lib', - # TODO(yoz): find the right deps - '<(DEPTH)/base/base.gyp:test_support_base', - '<(DEPTH)/components/components.gyp:storage_monitor_test_support', - '<(DEPTH)/content/content.gyp:content_app_both', - '<(DEPTH)/content/content_shell_and_tests.gyp:content_browser_test_support', - '<(DEPTH)/content/content_shell_and_tests.gyp:test_support_content', - '<(DEPTH)/extensions/extensions.gyp:extensions_test_support', - '<(DEPTH)/testing/gmock.gyp:gmock', - '<(DEPTH)/testing/gtest.gyp:gtest', - ], - 'defines': [ - 'HAS_OUT_OF_PROC_TEST_RUNNER', - ], - 'sources': [ - # TODO(yoz): Refactor once we have a second test target. - # TODO(yoz): Something is off here; should this .gyp file be - # in the parent directory? Test target extensions_browsertests? - '../browser/api/audio/audio_apitest.cc', - '../browser/api/dns/dns_apitest.cc', - '../browser/api/hid/hid_apitest.cc', - '../browser/api/printer_provider/printer_provider_apitest.cc', - '../browser/api/socket/socket_apitest.cc', - '../browser/api/sockets_tcp/sockets_tcp_apitest.cc', - '../browser/api/sockets_tcp_server/sockets_tcp_server_apitest.cc', - '../browser/api/sockets_udp/sockets_udp_apitest.cc', - '../browser/api/system_cpu/system_cpu_apitest.cc', - '../browser/api/system_display/system_display_apitest.cc', - '../browser/api/system_memory/system_memory_apitest.cc', - '../browser/api/system_network/system_network_apitest.cc', - '../browser/api/system_storage/storage_api_test_util.cc', - '../browser/api/system_storage/storage_api_test_util.h', - '../browser/api/system_storage/system_storage_apitest.cc', - '../browser/api/system_storage/system_storage_eject_apitest.cc', - '../browser/api/usb/usb_apitest.cc', - '../browser/guest_view/app_view/app_view_apitest.cc', - '../browser/guest_view/web_view/web_view_apitest.h', - '../browser/guest_view/web_view/web_view_apitest.cc', - '../browser/guest_view/web_view/web_view_media_access_apitest.cc', - '../browser/updater/update_service_browsertest.cc', - 'browser/geolocation/geolocation_apitest.cc', - 'browser/shell_browsertest.cc', - 'test/shell_apitest.cc', - 'test/shell_apitest.h', - 'test/shell_test.cc', - 'test/shell_test.h', - 'test/shell_test_launcher_delegate.cc', - 'test/shell_test_launcher_delegate.h', - 'test/shell_tests_main.cc', - ], - 'conditions': [ - ['OS=="win" and win_use_allocator_shim==1', { - 'dependencies': [ - '<(DEPTH)/base/allocator/allocator.gyp:allocator', - ], - }], - ['OS=="mac"', { - 'dependencies': [ - 'app_shell', # Needed for App Shell.app's Helper. - ], - }], - ], - }, { 'target_name': 'app_shell_unittests', 'type': 'executable', diff --git a/extensions/shell/test/shell_test.cc b/extensions/shell/test/shell_test.cc index e18ffcf..183303a 100644 --- a/extensions/shell/test/shell_test.cc +++ b/extensions/shell/test/shell_test.cc @@ -21,7 +21,7 @@ AppShellTest::AppShellTest() : browser_context_(NULL), extension_system_(NULL) { #if defined(OS_MACOSX) // TODO(phajdan.jr): Make browser tests self-contained on Mac; remove this. // Set up the application path as though we we are inside the App Shell.app - // bundle, rather than the top-level app_shell_browsertests, because we + // bundle, rather than the top-level extensions_browsertests, because we // make many assumptions about where the executable is located. base::FilePath app_shell_path; CHECK(PathService::Get(base::FILE_EXE, &app_shell_path)); diff --git a/extensions/test/data/system/cpu/test_cpu_api.js b/extensions/test/data/system/cpu/test_cpu_api.js index c1e1327..746b46e 100644 --- a/extensions/test/data/system/cpu/test_cpu_api.js +++ b/extensions/test/data/system/cpu/test_cpu_api.js @@ -3,7 +3,7 @@ // found in the LICENSE file. // system.cpu.getInfo api test -// app_shell_browsertests --gtest_filter=SystemCpuApiTest.* +// extensions_browsertests --gtest_filter=SystemCpuApiTest.* chrome.test.runTests([ function testGet() { diff --git a/extensions/test/data/system/display/test_display_api.js b/extensions/test/data/system/display/test_display_api.js index c55c2c1..9018610 100644 --- a/extensions/test/data/system/display/test_display_api.js +++ b/extensions/test/data/system/display/test_display_api.js @@ -3,7 +3,7 @@ // found in the LICENSE file. // system.display api test -// app_shell_browsertests --gtest_filter=SystemDisplayApiTest.* +// extensions_browsertests --gtest_filter=SystemDisplayApiTest.* chrome.test.runTests([ function testGet() { diff --git a/extensions/test/data/system/memory/test_memory_api.js b/extensions/test/data/system/memory/test_memory_api.js index c828bede..6e15377 100644 --- a/extensions/test/data/system/memory/test_memory_api.js +++ b/extensions/test/data/system/memory/test_memory_api.js @@ -3,7 +3,7 @@ // found in the LICENSE file. // system.memory api test -// app_shell_browsertests --gtest_filter=SystemMemoryApiTest.* +// extensions_browsertests --gtest_filter=SystemMemoryApiTest.* chrome.test.runTests([ function testGet() { diff --git a/extensions/test/data/system/storage/test_storage_api.js b/extensions/test/data/system/storage/test_storage_api.js index 7f42e97..490b3f5 100644 --- a/extensions/test/data/system/storage/test_storage_api.js +++ b/extensions/test/data/system/storage/test_storage_api.js @@ -3,7 +3,7 @@ // found in the LICENSE file. // system.storage api test -// app_shell_browsertests --gtest_filter=SystemStorageApiTest.Storage +// extensions_browsertests --gtest_filter=SystemStorageApiTest.Storage // Testing data should be the same as |kTestingData| in // system_storage_apitest.cc. diff --git a/extensions/test/data/system/storage_attachment/test_storage_api.js b/extensions/test/data/system/storage_attachment/test_storage_api.js index c759766..e450493 100644 --- a/extensions/test/data/system/storage_attachment/test_storage_api.js +++ b/extensions/test/data/system/storage_attachment/test_storage_api.js @@ -3,7 +3,7 @@ // found in the LICENSE file. // system.storage api test -// app_shell_browsertests --gtest_filter=SystemStorageApiTest.Storage +// extensions_browsertests --gtest_filter=SystemStorageApiTest.Storage // Testing data should be the same as |kRemovableStorageData| in // test_storage_info_provider.cc. diff --git a/testing/buildbot/chromium.chromiumos.json b/testing/buildbot/chromium.chromiumos.json index 7d2f975..4ed436c 100644 --- a/testing/buildbot/chromium.chromiumos.json +++ b/testing/buildbot/chromium.chromiumos.json @@ -86,9 +86,9 @@ }, "sql_unittests", "nacl_loader_unittests", - "app_shell_browsertests", "app_shell_unittests", "chromevox_tests", + "extensions_browsertests", "skia_unittests" ] }, @@ -96,7 +96,6 @@ "gtest_tests": [ "accessibility_unittests", "app_list_unittests", - "app_shell_browsertests", "app_shell_unittests", "ash_unittests", "aura_unittests", @@ -118,6 +117,7 @@ "device_unittests", "display_unittests", "events_unittests", + "extensions_browsertests", "extensions_unittests", "gcm_unit_tests", "google_apis_unittests", @@ -239,7 +239,6 @@ "shards": 10 } }, - "app_shell_browsertests", "app_shell_unittests", { "test": "content_browsertests", @@ -248,6 +247,7 @@ "shards": 2 } }, + "extensions_browsertests", "gcm_unit_tests", "skia_unittests", { diff --git a/testing/buildbot/chromium.linux.json b/testing/buildbot/chromium.linux.json index 7c71066..1efe19b 100644 --- a/testing/buildbot/chromium.linux.json +++ b/testing/buildbot/chromium.linux.json @@ -13,7 +13,6 @@ "can_use_on_swarming_builders": true } }, - "app_shell_browsertests", "app_shell_unittests", "aura_unittests", { @@ -62,6 +61,7 @@ "can_use_on_swarming_builders": true } }, + "extensions_browsertests", "extensions_unittests", "gcm_unit_tests", { @@ -181,7 +181,6 @@ "can_use_on_swarming_builders": true } }, - "app_shell_browsertests", "app_shell_unittests", "aura_unittests", { @@ -230,6 +229,7 @@ "can_use_on_swarming_builders": true } }, + "extensions_browsertests", "extensions_unittests", "gcm_unit_tests", { @@ -329,7 +329,6 @@ "can_use_on_swarming_builders": true } }, - "app_shell_browsertests", "app_shell_unittests", "aura_unittests", { @@ -378,6 +377,7 @@ "can_use_on_swarming_builders": true } }, + "extensions_browsertests", "extensions_unittests", "gcm_unit_tests", { diff --git a/testing/buildbot/chromium.memory.fyi.json b/testing/buildbot/chromium.memory.fyi.json index 04b74f6..7244be8 100644 --- a/testing/buildbot/chromium.memory.fyi.json +++ b/testing/buildbot/chromium.memory.fyi.json @@ -3,7 +3,6 @@ "gtest_tests": [ "accessibility_unittests", "app_list_unittests", - "app_shell_browsertests", "aura_unittests", "base_unittests", "cacheinvalidation_unittests", @@ -18,6 +17,7 @@ "device_unittests", "display_unittests", "events_unittests", + "extensions_browsertests", "extensions_unittests", "gcm_unit_tests", "gfx_unittests", @@ -70,7 +70,6 @@ "gtest_tests": [ "accessibility_unittests", "app_list_unittests", - "app_shell_browsertests", "aura_unittests", "base_unittests", "cacheinvalidation_unittests", @@ -85,6 +84,7 @@ "device_unittests", "display_unittests", "events_unittests", + "extensions_browsertests", "extensions_unittests", "gcm_unit_tests", "gfx_unittests", diff --git a/testing/buildbot/chromium.memory.json b/testing/buildbot/chromium.memory.json index 168f3a3..f1e3c95 100644 --- a/testing/buildbot/chromium.memory.json +++ b/testing/buildbot/chromium.memory.json @@ -2,7 +2,7 @@ "Linux ASan LSan Tests (1)": { "gtest_tests": [ "accessibility_unittests", - "app_shell_browsertests", + "extensions_browsertests", { "test": "base_unittests", "swarming": { diff --git a/testing/buildbot/chromium.webkit.json b/testing/buildbot/chromium.webkit.json index 475f4ec..d34d31e 100644 --- a/testing/buildbot/chromium.webkit.json +++ b/testing/buildbot/chromium.webkit.json @@ -83,9 +83,9 @@ }, "sql_unittests", "nacl_loader_unittests", - "app_shell_browsertests", "app_shell_unittests", "chromevox_tests", + "extensions_browsertests", "skia_unittests" ] }, @@ -163,7 +163,6 @@ "shards": 20 } }, - "app_shell_browsertests", "app_shell_unittests", { "test": "content_browsertests", @@ -172,6 +171,7 @@ "shards": 2 } }, + "extensions_browsertests", "gcm_unit_tests", "skia_unittests", { diff --git a/testing/buildbot/chromium.win.json b/testing/buildbot/chromium.win.json index 7951682..c6c87b5 100644 --- a/testing/buildbot/chromium.win.json +++ b/testing/buildbot/chromium.win.json @@ -8,7 +8,6 @@ "can_use_on_swarming_builders": true } }, - "app_shell_browsertests", "app_shell_unittests", "aura_unittests", { @@ -50,6 +49,7 @@ }, "crypto_unittests", "events_unittests", + "extensions_browsertests", "extensions_unittests", "gcm_unit_tests", "gfx_unittests", @@ -127,7 +127,6 @@ "Vista Tests (1)": { "gtest_tests": [ "accessibility_unittests", - "app_shell_browsertests", "app_shell_unittests", "aura_unittests", { @@ -174,6 +173,7 @@ } }, "crypto_unittests", + "extensions_browsertests", "extensions_unittests", "events_unittests", "gcm_unit_tests", @@ -262,7 +262,6 @@ "can_use_on_swarming_builders": true } }, - "app_shell_browsertests", "app_shell_unittests", "aura_unittests", { @@ -312,6 +311,7 @@ "crypto_unittests", "device_unittests", "events_unittests", + "extensions_browsertests", "extensions_unittests", "gcm_unit_tests", "gfx_unittests", @@ -412,7 +412,6 @@ }, "app_installer_unittests", "app_list_unittests", - "app_shell_browsertests", "app_shell_unittests", { "test": "ash_unittests", @@ -455,6 +454,7 @@ "crypto_unittests", "device_unittests", "events_unittests", + "extensions_browsertests", "extensions_unittests", "gcm_unit_tests", "gfx_unittests", @@ -546,7 +546,6 @@ "can_use_on_swarming_builders": true } }, - "app_shell_browsertests", "app_shell_unittests", "aura_unittests", { @@ -595,6 +594,7 @@ }, "crypto_unittests", "events_unittests", + "extensions_browsertests", "extensions_unittests", "gcm_unit_tests", { diff --git a/testing/buildbot/chromium_trybot.json b/testing/buildbot/chromium_trybot.json index 391531e..df5a156 100644 --- a/testing/buildbot/chromium_trybot.json +++ b/testing/buildbot/chromium_trybot.json @@ -233,7 +233,7 @@ "platforms": ["linux", "win"] }, { - "test": "app_shell_browsertests", + "test": "extensions_browsertests", "platforms": ["linux", "win"] }, { |