diff options
Diffstat (limited to 'chromium/chrome/browser/web_applications/BUILD.gn')
-rw-r--r-- | chromium/chrome/browser/web_applications/BUILD.gn | 121 |
1 files changed, 68 insertions, 53 deletions
diff --git a/chromium/chrome/browser/web_applications/BUILD.gn b/chromium/chrome/browser/web_applications/BUILD.gn index c0b171f8245..88ee85c704f 100644 --- a/chromium/chrome/browser/web_applications/BUILD.gn +++ b/chromium/chrome/browser/web_applications/BUILD.gn @@ -16,25 +16,25 @@ source_set("web_applications") { "daily_metrics_helper.cc", "daily_metrics_helper.h", "extension_status_utils.h", - "external_web_app_manager.cc", - "external_web_app_manager.h", - "external_web_app_utils.cc", - "external_web_app_utils.h", + "externally_managed_app_install_task.cc", + "externally_managed_app_install_task.h", + "externally_managed_app_manager_impl.cc", + "externally_managed_app_manager_impl.h", + "externally_managed_app_registration_task.cc", + "externally_managed_app_registration_task.h", "file_utils_wrapper.cc", "file_utils_wrapper.h", "manifest_update_manager.cc", "manifest_update_manager.h", "manifest_update_task.cc", "manifest_update_task.h", - "pending_app_install_task.cc", - "pending_app_install_task.h", - "pending_app_manager_impl.cc", - "pending_app_manager_impl.h", - "pending_app_registration_task.cc", - "pending_app_registration_task.h", "policy/web_app_policy_manager.cc", "policy/web_app_policy_manager.h", "policy/web_app_policy_manager_observer.h", + "preinstalled_web_app_manager.cc", + "preinstalled_web_app_manager.h", + "preinstalled_web_app_utils.cc", + "preinstalled_web_app_utils.h", "system_web_apps/system_web_app_background_task.cc", "system_web_apps/system_web_app_background_task.h", "system_web_apps/system_web_app_manager.cc", @@ -57,7 +57,6 @@ source_set("web_applications") { "web_app_install_task.h", "web_app_installation_utils.cc", "web_app_installation_utils.h", - "web_app_migration_manager.h", "web_app_mover.cc", "web_app_mover.h", "web_app_proto_utils.cc", @@ -81,6 +80,7 @@ source_set("web_applications") { "web_app_tab_helper.h", ] + # web_applications must not depend on //chrome/browser/extensions and //extensions deps = [ ":web_app_group", "//build:chromeos_buildflags", @@ -103,11 +103,15 @@ source_set("web_applications") { "//content/public/browser", "//services/metrics/public/cpp:ukm_builders", "//skia", + "//ui/base/idle", ] if (is_chromeos_ash) { deps += [ + "//ash/components/os_feedback_ui", "//ash/constants", + "//ash/content/shimless_rma", + "//ash/content/shortcut_customization_ui", "//ash/public/cpp", "//chromeos/components/camera_app_ui", "//chromeos/components/connectivity_diagnostics", @@ -134,6 +138,39 @@ source_set("web_applications") { ] } +# The set of dependencies that //chrome/test:test_support{_ui} have on +# web_applications test support. Split out from the below target as the below +# target itself depends on //chrome/test:test_support{_ui}. +source_set("web_applications_test_support_minimal") { + testonly = true + + sources = [ + "system_web_apps/test/test_system_web_app_manager.cc", + "system_web_apps/test/test_system_web_app_manager.h", + "test/service_worker_registration_waiter.cc", + "test/service_worker_registration_waiter.h", + "test/test_web_app_provider.cc", + "test/test_web_app_provider.h", + "test/web_app_install_observer.cc", + "test/web_app_install_observer.h", + "test/web_app_install_test_utils.cc", + "test/web_app_install_test_utils.h", + ] + deps = [ + "//base", + "//base/test:test_support", + "//chrome/browser/profiles:profile", + "//chrome/browser/web_applications", + "//chrome/browser/web_applications/components", + "//chrome/common:chrome_features", + "//chrome/common:non_code_constants", + "//components/keyed_service/content", + "//components/webapps/browser", + "//content/public/browser", + "//url", + ] +} + # This test_support library doesn't use extensions. source_set("web_applications_test_support") { testonly = true @@ -143,8 +180,6 @@ source_set("web_applications_test_support") { "system_web_apps/test/system_web_app_browsertest_base.h", "system_web_apps/test/test_system_web_app_installation.cc", "system_web_apps/test/test_system_web_app_installation.h", - "system_web_apps/test/test_system_web_app_manager.cc", - "system_web_apps/test/test_system_web_app_manager.h", "system_web_apps/test/test_system_web_app_url_data_source.cc", "system_web_apps/test/test_system_web_app_url_data_source.h", "system_web_apps/test/test_system_web_app_web_ui_controller_factory.cc", @@ -155,14 +190,16 @@ source_set("web_applications_test_support") { "test/fake_url_handler_manager.h", "test/fake_web_app_origin_association_manager.cc", "test/fake_web_app_origin_association_manager.h", - "test/service_worker_registration_waiter.cc", - "test/service_worker_registration_waiter.h", "test/test_app_registrar.cc", "test/test_app_registrar.h", "test/test_app_registry_controller.cc", "test/test_app_registry_controller.h", "test/test_data_retriever.cc", "test/test_data_retriever.h", + "test/test_externally_managed_app_manager.cc", + "test/test_externally_managed_app_manager.h", + "test/test_externally_managed_app_manager_impl.cc", + "test/test_externally_managed_app_manager_impl.h", "test/test_file_handler_manager.cc", "test/test_file_handler_manager.h", "test/test_file_utils.cc", @@ -171,14 +208,8 @@ source_set("web_applications_test_support") { "test/test_install_finalizer.h", "test/test_os_integration_manager.cc", "test/test_os_integration_manager.h", - "test/test_pending_app_manager.cc", - "test/test_pending_app_manager.h", - "test/test_pending_app_manager_impl.cc", - "test/test_pending_app_manager_impl.h", "test/test_web_app_database_factory.cc", "test/test_web_app_database_factory.h", - "test/test_web_app_provider.cc", - "test/test_web_app_provider.h", "test/test_web_app_registry_controller.cc", "test/test_web_app_registry_controller.h", "test/test_web_app_ui_manager.cc", @@ -187,18 +218,17 @@ source_set("web_applications_test_support") { "test/test_web_app_url_loader.h", "test/web_app_icon_test_utils.cc", "test/web_app_icon_test_utils.h", - "test/web_app_install_observer.cc", - "test/web_app_install_observer.h", - "test/web_app_install_test_utils.cc", - "test/web_app_install_test_utils.h", "test/web_app_registration_waiter.cc", "test/web_app_registration_waiter.h", - "test/web_app_test.cc", "test/web_app_test.h", + "test/web_app_test_utils.cc", + "test/web_app_test_utils.h", "test/web_app_uninstall_waiter.cc", "test/web_app_uninstall_waiter.h", ] + public_deps = [ ":web_applications_test_support_minimal" ] + deps = [ ":web_app_test_group", ":web_applications", @@ -208,10 +238,12 @@ source_set("web_applications_test_support") { "//chrome/browser/profiles:profile", "//chrome/browser/ui:ui", "//chrome/browser/web_applications/components", + "//chrome/test:test_support", "//chrome/test:test_support_ui", "//components/crx_file:crx_file", "//components/keyed_service/content:content", "//components/services/app_service/public/cpp:app_url_handling", + "//components/services/app_service/public/cpp:types", "//components/sync:test_support_model", "//components/webapps/browser", "//content/test:test_support", @@ -225,10 +257,10 @@ source_set("web_applications_unit_tests") { sources = [ "daily_metrics_helper_unittest.cc", - "external_web_app_manager_unittest.cc", - "external_web_app_utils_unittest.cc", + "externally_managed_app_manager_impl_unittest.cc", "manifest_update_task_unittest.cc", - "pending_app_manager_impl_unittest.cc", + "preinstalled_web_app_manager_unittest.cc", + "preinstalled_web_app_utils_unittest.cc", "system_web_apps/test/system_web_app_manager_unittest.cc", "web_app_database_unittest.cc", "web_app_icon_manager_unittest.cc", @@ -262,6 +294,8 @@ source_set("web_applications_unit_tests") { "//skia", "//testing/gmock", "//testing/gtest", + "//ui/base/idle:idle", + "//ui/base/idle:test_support", ] if (is_chromeos_ash) { @@ -284,15 +318,14 @@ source_set("web_applications_browser_tests") { testonly = true sources = [ - "external_web_app_manager_browsertest.cc", - "external_web_app_migration_browsertest.cc", + "externally_managed_app_manager_impl_browsertest.cc", "manifest_update_manager_browsertest.cc", - "pending_app_manager_impl_browsertest.cc", + "preinstalled_web_app_manager_browsertest.cc", + "preinstalled_web_app_migration_browsertest.cc", "preinstalled_web_apps_browsertest.cc", "system_web_apps/test/system_web_app_manager_browsertest.cc", "web_app_audio_focus_browsertest.cc", "web_app_icon_manager_browsertest.cc", - "web_app_migration_manager_browsertest.cc", "web_app_mover_browsertest.cc", ] @@ -300,7 +333,6 @@ source_set("web_applications_browser_tests") { deps = [ ":web_applications", - ":web_applications_on_extensions", ":web_applications_test_support", "//build:branding_buildflags", "//build:chromeos_buildflags", @@ -317,6 +349,8 @@ source_set("web_applications_browser_tests") { "//components/services/app_service/public/cpp:intents", "//components/webapps/browser", "//extensions/browser:test_support", + "//ui/base/idle:idle", + "//ui/base/idle:test_support", ] if (is_chromeos_ash) { @@ -328,25 +362,6 @@ source_set("web_applications_browser_tests") { } } -# TODO(crbug.com/877898): Erase this and move all migration code to -# //chrome/browser/web_applications/extensions:extensions GN source set. -source_set("web_applications_on_extensions") { - sources = [ "web_app_migration_manager.cc" ] - - deps = [ - ":web_app_group", - ":web_applications", - "//chrome/browser/profiles:profile", - "//chrome/browser/web_applications/components", - "//chrome/browser/web_applications/extensions", - "//chrome/common", - "//components/keyed_service/content", - "//components/pref_registry:pref_registry", - "//components/sync", - "//extensions/browser", - ] -} - group("unit_tests") { testonly = true |