Index: extensions/BUILD.gn |
diff --git a/extensions/BUILD.gn b/extensions/BUILD.gn |
index ded365508fc5b4873632a554e20d6edb0b23f0ba..ae0049f5fbc64a85508857fc7f38c0a927bb1940 100644 |
--- a/extensions/BUILD.gn |
+++ b/extensions/BUILD.gn |
@@ -67,6 +67,8 @@ grit("extensions_renderer_resources") { |
source_set("test_support") { |
testonly = true |
sources = [ |
+ "browser/api/cast_channel/test_util.cc", |
+ "browser/api/cast_channel/test_util.h", |
"browser/api/dns/mock_host_resolver_creator.cc", |
"browser/api/dns/mock_host_resolver_creator.h", |
"browser/api/storage/settings_test_util.cc", |
@@ -132,6 +134,10 @@ source_set("test_support") { |
"//testing/gtest", |
] |
+ public_deps = [ |
+ "//extensions/common/api/cast_channel:cast_channel_proto", |
+ ] |
+ |
if (is_win) { |
cflags = [ "/wd4267" ] # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. |
} |
@@ -170,134 +176,146 @@ repack("shell_and_test_pak") { |
] |
} |
-# TODO(GYP): Enable this link errors are fixed. |
-# This gives a link error in web_modal that is very mysterious. The GYP build |
-# doesn't seem to pull in web_content_modal_dialog_manager.o since the build |
-# does not have a reference to CreateNativeWebModalManager but it still links. |
-# The GN build fails with this symbol being undefined. |
-if (false) { |
- test("extensions_unittests") { |
- sources = [ |
- "browser/admin_policy_unittest.cc", |
- "browser/api/api_resource_manager_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/declarative/declarative_rule_unittest.cc", |
- "browser/api/declarative/deduping_factory_unittest.cc", |
- "browser/api/declarative_webrequest/webrequest_condition_attribute_unittest.cc", |
- "browser/api/declarative_webrequest/webrequest_condition_unittest.cc", |
- "browser/api/idle/idle_api_unittest.cc", |
- "browser/api/mime_handler_private/mime_handler_private_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/computed_hashes_unittest.cc", |
- "browser/content_hash_tree_unittest.cc", |
- "browser/event_listener_map_unittest.cc", |
- "browser/event_router_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/process_manager_unittest.cc", |
- "browser/process_map_unittest.cc", |
- "browser/quota_service_unittest.cc", |
- "browser/runtime_data_unittest.cc", |
- "browser/sandboxed_unpacker_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/file_util_unittest.cc", |
- "common/image_util_unittest.cc", |
- "common/manifest_handlers/content_capabilities_manifest_unittest.cc", |
- "common/manifest_handlers/oauth2_manifest_unittest.cc", |
- "common/manifest_handlers/shared_module_manifest_unittest.cc", |
- "common/manifest_handler_unittest.cc", |
- "common/message_bundle_unittest.cc", |
- "common/one_shot_event_unittest.cc", |
- "common/permissions/manifest_permission_set_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/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/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", |
- ] |
+test("extensions_unittests") { |
+ sources = [ |
+ # TODO(rockot|jamescook): This list is out of date. Move the files into |
+ # gypi source lists. |
+ "browser/api/api_resource_manager_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/declarative/declarative_rule_unittest.cc", |
+ "browser/api/declarative/deduping_factory_unittest.cc", |
+ "browser/api/declarative_webrequest/webrequest_condition_attribute_unittest.cc", |
+ "browser/api/declarative_webrequest/webrequest_condition_unittest.cc", |
+ "browser/api/idle/idle_api_unittest.cc", |
+ "browser/api/mime_handler_private/mime_handler_private_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/computed_hashes_unittest.cc", |
+ "browser/content_hash_tree_unittest.cc", |
+ "browser/event_listener_map_unittest.cc", |
+ "browser/event_router_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/process_manager_unittest.cc", |
+ "browser/process_map_unittest.cc", |
+ "browser/quota_service_unittest.cc", |
+ "browser/runtime_data_unittest.cc", |
+ "browser/sandboxed_unpacker_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/file_util_unittest.cc", |
+ "common/image_util_unittest.cc", |
+ "common/manifest_handlers/content_capabilities_manifest_unittest.cc", |
+ "common/manifest_handlers/oauth2_manifest_unittest.cc", |
+ "common/manifest_handlers/shared_module_manifest_unittest.cc", |
+ "common/manifest_handler_unittest.cc", |
+ "common/message_bundle_unittest.cc", |
+ "common/one_shot_event_unittest.cc", |
+ "common/permissions/manifest_permission_set_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/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/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", |
- deps = [ |
- ":extensions_resources", |
- ":shell_and_test_pak", |
- ":test_support", |
- "//base", |
- "//base:prefs_test_support", |
- "//base/test:test_support", |
- "//components/keyed_service/content", |
- "//content/test:test_support", |
- "//device/serial", |
- "//device/serial:test_util", |
- "//extensions/common", |
- "//extensions/renderer", |
- "//extensions/strings", |
- "//mojo/environment:chromium", |
- "//testing/gmock", |
- "//testing/gtest", |
- "//third_party/leveldatabase", |
- "//third_party/mojo/src/mojo/edk/js", |
- "//third_party/mojo/src/mojo/edk/system", |
- "//third_party/mojo/src/mojo/public/cpp/bindings", |
- "//third_party/mojo/src/mojo/public/interfaces/application", |
- ] |
+ # TODO(rockot): DisplayInfoProvider::Create() is only implemented in Chrome |
+ # and app_shell. This is wrong. |
+ "shell/browser/shell_display_info_provider.cc", |
+ |
+ # TODO(rockot): See above, but the header is in //components. |
+ "shell/browser/shell_web_contents_modal_dialog_manager.cc", |
+ ] |
- if (is_win) { |
- deps += [ "//base/allocator" ] |
- } |
+ deps = [ |
+ ":extensions_resources", |
+ ":shell_and_test_pak", |
+ ":test_support", |
+ "//base", |
+ "//base:prefs_test_support", |
+ "//base/test:test_support", |
+ "//components/keyed_service/content", |
+ "//components/user_prefs", |
+ "//content/test:test_support", |
+ "//device/serial", |
+ "//device/serial:test_support", |
+ "//extensions/common", |
+ "//extensions/common/api/cast_channel:cast_channel_proto", |
+ "//extensions/renderer", |
+ "//extensions/strings", |
+ "//extensions/utility", |
+ "//mojo/environment:chromium", |
+ "//testing/gmock", |
+ "//testing/gtest", |
+ "//third_party/leveldatabase", |
+ "//third_party/mojo/src/mojo/edk/js", |
+ "//third_party/mojo/src/mojo/edk/system", |
+ "//third_party/mojo/src/mojo/public/cpp/bindings", |
+ "//third_party/mojo/src/mojo/public/interfaces/application", |
+ ] |
+ |
+ if (is_win) { |
+ deps += [ "//base/allocator" ] |
+ } |
+ |
+ if (is_chromeos) { |
+ sources += [ |
+ # 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", |
+ ] |
} |
} |