Skip to content

GitLab

T
tangled
Commit dc1e618a authored by brettw's avatar brettw Committed by Commit bot
Browse files
Options

Remove extensions_tests.gyp[i] 

Inlines sources into the GN build files. This creates smaller helper "unit_tests" and "browser_tests" targets for the various subdirectories to keep the file lists closer to the code.

Adds the wifi display unit tests which were missing from the GN build (these are not compiled by default, only when you explicitly pass a flag).

Adds the new targets to GN check and adds additional dependencies to make this check pass.

Review-Url: https://codereview.chromium.org/2281053004
Cr-Commit-Position: refs/heads/master@{#415419}
parent 5cdf5844
Show whitespace changes
Inline Side-by-side
Showing with 380 additions and 435 deletions
.gn
View file @ dc1e618a
...@@ -47,6 +47,14 @@ check_targets = [ ...@@ -47,6 +47,14 @@ check_targets = [
"//device/*", "//device/*",
#"//extensions/*", # Lots of errors. #"//extensions/*", # Lots of errors.
"//extensions:extensions_unittests",
"//extensions/browser:browser_tests",
"//extensions/browser:unit_tests",
"//extensions/common:unit_tests",
"//extensions/renderer:unit_tests",
"//extensions/shell:browser_tests",
"//extensions/shell:unit_tests",
"//extensions/utility:unit_tests",
"//gin/*", "//gin/*",
"//google_apis/*", "//google_apis/*",
"//google_update/*", "//google_update/*",
......
device/serial/BUILD.gn
View file @ dc1e618a
...@@ -91,7 +91,7 @@ static_library("test_support") { ...@@ -91,7 +91,7 @@ static_library("test_support") {
"test_serial_io_handler.h", "test_serial_io_handler.h",
] ]
deps = [ public_deps = [
":serial", ":serial",
] ]
} }
......
extensions/BUILD.gn
View file @ dc1e618a
# Copyright 2014 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be # Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file. # found in the LICENSE file.
...@@ -12,7 +11,6 @@ import("//tools/grit/repack.gni") ...@@ -12,7 +11,6 @@ import("//tools/grit/repack.gni")
assert(enable_extensions) assert(enable_extensions)
# GYP version: extensions/extensions_resources.gyp:extensions_resources
group("extensions_resources") { group("extensions_resources") {
public_deps = [ public_deps = [
":extensions_browser_resources", ":extensions_browser_resources",
...@@ -21,8 +19,6 @@ group("extensions_resources") { ...@@ -21,8 +19,6 @@ group("extensions_resources") {
] ]
} }
# GYP version: extensions/extensions_resources.gyp:extensions_resources
# (extensions_resources action)
grit("extensions_resources_grd") { grit("extensions_resources_grd") {
source = "extensions_resources.grd" source = "extensions_resources.grd"
outputs = [ outputs = [
...@@ -31,8 +27,6 @@ grit("extensions_resources_grd") { ...@@ -31,8 +27,6 @@ grit("extensions_resources_grd") {
] ]
} }
# GYP version: extensions/extensions_resources.gyp:extensions_resources
# (extensions_browser_resources action)
grit("extensions_browser_resources") { grit("extensions_browser_resources") {
source = "browser/resources/extensions_browser_resources.grd" source = "browser/resources/extensions_browser_resources.grd"
outputs = [ outputs = [
...@@ -48,8 +42,6 @@ grit("extensions_browser_resources") { ...@@ -48,8 +42,6 @@ grit("extensions_browser_resources") {
] ]
} }
# GYP version: extensions/extensions_resources.gyp:extensions_resources
# (extensions_renderer_resources action)
grit("extensions_renderer_resources") { grit("extensions_renderer_resources") {
source = "renderer/resources/extensions_renderer_resources.grd" source = "renderer/resources/extensions_renderer_resources.grd"
outputs = [ outputs = [
...@@ -104,7 +96,6 @@ static_library("test_support") { ...@@ -104,7 +96,6 @@ static_library("test_support") {
] ]
} }
# GYP version: //extensions/extensions.gyp:extensions_shell_and_test_pak
repack("shell_and_test_pak") { repack("shell_and_test_pak") {
sources = [ sources = [
"$root_gen_dir/blink/devtools_resources.pak", "$root_gen_dir/blink/devtools_resources.pak",
...@@ -141,19 +132,10 @@ repack("shell_and_test_pak") { ...@@ -141,19 +132,10 @@ repack("shell_and_test_pak") {
} }
test("extensions_unittests") { test("extensions_unittests") {
sources = sources = [
rebase_path(extensions_tests_gypi_values.extensions_unittests_sources, "test/extensions_unittests_main.cc",
".",
"//extensions")
sources += [
# TODO(rockot): DisplayInfoProvider::Create() is only implemented in Chrome
# and app_shell. This is wrong.
"shell/browser/shell_display_info_provider.cc",
] ]
configs += [ "//build/config:precompiled_headers" ]
data = [ data = [
"test/data/", "test/data/",
"//chrome/test/data/extensions/", "//chrome/test/data/extensions/",
...@@ -166,57 +148,28 @@ test("extensions_unittests") { ...@@ -166,57 +148,28 @@ test("extensions_unittests") {
":extensions_resources", ":extensions_resources",
":shell_and_test_pak", ":shell_and_test_pak",
":test_support", ":test_support",
"//base",
"//base/test:test_support", "//base/test:test_support",
"//components/keyed_service/content", "//content/public/common",
"//components/pref_registry:test_support",
"//components/prefs:test_support",
"//components/user_prefs",
"//content/test:test_support", "//content/test:test_support",
"//device/bluetooth:mocks", "//extensions/browser:unit_tests",
"//device/core",
"//device/hid",
"//device/serial",
"//device/serial:test_support",
"//extensions/common", "//extensions/common",
"//extensions/common/api/cast_channel:cast_channel_proto", "//extensions/common:unit_tests",
"//extensions/renderer", "//extensions/renderer:unit_tests",
"//extensions/strings", "//extensions/shell:unit_tests",
"//extensions/utility", "//extensions/utility:unit_tests",
"//mojo/edk/js",
"//mojo/edk/system", "//mojo/edk/system",
"//mojo/public/cpp/bindings", "//mojo/edk/test:test_support",
"//services/shell/public/interfaces", "//ui/gl:test_support",
"//testing/gmock",
"//testing/gtest",
"//third_party/leveldatabase",
] ]
data_deps = [ data_deps = [
"//third_party/mesa:osmesa", "//third_party/mesa:osmesa",
] ]
if (is_chromeos) {
sources += [
"browser/api/webcam_private/visca_webcam_unittest.cc",
# TODO(rockot): There are two implementations of VpnServiceFactory, a
# stub in app_shell and a real one in Chrome. This is wrong.
"shell/browser/api/vpn_provider/vpn_service_factory.cc",
]
deps += [ "//chromeos:test_support" ]
}
} }
test("extensions_browsertests") { test("extensions_browsertests") {
sources =
rebase_path(extensions_tests_gypi_values.extensions_browsertests_sources,
".",
"//extensions")
data = [ data = [
"test/data/", "//extensions/test/data/",
"//net/tools/testserver/", "//net/tools/testserver/",
"//third_party/pyftpdlib/", "//third_party/pyftpdlib/",
"//third_party/pywebsocket/", "//third_party/pywebsocket/",
...@@ -224,36 +177,14 @@ test("extensions_browsertests") { ...@@ -224,36 +177,14 @@ test("extensions_browsertests") {
"$root_out_dir/extensions_shell_and_test.pak", "$root_out_dir/extensions_shell_and_test.pak",
] ]
defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
deps = [ deps = [
":test_support", "//extensions/browser:browser_tests",
"shell:app_shell_lib", "//extensions/shell:browser_tests",
# TODO(yoz): find the right deps
"//base",
"//base/test:test_support",
"//components/prefs:test_support",
"//components/storage_monitor:test_support",
"//content/test:test_support",
"//device/bluetooth:mocks",
"//device/core:mocks",
"//device/hid:mocks",
"//device/usb:test_support",
"//mojo/edk/js",
"//mojo/public/cpp/bindings",
"//net:test_support",
"//testing/gmock",
"//testing/gtest",
] ]
data_deps = [ data_deps = [
"//third_party/mesa:osmesa", "//third_party/mesa:osmesa",
] ]
if (is_mac) {
deps += [ "shell:app_shell" ] # Needed for App Shell.app's Helper.
}
} }
# TODO(rockot) bug 505926: These should be moved to extensions_browsertests but have # TODO(rockot) bug 505926: These should be moved to extensions_browsertests but have
......
extensions/browser/BUILD.gn
View file @ dc1e618a
...@@ -65,6 +65,7 @@ source_set("browser") { ...@@ -65,6 +65,7 @@ source_set("browser") {
"//device/power_save_blocker", "//device/power_save_blocker",
"//device/serial", "//device/serial",
"//device/usb", "//device/usb",
"//extensions:extensions_browser_resources",
"//extensions/common/api/cast_channel:cast_channel_proto", "//extensions/common/api/cast_channel:cast_channel_proto",
] ]
...@@ -115,3 +116,168 @@ source_set("browser") { ...@@ -115,3 +116,168 @@ source_set("browser") {
} }
} }
} }
source_set("browser_tests") {
testonly = true
sources = [
"api/audio/audio_apitest.cc",
"api/bluetooth_socket/bluetooth_socket_apitest.cc",
"api/display_source/display_source_apitest.cc",
"api/display_source/display_source_apitestbase.cc",
"api/display_source/display_source_apitestbase.h",
"api/dns/dns_apitest.cc",
"api/hid/hid_apitest.cc",
"api/printer_provider/printer_provider_apitest.cc",
"api/socket/socket_apitest.cc",
"api/sockets_tcp/sockets_tcp_apitest.cc",
"api/sockets_tcp_server/sockets_tcp_server_apitest.cc",
"api/sockets_udp/sockets_udp_apitest.cc",
"api/system_cpu/system_cpu_apitest.cc",
"api/system_display/system_display_apitest.cc",
"api/system_memory/system_memory_apitest.cc",
"api/system_network/system_network_apitest.cc",
"api/system_storage/storage_api_test_util.cc",
"api/system_storage/storage_api_test_util.h",
"api/system_storage/system_storage_apitest.cc",
"api/system_storage/system_storage_eject_apitest.cc",
"api/usb/usb_apitest.cc",
"guest_view/app_view/app_view_apitest.cc",
"guest_view/web_view/web_view_apitest.cc",
"guest_view/web_view/web_view_apitest.h",
"guest_view/web_view/web_view_media_access_apitest.cc",
]
defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
deps = [
":browser",
"//base",
"//components/guest_view/browser:test_support",
"//components/storage_monitor:test_support",
"//content/test:test_support",
"//device/bluetooth:mocks",
"//device/core:mocks",
"//device/hid:mocks",
"//device/usb:test_support",
"//extensions:test_support",
"//extensions/common",
"//extensions/common/api",
"//extensions/shell:app_shell_lib",
"//extensions/shell:browser_tests",
"//net:test_support",
]
if (is_mac) {
# Needed for App Shell.app's Helper.
deps += [ "//extensions/shell:app_shell" ]
}
if (is_chromeos) {
deps += [ "//chromeos" ]
}
}
source_set("unit_tests") {
testonly = true
sources = [
"api/alarms/alarms_api_unittest.cc",
"api/api_resource_manager_unittest.cc",
"api/bluetooth/bluetooth_event_router_unittest.cc",
"api/cast_channel/cast_auth_util_unittest.cc",
"api/cast_channel/cast_channel_api_unittest.cc",
"api/cast_channel/cast_framer_unittest.cc",
"api/cast_channel/cast_socket_unittest.cc",
"api/cast_channel/cast_transport_unittest.cc",
"api/cast_channel/keep_alive_delegate_unittest.cc",
"api/cast_channel/logger_unittest.cc",
"api/declarative/declarative_rule_unittest.cc",
"api/declarative/deduping_factory_unittest.cc",
"api/declarative/rules_registry_unittest.cc",
"api/declarative_webrequest/webrequest_condition_attribute_unittest.cc",
"api/declarative_webrequest/webrequest_condition_unittest.cc",
"api/device_permissions_prompt_unittest.cc",
"api/document_scan/document_scan_api_unittest.cc",
"api/document_scan/document_scan_interface_chromeos_unittest.cc",
"api/document_scan/mock_document_scan_interface.cc",
"api/idle/idle_api_unittest.cc",
"api/mime_handler_private/mime_handler_private_unittest.cc",
"api/networking_config/networking_config_service_chromeos_unittest.cc",
"api/power/power_api_unittest.cc",
"api/runtime/restart_after_delay_api_unittest.cc",
"api/sockets_tcp/sockets_tcp_api_unittest.cc",
"api/sockets_udp/sockets_udp_api_unittest.cc",
"api/storage/settings_quota_unittest.cc",
"api/storage/storage_api_unittest.cc",
"api/storage/storage_frontend_unittest.cc",
"api/web_request/form_data_parser_unittest.cc",
"api/web_request/upload_data_presenter_unittest.cc",
"api/web_request/web_request_time_tracker_unittest.cc",
"app_window/app_window_geometry_cache_unittest.cc",
"computed_hashes_unittest.cc",
"content_hash_tree_unittest.cc",
"error_map_unittest.cc",
"event_listener_map_unittest.cc",
"event_router_unittest.cc",
"extension_api_frame_id_map_unittest.cc",
"extension_icon_image_unittest.cc",
"extension_pref_value_map_unittest.cc",
"extension_registry_unittest.cc",
"extension_throttle_simulation_unittest.cc",
"extension_throttle_test_support.cc",
"extension_throttle_test_support.h",
"extension_throttle_unittest.cc",
"file_highlighter_unittest.cc",
"file_reader_unittest.cc",
"image_loader_unittest.cc",
"info_map_unittest.cc",
"lazy_background_task_queue_unittest.cc",
"load_monitoring_extension_host_queue_unittest.cc",
"management_policy_unittest.cc",
"mojo/keep_alive_impl_unittest.cc",
"mojo/stash_backend_unittest.cc",
"process_manager_unittest.cc",
"process_map_unittest.cc",
"quota_service_unittest.cc",
"runtime_data_unittest.cc",
"sandboxed_unpacker_unittest.cc",
"updater/update_service_unittest.cc",
"value_store/leveldb_scoped_database_unittest.cc",
"value_store/leveldb_value_store_unittest.cc",
"value_store/testing_value_store_unittest.cc",
"value_store/value_store_change_unittest.cc",
"value_store/value_store_frontend_unittest.cc",
"value_store/value_store_unittest.cc",
"value_store/value_store_unittest.h",
"verified_contents_unittest.cc",
"warning_service_unittest.cc",
]
deps = [
":browser",
"//base",
"//base/test:test_support",
"//components/cast_certificate:test_support",
"//components/crx_file",
"//components/keyed_service/content",
"//components/pref_registry:test_support",
"//components/prefs:test_support",
"//components/update_client",
"//components/url_matcher",
"//components/user_prefs",
"//content/test:test_support",
"//device/bluetooth:mocks",
"//device/power_save_blocker",
"//extensions:extensions_browser_resources",
"//extensions:test_support",
"//extensions/common",
"//extensions/common/api",
"//ipc:test_support",
"//net:test_support",
"//third_party/leveldatabase",
"//third_party/zlib:zip",
]
if (is_chromeos) {
sources += [ "api/webcam_private/visca_webcam_unittest.cc" ]
deps += [ "//chromeos:test_support" ]
}
}
extensions/common/BUILD.gn
View file @ dc1e618a
...@@ -6,7 +6,6 @@ import("//build/config/features.gni") ...@@ -6,7 +6,6 @@ import("//build/config/features.gni")
import("//extensions/extensions.gni") import("//extensions/extensions.gni")
import("//mojo/public/tools/bindings/mojom.gni") import("//mojo/public/tools/bindings/mojom.gni")
# GYP version: extensions/extensions.gyp:extensions_common_constants
source_set("common_constants") { source_set("common_constants") {
sources = sources =
rebase_path(extensions_gypi_values.extensions_common_constants_sources, rebase_path(extensions_gypi_values.extensions_common_constants_sources,
...@@ -55,6 +54,8 @@ if (enable_extensions) { ...@@ -55,6 +54,8 @@ if (enable_extensions) {
] ]
deps = [ deps = [
"//base",
# TODO(benwells): figure out what to do with the api target and # TODO(benwells): figure out what to do with the api target and
# api resources compiled into the chrome resource bundle. # api resources compiled into the chrome resource bundle.
# http://crbug.com/162530 # http://crbug.com/162530
...@@ -90,4 +91,67 @@ if (enable_extensions) { ...@@ -90,4 +91,67 @@ if (enable_extensions) {
sources += nacl_sources sources += nacl_sources
} }
} }
source_set("unit_tests") {
testonly = true
sources = [
"api/declarative/declarative_manifest_unittest.cc",
"api/printer_provider/usb_printer_manifest_unittest.cc",
"api/sockets/sockets_manifest_permission_unittest.cc",
"csp_validator_unittest.cc",
"event_filter_unittest.cc",
"extension_l10n_util_unittest.cc",
"extension_messages_unittest.cc",
"extension_resource_unittest.cc",
"extension_set_unittest.cc",
"features/base_feature_provider_unittest.cc",
"features/complex_feature_unittest.cc",
"features/simple_feature_unittest.cc",
"file_util_unittest.cc",
"image_util_unittest.cc",
"manifest_handler_unittest.cc",
"manifest_handlers/content_capabilities_manifest_unittest.cc",
"manifest_handlers/default_locale_manifest_unittest.cc",
"manifest_handlers/externally_connectable_unittest.cc",
"manifest_handlers/file_handler_manifest_unittest.cc",
"manifest_handlers/icons_handler_unittest.cc",
"manifest_handlers/incognito_manifest_unittest.cc",
"manifest_handlers/kiosk_mode_info_unittest.cc",
"manifest_handlers/oauth2_manifest_unittest.cc",
"manifest_handlers/shared_module_manifest_unittest.cc",
"message_bundle_unittest.cc",
"one_shot_event_unittest.cc",
"permissions/api_permission_set_unittest.cc",
"permissions/manifest_permission_set_unittest.cc",
"permissions/socket_permission_unittest.cc",
"permissions/usb_device_permission_unittest.cc",
"stack_frame_unittest.cc",
"update_manifest_unittest.cc",
"url_pattern_set_unittest.cc",
"url_pattern_unittest.cc",
"user_script_unittest.cc",
"value_builder_unittest.cc",
]
deps = [
":common",
"//base",
"//base:i18n",
"//base/test:test_support",
"//components/crx_file",
"//device/usb",
"//extensions:extensions_resources",
# TODO(brettw) these tests should not be including headers from browser.
"//extensions:test_support",
"//extensions/browser",
"//extensions/strings",
"//ipc",
"//testing/gmock",
"//testing/gtest",
"//ui/base",
"//ui/gfx",
"//url",
]
}
} # enable_extensions } # enable_extensions
extensions/extensions.gni
View file @ dc1e618a
...@@ -14,12 +14,3 @@ extensions_gypi_values = ...@@ -14,12 +14,3 @@ extensions_gypi_values =
], ],
"scope", "scope",
[ "extensions.gypi" ]) [ "extensions.gypi" ])
extensions_tests_gypi_values =
exec_script("//build/gypi_to_gn.py",
[
rebase_path("extensions_tests.gypi"),
"--replace=<(SHARED_INTERMEDIATE_DIR)=$root_gen_dir",
],
"scope",
[ "extensions_tests.gypi" ])
extensions/extensions_tests.gyp deleted 100644 → 0
View file @ 5cdf5844
{
'includes': [
'extensions_tests.gypi',
],
'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:cast_certificate_test_support',
'../components/components.gyp:keyed_service_content',
'../components/components.gyp:pref_registry_test_support',
'../components/components.gyp:user_prefs',
'../content/content_shell_and_tests.gyp:test_support_content',
'../device/bluetooth/bluetooth.gyp:device_bluetooth_mocks',
'../device/core/core.gyp:device_core',
'../device/hid/hid.gyp:device_hid',
'../device/serial/serial.gyp:device_serial',
'../device/serial/serial.gyp:device_serial_test_util',
'../mojo/mojo_edk.gyp:mojo_js_lib',
'../mojo/mojo_edk.gyp:mojo_system_impl',
'../mojo/mojo_public.gyp:mojo_cpp_bindings',
'../services/shell/shell_public.gyp:shell_public',
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
'../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
'common/api/api.gyp:cast_channel_proto',
'extensions.gyp:extensions_browser',
'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': [
'<@(extensions_unittests_sources)',
],
# Disable c4267 warnings until we fix size_t to int truncations.
'msvs_disabled_warnings': [ 4267, ],
'conditions': [
['chromeos==1', {
'dependencies': [
'<(DEPTH)/chromeos/chromeos.gyp:chromeos_test_support',
],
'sources': [
'browser/api/webcam_private/visca_webcam_unittest.cc',
],
}],
['proprietary_codecs==1 and enable_wifi_display==1', {
'sources': [
'<@(extensions_unittests_sources_wifi_display)',
],
}],
],
},
{
# 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)/components/components.gyp:guest_view_browser',
'<(DEPTH)/components/components.gyp:guest_view_renderer',
'<(DEPTH)/components/components.gyp:guest_view_test_support',
'<(DEPTH)/content/content.gyp:content_app_both',
'<(DEPTH)/content/content_shell_and_tests.gyp:content_browser_test_base',
'<(DEPTH)/content/content_shell_and_tests.gyp:content_browser_test_support',
'<(DEPTH)/content/content_shell_and_tests.gyp:test_support_content',
'<(DEPTH)/device/bluetooth/bluetooth.gyp:device_bluetooth_mocks',
'<(DEPTH)/device/core/core.gyp:device_core_mocks',
'<(DEPTH)/device/hid/hid.gyp:device_hid_mocks',
'<(DEPTH)/device/usb/usb.gyp:device_usb_mocks',
'<(DEPTH)/testing/gmock.gyp:gmock',
'<(DEPTH)/testing/gtest.gyp:gtest',
],
'defines': [
'HAS_OUT_OF_PROC_TEST_RUNNER',
],
'sources': [
'<@(extensions_browsertests_sources)',
],
'conditions': [
['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',
],
}],
]
},
],
'conditions': [
['test_isolation_mode != "noop"', {
'targets': [
{
'target_name': 'extensions_browsertests_run',
'type': 'none',
'dependencies': [
'extensions_browsertests',
],
'includes': [
'../build/isolate.gypi',
],
'sources': [
'extensions_browsertests.isolate',
],
},
{
'target_name': 'extensions_unittests_run',
'type': 'none',
'dependencies': [
'extensions_unittests',
],
'includes': [
'../build/isolate.gypi',
],
'sources': [
'extensions_unittests.isolate',
],
'conditions': [
['use_x11 == 1', {
'dependencies': [
'../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
],
}],
],
}
],
}],
],
}
extensions/extensions_tests.gypi deleted 100644 → 0
View file @ 5cdf5844
# Copyright 2015 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.
{
'variables': {
'extensions_browsertests_sources': [
'browser/api/audio/audio_apitest.cc',
'browser/api/bluetooth_socket/bluetooth_socket_apitest.cc',
'browser/api/display_source/display_source_apitest.cc',
'browser/api/display_source/display_source_apitestbase.h',
'browser/api/display_source/display_source_apitestbase.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.cc',
'browser/guest_view/web_view/web_view_apitest.h',
'browser/guest_view/web_view/web_view_media_access_apitest.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',
],
'extensions_unittests_sources': [
'browser/api/alarms/alarms_api_unittest.cc',
'browser/api/api_resource_manager_unittest.cc',
'browser/api/bluetooth/bluetooth_event_router_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/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_attribute_unittest.cc',
'browser/api/declarative_webrequest/webrequest_condition_unittest.cc',
'browser/api/device_permissions_prompt_unittest.cc',
'browser/api/document_scan/document_scan_api_unittest.cc',
'browser/api/document_scan/document_scan_interface_chromeos_unittest.cc',
'browser/api/document_scan/mock_document_scan_interface.cc',
'browser/api/idle/idle_api_unittest.cc',
'browser/api/mime_handler_private/mime_handler_private_unittest.cc',
'browser/api/networking_config/networking_config_service_chromeos_unittest.cc',
'browser/api/power/power_api_unittest.cc',
'browser/api/runtime/restart_after_delay_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/error_map_unittest.cc',
'browser/event_listener_map_unittest.cc',
'browser/event_router_unittest.cc',
'browser/extension_api_frame_id_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/image_loader_unittest.cc',
'browser/info_map_unittest.cc',
'browser/lazy_background_task_queue_unittest.cc',
'browser/load_monitoring_extension_host_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/extension_throttle_simulation_unittest.cc',
'browser/extension_throttle_test_support.cc',
'browser/extension_throttle_test_support.h',
'browser/extension_throttle_unittest.cc',
'browser/sandboxed_unpacker_unittest.cc',
'browser/updater/update_service_unittest.cc',
'browser/value_store/leveldb_scoped_database_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/declarative/declarative_manifest_unittest.cc',
'common/api/printer_provider/usb_printer_manifest_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_messages_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/icons_handler_unittest.cc',
'common/manifest_handlers/incognito_manifest_unittest.cc',
'common/manifest_handlers/kiosk_mode_info_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/update_manifest_unittest.cc',
'common/user_script_unittest.cc',
'common/value_builder_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/gc_callback_unittest.cc',
'renderer/json_schema_unittest.cc',
'renderer/messaging_utils_unittest.cc',
'renderer/module_system_test.cc',
'renderer/module_system_test.h',
'renderer/module_system_unittest.cc',
'renderer/mojo/keep_alive_client_unittest.cc',
'renderer/mojo/stash_client_unittest.cc',
'renderer/safe_builtins_unittest.cc',
'renderer/scoped_web_frame.cc',
'renderer/scoped_web_frame.h',
'renderer/script_context_set_unittest.cc',
'renderer/script_context_unittest.cc',
'renderer/utils_unittest.cc',
'test/extensions_unittests_main.cc',
'utility/unpacker_unittest.cc',
],
'extensions_unittests_sources_wifi_display': [
'renderer/api/display_source/wifi_display/wifi_display_elementary_stream_descriptor_unittest.cc',
'renderer/api/display_source/wifi_display/wifi_display_media_packetizer_unittest.cc',
],
},
}
extensions/renderer/BUILD.gn
View file @ dc1e618a
...@@ -46,3 +46,55 @@ source_set("renderer") { ...@@ -46,3 +46,55 @@ source_set("renderer") {
] ]
} }
} }
source_set("unit_tests") {
testonly = true
sources = [
"activity_log_converter_strategy_unittest.cc",
"api/mojo_private/mojo_private_unittest.cc",
"api/serial/data_receiver_unittest.cc",
"api/serial/data_sender_unittest.cc",
"api/serial/serial_api_unittest.cc",
"api_test_base.cc",
"api_test_base.h",
"api_test_base_unittest.cc",
"event_unittest.cc",
"gc_callback_unittest.cc",
"json_schema_unittest.cc",
"messaging_utils_unittest.cc",
"module_system_test.cc",
"module_system_test.h",
"module_system_unittest.cc",
"mojo/keep_alive_client_unittest.cc",
"mojo/stash_client_unittest.cc",
"safe_builtins_unittest.cc",
"scoped_web_frame.cc",
"scoped_web_frame.h",
"script_context_set_unittest.cc",
"script_context_unittest.cc",
"utils_unittest.cc",
]
deps = [
":renderer",
"//base",
"//device/serial:test_support",
"//extensions:extensions_renderer_resources",
# TODO(brettw) these tests should not be including headers from browser.
"//extensions/browser",
"//extensions/common",
"//gin",
"//mojo/edk/js",
"//testing/gtest",
"//third_party/WebKit/public:blink",
"//ui/base",
]
if (enable_wifi_display && proprietary_codecs) {
sources += [
"api/display_source/wifi_display/wifi_display_elementary_stream_descriptor_unittest.cc",
"api/display_source/wifi_display/wifi_display_media_packetizer_unittest.cc",
]
}
}
extensions/renderer/api/serial/data_receiver_unittest.cc
View file @ dc1e618a
...@@ -116,9 +116,9 @@ class DataReceiverTest : public ApiTestBase { ...@@ -116,9 +116,9 @@ class DataReceiverTest : public ApiTestBase {
DCHECK(buffer->GetSize() >= static_cast<uint32_t>(data.size())); DCHECK(buffer->GetSize() >= static_cast<uint32_t>(data.size()));
memcpy(buffer->GetData(), data.c_str(), data.size()); memcpy(buffer->GetData(), data.c_str(), data.size());
if (error) if (error)
buffer->DoneWithError(data.size(), error); buffer->DoneWithError(static_cast<uint32_t>(data.size()), error);
else else
buffer->Done(data.size()); buffer->Done(static_cast<uint32_t>(data.size()));
} }
scoped_refptr<device::DataSourceSender> sender_; scoped_refptr<device::DataSourceSender> sender_;
......
extensions/renderer/api/serial/data_sender_unittest.cc
View file @ dc1e618a
...@@ -73,9 +73,9 @@ class DataSenderTest : public ApiTestBase { ...@@ -73,9 +73,9 @@ class DataSenderTest : public ApiTestBase {
error_to_report_.pop(); error_to_report_.pop();
} }
if (error) if (error)
buffer->DoneWithError(data.size(), error); buffer->DoneWithError(static_cast<uint32_t>(data.size()), error);
else else
buffer->Done(data.size()); buffer->Done(static_cast<uint32_t>(data.size()));
} }
void OnCancel(int32_t error) { void OnCancel(int32_t error) {
......
extensions/shell/BUILD.gn
View file @ dc1e618a
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
# found in the LICENSE file. # found in the LICENSE file.
import("//build/config/features.gni") import("//build/config/features.gni")
import("//build/config/ui.gni")
import("//extensions/shell/app_shell.gni") import("//extensions/shell/app_shell.gni")
# Technically, this directory should not depend on files from src/chrome, but # Technically, this directory should not depend on files from src/chrome, but
...@@ -218,3 +219,55 @@ if (is_mac) { ...@@ -218,3 +219,55 @@ if (is_mac) {
] ]
} }
} }
source_set("browser_tests") {
testonly = true
sources = [
"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",
]
defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
deps = [
":app_shell_lib",
"//base",
"//base/test:test_support",
"//components/version_info",
"//content/shell:content_shell_lib",
"//content/test:test_support",
"//extensions:test_support",
"//extensions/browser",
"//extensions/common",
]
if (use_aura) {
deps += [ "//ui/aura" ]
}
}
source_set("unit_tests") {
testonly = true
sources = []
deps = [
":app_shell_lib",
"//base",
"//base/test:test_support",
"//extensions/browser",
]
if (is_chromeos) {
deps += [
"//chromeos:test_support",
"//components/keyed_service/content",
]
}
}
extensions/shell/browser/shell_browsertest.cc
View file @ dc1e618a
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
#include "extensions/shell/test/shell_apitest.h" #include "extensions/shell/test/shell_apitest.h"
#if defined(USE_AURA) #if defined(USE_AURA)
#include "ui/aura/window.h" #include "ui/aura/window.h" // nogncheck
#endif #endif
namespace extensions { namespace extensions {
......
extensions/utility/BUILD.gn
View file @ dc1e618a
...@@ -23,3 +23,20 @@ source_set("utility") { ...@@ -23,3 +23,20 @@ source_set("utility") {
"//skia", "//skia",
] ]
} }
source_set("unit_tests") {
testonly = true
sources = [
"unpacker_unittest.cc",
]
deps = [
":utility",
"//base",
"//extensions:test_support",
"//extensions/common",
"//extensions/strings",
"//testing/gtest",
"//third_party/zlib:zip",
"//ui/base",
]
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment