diff options
Diffstat (limited to 'chromium/chromeos')
32 files changed, 325 insertions, 120 deletions
diff --git a/chromium/chromeos/BUILD.gn b/chromium/chromeos/BUILD.gn index 103212164f2..cf975ad023d 100644 --- a/chromium/chromeos/BUILD.gn +++ b/chromium/chromeos/BUILD.gn @@ -26,16 +26,20 @@ component("chromeos") { "//build/config/linux/nss:system_nss_no_ssl_config", ] public_deps = [ - ":chromeos_constants", + "//chromeos/constants", ] deps = [ ":account_manager_proto", ":chromeos_export", "//base", "//base:i18n", + "//chromeos/dbus", + "//chromeos/dbus/constants", "//components/policy/proto", "//google_apis", + "//services/device/public/mojom", "//services/network/public/cpp:cpp", + "//services/service_manager/public/cpp", "//third_party/protobuf:protobuf_lite", ] sources = [ @@ -53,6 +57,8 @@ component("chromeos") { "policy/weekly_time/weekly_time.h", "policy/weekly_time/weekly_time_interval.cc", "policy/weekly_time/weekly_time_interval.h", + "printing/epson_driver_matching.cc", + "printing/epson_driver_matching.h", "printing/ppd_cache.cc", "printing/ppd_cache.h", "printing/ppd_line_reader.cc", @@ -73,6 +79,8 @@ component("chromeos") { "process_proxy/process_proxy_registry.h", "system/cpu_temperature_reader.cc", "system/cpu_temperature_reader.h", + "system/dark_resume_controller.cc", + "system/dark_resume_controller.h", "system/devicemode.cc", "system/devicemode.h", "system/factory_ping_embargo_check.cc", @@ -100,31 +108,6 @@ source_set("chromeos_export") { ] } -source_set("chromeos_constants") { - configs += [ ":chromeos_implementation" ] - deps = [ - ":chromeos_export", - "//base", - "//base:i18n", - "//chromeos/dbus:constants", - "//third_party/icu", - ] - sources = [ - "constants/chromeos_constants.cc", - "constants/chromeos_constants.h", - "constants/chromeos_features.cc", - "constants/chromeos_features.h", - "constants/chromeos_paths.cc", - "constants/chromeos_paths.h", - "constants/chromeos_pref_names.cc", - "constants/chromeos_pref_names.h", - "constants/chromeos_switches.cc", - "constants/chromeos_switches.h", - "constants/devicetype.cc", - "constants/devicetype.h", - ] -} - # This must be a static library instead of a source set because some of the # files pull in things with dependencies that aren't linked in all cases. # @@ -204,8 +187,11 @@ test("chromeos_unittests") { "//mojo/core/embedder", "//net", "//net:test_support", + "//services/device/public/cpp/test:test_support", + "//services/device/public/mojom", "//services/network:test_support", "//services/network/public/cpp", + "//services/service_manager/public/cpp/test:test_support", "//testing/gmock", "//testing/gtest", "//third_party/icu", @@ -217,6 +203,7 @@ test("chromeos_unittests") { "policy/weekly_time/time_utils_unittest.cc", "policy/weekly_time/weekly_time_interval_unittest.cc", "policy/weekly_time/weekly_time_unittest.cc", + "printing/epson_driver_matching_unittest.cc", "printing/ppd_cache_unittest.cc", "printing/ppd_line_reader_unittest.cc", "printing/ppd_provider_unittest.cc", @@ -225,6 +212,7 @@ test("chromeos_unittests") { "process_proxy/process_output_watcher_unittest.cc", "process_proxy/process_proxy_unittest.cc", "system/cpu_temperature_reader_unittest.cc", + "system/dark_resume_controller_unittest.cc", "system/factory_ping_embargo_check_unittest.cc", "system/name_value_pairs_parser_unittest.cc", "test/run_all_unittests.cc", @@ -274,16 +262,15 @@ if (is_cros_chrome_sdk) { # Tast test sources live in the Chromium OS repository. # To diagnose tast failures or disable tests, see go/tast-failures tast_test("chrome_all_tast_tests") { - tast_disabled_tests = [ - # Disabled due to flake. https://crbug.com/909736 - "ui.MashLogin", - ] + # To disable a specific test, add it the following list. + tast_disabled_tests = [] } tast_test("chrome_kevin_tast_tests") { # Tests that fail on Kevin devices. tast_disabled_tests = [ # Disabled due to misleading USE flags on full boards. crbug.com/916367 "arc.Boot", + "arc.BuildProperties", "security.NetworkListenersARC", "video.WebRTCPeerConnCameraVP8", # crbug.com/923061 ] diff --git a/chromium/chromeos/attestation/BUILD.gn b/chromium/chromeos/attestation/BUILD.gn index ad87f91b83d..26c48e241dd 100644 --- a/chromium/chromeos/attestation/BUILD.gn +++ b/chromium/chromeos/attestation/BUILD.gn @@ -10,7 +10,6 @@ component("attestation") { defines = [ "IS_CHROMEOS_ATTESTATION_IMPL" ] deps = [ "//base", - "//chromeos:chromeos_constants", "//chromeos/cryptohome", "//chromeos/dbus", "//chromeos/dbus:cryptohome_proto", diff --git a/chromium/chromeos/audio/BUILD.gn b/chromium/chromeos/audio/BUILD.gn index ba05a60d044..fb3d38a1487 100644 --- a/chromium/chromeos/audio/BUILD.gn +++ b/chromium/chromeos/audio/BUILD.gn @@ -10,7 +10,7 @@ component("audio") { defines = [ "IS_CHROMEOS_AUDIO_IMPL" ] deps = [ "//base", - "//chromeos:chromeos_constants", + "//chromeos/constants", "//chromeos/dbus", "//components/prefs", "//media/base:video_facing", @@ -35,7 +35,7 @@ source_set("unit_tests") { deps = [ ":audio", "//base/test:test_support", - "//chromeos:chromeos_constants", + "//chromeos/constants", "//chromeos/dbus:test_support", "//components/prefs:test_support", "//media/base:video_facing", diff --git a/chromium/chromeos/components/drivefs/BUILD.gn b/chromium/chromeos/components/drivefs/BUILD.gn index 8315837497f..00a04b87356 100644 --- a/chromium/chromeos/components/drivefs/BUILD.gn +++ b/chromium/chromeos/components/drivefs/BUILD.gn @@ -15,6 +15,8 @@ component("drivefs") { "drivefs_host_observer.h", "drivefs_search.cc", "drivefs_search.h", + "drivefs_session.cc", + "drivefs_session.h", "fake_drivefs_launcher_client.cc", "fake_drivefs_launcher_client.h", "pending_connection_manager.cc", @@ -61,6 +63,7 @@ source_set("unit_tests") { "drivefs_bootstrap_unittest.cc", "drivefs_host_unittest.cc", "drivefs_search_unittest.cc", + "drivefs_session_unittest.cc", "pending_connection_manager_unittest.cc", ] @@ -77,6 +80,7 @@ source_set("unit_tests") { "//net", "//net:test_support", "//services/identity/public/mojom", + "//services/network:test_support", "//services/network/public/cpp:cpp", "//services/service_manager/public/cpp", "//services/service_manager/public/cpp/test:test_support", diff --git a/chromium/chromeos/components/multidevice/debug_webui/BUILD.gn b/chromium/chromeos/components/multidevice/debug_webui/BUILD.gn index 270b04a0f06..79b3465d18c 100644 --- a/chromium/chromeos/components/multidevice/debug_webui/BUILD.gn +++ b/chromium/chromeos/components/multidevice/debug_webui/BUILD.gn @@ -17,9 +17,9 @@ static_library("debug_webui") { deps = [ "//base", "//base:i18n", - "//chromeos:chromeos_constants", "//chromeos/components/multidevice/logging", "//chromeos/components/proximity_auth", + "//chromeos/constants", "//chromeos/resources", "//chromeos/services/device_sync/proto", "//chromeos/services/device_sync/proto:util", diff --git a/chromium/chromeos/components/proximity_auth/BUILD.gn b/chromium/chromeos/components/proximity_auth/BUILD.gn index 1dcbe382662..963f465b6dc 100644 --- a/chromium/chromeos/components/proximity_auth/BUILD.gn +++ b/chromium/chromeos/components/proximity_auth/BUILD.gn @@ -51,10 +51,10 @@ static_library("proximity_auth") { deps = [ "//base", - "//chromeos:chromeos_constants", "//chromeos/components/multidevice", "//chromeos/components/multidevice/logging", "//chromeos/components/proximity_auth/public/interfaces", + "//chromeos/constants", "//chromeos/dbus", "//chromeos/services/multidevice_setup/public/cpp", "//chromeos/services/multidevice_setup/public/cpp:prefs", @@ -116,10 +116,10 @@ source_set("unit_tests") { ":test_support", "//base", "//base/test:test_support", - "//chromeos:chromeos_constants", "//chromeos/components/multidevice", "//chromeos/components/multidevice:test_support", "//chromeos/components/multidevice/logging", + "//chromeos/constants", "//chromeos/dbus:test_support", "//chromeos/services/multidevice_setup/public/cpp:prefs", "//chromeos/services/multidevice_setup/public/cpp:test_support", diff --git a/chromium/chromeos/components/tether/BUILD.gn b/chromium/chromeos/components/tether/BUILD.gn index bfbb4f35f42..8b9e3555e79 100644 --- a/chromium/chromeos/components/tether/BUILD.gn +++ b/chromium/chromeos/components/tether/BUILD.gn @@ -116,9 +116,9 @@ static_library("tether") { deps = [ "//base", - "//chromeos:chromeos_constants", "//chromeos/components/multidevice/logging", "//chromeos/components/tether/proto", + "//chromeos/constants", "//chromeos/dbus", "//chromeos/login/login_state", "//chromeos/network", @@ -202,10 +202,10 @@ static_library("test_support") { deps = [ "//base", "//base/test:test_support", - "//chromeos:chromeos_constants", "//chromeos/components/multidevice", "//chromeos/components/multidevice:test_support", "//chromeos/components/tether/proto", + "//chromeos/constants", "//chromeos/network:test_support", "//chromeos/services/device_sync/public/cpp:test_support", "//chromeos/services/secure_channel/public/cpp/client:test_support", @@ -264,10 +264,10 @@ source_set("unit_tests") { ":test_support", ":tether", "//base/test:test_support", - "//chromeos:chromeos_constants", "//chromeos/components/multidevice", "//chromeos/components/multidevice:test_support", "//chromeos/components/tether/proto", + "//chromeos/constants", "//chromeos/dbus:test_support", "//chromeos/login/login_state", "//chromeos/network:test_support", diff --git a/chromium/chromeos/constants/BUILD.gn b/chromium/chromeos/constants/BUILD.gn new file mode 100644 index 00000000000..886219902f9 --- /dev/null +++ b/chromium/chromeos/constants/BUILD.gn @@ -0,0 +1,30 @@ +# Copyright 2019 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. + +assert(is_chromeos, "Non-Chrome-OS builds must not depend on //chromeos") + +component("constants") { + output_name = "chromeos_constants" + defines = [ "IS_CHROMEOS_CONSTANTS_IMPL" ] + deps = [ + "//base", + "//base:i18n", + "//chromeos/dbus/constants", + "//third_party/icu", + ] + sources = [ + "chromeos_constants.cc", + "chromeos_constants.h", + "chromeos_features.cc", + "chromeos_features.h", + "chromeos_paths.cc", + "chromeos_paths.h", + "chromeos_pref_names.cc", + "chromeos_pref_names.h", + "chromeos_switches.cc", + "chromeos_switches.h", + "devicetype.cc", + "devicetype.h", + ] +} diff --git a/chromium/chromeos/dbus/BUILD.gn b/chromium/chromeos/dbus/BUILD.gn index 76185613230..a09cbadac70 100644 --- a/chromium/chromeos/dbus/BUILD.gn +++ b/chromium/chromeos/dbus/BUILD.gn @@ -11,7 +11,6 @@ component("dbus") { output_name = "chromeos_dbus" # Avoid conflict with //dbus defines = [ "IS_CHROMEOS_DBUS_IMPL" ] public_deps = [ - ":constants", "//dbus", ] deps = [ @@ -26,12 +25,14 @@ component("dbus") { ":media_perception_proto", ":metrics_event_proto", ":oobe_config_proto", + ":plugin_vm_service_proto", ":power_manager_proto", ":runtime_probe_proto", ":seneschal_proto", ":smbprovider_proto", ":vm_applications_apps_proto", "//base", + "//chromeos/dbus/constants", "//components/account_id", "//components/device_event_log", "//components/policy:cloud_policy_proto_generated_compile", @@ -72,6 +73,7 @@ component("dbus") { "cros_disks_client.h", "cryptohome_client.cc", "cryptohome_client.h", + "dbus_client.h", "dbus_client_implementation_type.h", "dbus_clients_browser.cc", "dbus_clients_browser.h", @@ -117,8 +119,6 @@ component("dbus") { "fake_easy_unlock_client.h", "fake_gsm_sms_client.cc", "fake_gsm_sms_client.h", - "fake_hammerd_client.cc", - "fake_hammerd_client.h", "fake_image_burner_client.cc", "fake_image_burner_client.h", "fake_image_loader_client.cc", @@ -159,8 +159,6 @@ component("dbus") { "fake_smb_provider_client.h", "fake_sms_client.cc", "fake_sms_client.h", - "fake_system_clock_client.cc", - "fake_system_clock_client.h", "fake_update_engine_client.cc", "fake_update_engine_client.h", "fake_upstart_client.cc", @@ -169,8 +167,10 @@ component("dbus") { "fake_virtual_file_provider_client.h", "gsm_sms_client.cc", "gsm_sms_client.h", - "hammerd_client.cc", - "hammerd_client.h", + "hammerd/fake_hammerd_client.cc", + "hammerd/fake_hammerd_client.h", + "hammerd/hammerd_client.cc", + "hammerd/hammerd_client.h", "image_burner_client.cc", "image_burner_client.h", "image_loader_client.cc", @@ -183,6 +183,8 @@ component("dbus") { "media_analytics_client.h", "modem_messaging_client.cc", "modem_messaging_client.h", + "native_timer.cc", + "native_timer.h", "oobe_configuration_client.cc", "oobe_configuration_client.h", "permission_broker_client.cc", @@ -217,8 +219,6 @@ component("dbus") { "smb_provider_client.h", "sms_client.cc", "sms_client.h", - "system_clock_client.cc", - "system_clock_client.h", "update_engine_client.cc", "update_engine_client.h", "upstart_client.cc", @@ -236,24 +236,12 @@ component("dbus") { ] } -source_set("constants") { - defines = [ "IS_CHROMEOS_DBUS_IMPL" ] - deps = [ - "//base", - ] - sources = [ - "constants/dbus_paths.cc", - "constants/dbus_paths.h", - "constants/dbus_switches.cc", - "constants/dbus_switches.h", - ] -} - source_set("test_support") { testonly = true configs += [ "//build/config/linux/dbus" ] public_deps = [ ":dbus", + "//chromeos/dbus/constants", "//dbus", "//dbus:test_support", ] @@ -302,6 +290,7 @@ source_set("unit_tests") { "fake_power_manager_client_unittest.cc", "gsm_sms_client_unittest.cc", "modem_messaging_client_unittest.cc", + "native_timer_unittest.cc", "oobe_configuration_client_unittest.cc", "pipe_reader_unittest.cc", "power_manager_client_unittest.cc", @@ -362,7 +351,6 @@ proto_library("concierge_proto") { proto_library("cryptohome_proto") { sources = [ - "//third_party/cros_system_api/dbus/cryptohome/install_attributes.proto", "//third_party/cros_system_api/dbus/cryptohome/key.proto", "//third_party/cros_system_api/dbus/cryptohome/rpc.proto", ] @@ -411,6 +399,14 @@ proto_library("oobe_config_proto") { proto_out_dir = "chromeos/dbus/oobe_config" } +proto_library("plugin_vm_service_proto") { + sources = [ + "//third_party/cros_system_api/dbus/plugin_vm_service/plugin_vm_service.proto", + ] + + proto_out_dir = "chromeos/dbus/plugin_vm_service" +} + proto_library("power_manager_proto") { sources = [ "//third_party/cros_system_api/dbus/power_manager/backlight.proto", diff --git a/chromium/chromeos/dbus/constants/BUILD.gn b/chromium/chromeos/dbus/constants/BUILD.gn new file mode 100644 index 00000000000..1df6c29ff4c --- /dev/null +++ b/chromium/chromeos/dbus/constants/BUILD.gn @@ -0,0 +1,19 @@ +# Copyright 2019 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. + +assert(is_chromeos, "Non-Chrome-OS builds must not depend on //chromeos") + +component("constants") { + output_name = "chromeos_dbus_constants" + defines = [ "IS_CHROMEOS_DBUS_CONSTANTS_IMPL" ] + deps = [ + "//base", + ] + sources = [ + "dbus_paths.cc", + "dbus_paths.h", + "dbus_switches.cc", + "dbus_switches.h", + ] +} diff --git a/chromium/chromeos/dbus/system_clock/BUILD.gn b/chromium/chromeos/dbus/system_clock/BUILD.gn new file mode 100644 index 00000000000..d5a6a67c240 --- /dev/null +++ b/chromium/chromeos/dbus/system_clock/BUILD.gn @@ -0,0 +1,22 @@ +# Copyright 2018 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. + +assert(is_chromeos, "Non-ChromeOS builds cannot depend on //chromeos") + +component("system_clock") { + defines = [ "IS_SYSTEM_CLOCK_IMPL" ] + + deps = [ + "//base", + "//chromeos/dbus", + "//dbus", + ] + + sources = [ + "fake_system_clock_client.cc", + "fake_system_clock_client.h", + "system_clock_client.cc", + "system_clock_client.h", + ] +} diff --git a/chromium/chromeos/disks/BUILD.gn b/chromium/chromeos/disks/BUILD.gn index 2cee8ce2450..90b73ced99a 100644 --- a/chromium/chromeos/disks/BUILD.gn +++ b/chromium/chromeos/disks/BUILD.gn @@ -10,7 +10,7 @@ component("disks") { defines = [ "IS_CHROMEOS_DISKS_IMPL" ] deps = [ "//base", - "//chromeos:chromeos_constants", + "//chromeos/constants", "//chromeos/dbus", "//chromeos/dbus:power_manager_proto", ] @@ -49,7 +49,7 @@ source_set("unit_tests") { ":disks", ":test_support", "//base/test:test_support", - "//chromeos:chromeos_constants", + "//chromeos/constants", "//chromeos/dbus:power_manager_proto", "//chromeos/dbus:test_support", "//testing/gmock", diff --git a/chromium/chromeos/login/auth/BUILD.gn b/chromium/chromeos/login/auth/BUILD.gn index 07d3cdbd741..0b9f7378533 100644 --- a/chromium/chromeos/login/auth/BUILD.gn +++ b/chromium/chromeos/login/auth/BUILD.gn @@ -15,7 +15,7 @@ component("auth") { deps = [ "//base", "//base:i18n", - "//chromeos:chromeos_constants", + "//chromeos/constants", "//chromeos/cryptohome", "//chromeos/dbus", "//chromeos/dbus:authpolicy_proto", @@ -110,7 +110,6 @@ source_set("unit_tests") { ":auth", "//base", "//base:i18n", - "//chromeos:chromeos_constants", "//chromeos/dbus:authpolicy_proto", "//chromeos/dbus:test_support", "//testing/gmock", diff --git a/chromium/chromeos/login/login_state/BUILD.gn b/chromium/chromeos/login/login_state/BUILD.gn index 45d0563c846..5f01e7a5cd8 100644 --- a/chromium/chromeos/login/login_state/BUILD.gn +++ b/chromium/chromeos/login/login_state/BUILD.gn @@ -8,7 +8,7 @@ component("login_state") { defines = [ "IS_LOGIN_STATE_IMPL" ] deps = [ "//base", - "//chromeos:chromeos_constants", + "//chromeos/constants", "//components/device_event_log", ] sources = [ @@ -37,7 +37,7 @@ source_set("unit_tests") { deps = [ ":login_state", "//base", - "//chromeos:chromeos_constants", + "//chromeos/constants", "//testing/gmock", "//testing/gtest", ] diff --git a/chromium/chromeos/network/BUILD.gn b/chromium/chromeos/network/BUILD.gn index 756c831d7b4..5b968ef6922 100644 --- a/chromium/chromeos/network/BUILD.gn +++ b/chromium/chromeos/network/BUILD.gn @@ -13,7 +13,7 @@ component("network") { deps = [ "//base", "//base:i18n", - "//chromeos:chromeos_constants", + "//chromeos/constants", "//chromeos/dbus", "//chromeos/login/login_state", "//components/account_id", @@ -150,8 +150,6 @@ component("network") { "proxy/proxy_config_handler.h", "proxy/proxy_config_service_impl.cc", "proxy/proxy_config_service_impl.h", - "proxy/ui_proxy_config.cc", - "proxy/ui_proxy_config.h", "proxy/ui_proxy_config_service.cc", "proxy/ui_proxy_config_service.h", "shill_property_handler.cc", @@ -186,8 +184,8 @@ source_set("test_support") { "mock_network_device_handler.h", "mock_network_state_handler.cc", "mock_network_state_handler.h", - "network_state_test.cc", - "network_state_test.h", + "network_state_test_helper.cc", + "network_state_test_helper.h", "onc/onc_test_utils.cc", "onc/onc_test_utils.h", "portal_detector/mock_network_portal_detector.cc", @@ -203,14 +201,15 @@ source_set("unit_tests") { "//base", "//base:i18n", "//base/test:test_support", - "//chromeos:chromeos_constants", "//chromeos:test_utils", + "//chromeos/constants", "//chromeos/dbus:test_support", "//chromeos/login/login_state", "//components/onc", "//components/prefs", "//components/prefs:test_support", "//components/proxy_config", + "//components/sync_preferences:test_support", "//crypto", "//crypto:test_support", "//dbus", @@ -250,6 +249,7 @@ source_set("unit_tests") { "onc/variable_expander_unittest.cc", "prohibited_technologies_handler_unittest.cc", "proxy/proxy_config_service_impl_unittest.cc", + "proxy/ui_proxy_config_service_unittest.cc", "shill_property_handler_unittest.cc", ] } diff --git a/chromium/chromeos/services/assistant/BUILD.gn b/chromium/chromeos/services/assistant/BUILD.gn index c4a35f31c0e..1db06b30094 100644 --- a/chromium/chromeos/services/assistant/BUILD.gn +++ b/chromium/chromeos/services/assistant/BUILD.gn @@ -3,7 +3,6 @@ # found in the LICENSE file. import("//chromeos/assistant/assistant.gni") -import("//services/service_manager/public/service_manifest.gni") assert(is_chromeos) assert(enable_cros_assistant) @@ -36,11 +35,13 @@ component("lib") { "//build/util:webkit_version", "//chromeos/assistant:buildflags", "//chromeos/audio", + "//chromeos/constants", "//chromeos/dbus", "//chromeos/dbus:power_manager_proto", "//components/account_id", "//services/device/public/mojom", "//services/identity/public/mojom", + "//services/network/public/cpp:cpp", "//ui/accessibility:ax_assistant", ] @@ -67,6 +68,8 @@ component("lib") { "default_url_request_context_getter.h", "media_session/assistant_media_session.cc", "media_session/assistant_media_session.h", + "platform/audio_device_owner.cc", + "platform/audio_device_owner.h", "platform/audio_input_impl.cc", "platform/audio_input_impl.h", "platform/audio_input_provider_impl.cc", @@ -81,8 +84,12 @@ component("lib") { "platform/file_provider_impl.h", "platform/network_provider_impl.cc", "platform/network_provider_impl.h", + "platform/power_manager_provider_impl.cc", + "platform/power_manager_provider_impl.h", "platform/system_provider_impl.cc", "platform/system_provider_impl.h", + "platform/volume_control_impl.cc", + "platform/volume_control_impl.h", "platform_api_impl.cc", "platform_api_impl.h", "utils.cc", @@ -93,6 +100,7 @@ component("lib") { "//chromeos/assistant/internal", "//chromeos/assistant/internal:build_libassistant", "//chromeos/assistant/internal/proto/google3", + "//chromeos/dbus", "//chromeos/resources", "//chromeos/services/assistant/public/proto", "//chromeos/strings", @@ -105,6 +113,7 @@ component("lib") { "//services/media_session/public/mojom", "//services/network/public/cpp", "//services/network/public/mojom", + "//services/service_manager/public/cpp", "//ui/base", "//url", ] @@ -113,11 +122,6 @@ component("lib") { } } -service_manifest("manifest") { - name = "assistant" - source = "manifest.json" -} - source_set("tests") { testonly = true deps = [ @@ -129,6 +133,8 @@ source_set("tests") { "//mojo/public/cpp/bindings:bindings", "//services/device/public/mojom", "//services/identity/public/mojom", + "//services/network:test_support", + "//services/network/public/cpp:cpp", "//services/service_manager/public/cpp", "//services/service_manager/public/cpp/test:test_support", "//testing/gmock", @@ -141,10 +147,15 @@ source_set("tests") { if (enable_cros_libassistant) { sources += [ "platform/audio_output_provider_impl_unittest.cc", + "platform/power_manager_provider_impl_unittest.cc", "platform/system_provider_impl_unittest.cc", ] - deps += [ "//libassistant/shared/public" ] + deps += [ + "//chromeos/dbus", + "//libassistant/shared/public", + "//services/device/public/cpp/test:test_support", + ] } } diff --git a/chromium/chromeos/services/assistant/audio_decoder/BUILD.gn b/chromium/chromeos/services/assistant/audio_decoder/BUILD.gn index 6c6a3bf7f23..5417ed0bf6e 100644 --- a/chromium/chromeos/services/assistant/audio_decoder/BUILD.gn +++ b/chromium/chromeos/services/assistant/audio_decoder/BUILD.gn @@ -4,8 +4,6 @@ import("//chromeos/assistant/assistant.gni") -import("//services/service_manager/public/service_manifest.gni") - assert(enable_cros_libassistant) source_set("lib") { @@ -31,8 +29,3 @@ source_set("lib") { "//services/service_manager/public/cpp:cpp", ] } - -service_manifest("manifest") { - name = "assistant_audio_decoder" - source = "manifest.json" -} diff --git a/chromium/chromeos/services/assistant/public/cpp/BUILD.gn b/chromium/chromeos/services/assistant/public/cpp/BUILD.gn new file mode 100644 index 00000000000..3ed32ec28da --- /dev/null +++ b/chromium/chromeos/services/assistant/public/cpp/BUILD.gn @@ -0,0 +1,29 @@ +# Copyright 2019 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. + +source_set("manifest") { + sources = [ + "manifest.cc", + "manifest.h", + ] + + deps = [ + "//base", + "//chromeos/services/assistant/public/mojom", + "//services/service_manager/public/cpp", + ] +} + +source_set("audio_decoder_manifest") { + sources = [ + "audio_decoder_manifest.cc", + "audio_decoder_manifest.h", + ] + + deps = [ + "//base", + "//chromeos/services/assistant/public/mojom", + "//services/service_manager/public/cpp", + ] +} diff --git a/chromium/chromeos/services/assistant/public/mojom/assistant.mojom b/chromium/chromeos/services/assistant/public/mojom/assistant.mojom index 6f0afa4ca27..339b2c35b0e 100644 --- a/chromium/chromeos/services/assistant/public/mojom/assistant.mojom +++ b/chromium/chromeos/services/assistant/public/mojom/assistant.mojom @@ -193,6 +193,32 @@ struct AssistantSuggestion { url.mojom.Url action_url; }; +// Enumeration of notification types. +enum AssistantNotificationType { + // A notification of type |kInAssistant| will only be displayed within + // Assistant UI. If Assistant UI is not visible at the time of notification + // creation, the notification will be queued up until Assistant UI becomes + // visible. When Assistant UI dismisses, notifications of this type are + // dismissed. + kInAssistant, + + // A notification of type |kPreferInAssistant| may be shown in either + // Assistant UI or the Message Center, depending on Assistant visibility + // state. If Assistant UI is not visible, notifications of this type will + // show immediately in the Message Center unless the user has opted out of + // seeing system notifications. Once Assistant UI becomes visible, or if it + // is already visible at the time of notification creation, notifications of + // this type are converted to notifications of type |kInAssistant| and they + // will finish out their lifetimes as in-Assistant notifications. + kPreferInAssistant, + + // A notification of type |kSystem| will only be displayed within the Message + // Center. It is immediately added to the Message Center regardless of + // Assistant UI visibility state, although it may not be added if the user has + // opted out of seeing system notifications. + kSystem, +}; + // Models a notification button. struct AssistantNotificationButton { // Display text of the button. @@ -204,6 +230,9 @@ struct AssistantNotificationButton { // Models an Assistant notification. struct AssistantNotification { + // Type of the notification. + AssistantNotificationType type = AssistantNotificationType.kSystem; + // Title of the notification. string title; @@ -232,6 +261,9 @@ struct AssistantNotification { // Obfuscated Gaia id of the intended recipient of the user. string obfuscated_gaia_id; + + // Whether this notification can turn on the display if it was off. + bool is_high_priority = false; }; // Models status of an app. @@ -253,4 +285,8 @@ struct AssistantFeedback { // Whether user consent to send debug info. bool assistant_debug_info_allowed; + + // Screenshot if allowed by user. + // Raw data (non-encoded binary octets) + string screenshot_png; }; diff --git a/chromium/chromeos/services/assistant/public/mojom/settings.mojom b/chromium/chromeos/services/assistant/public/mojom/settings.mojom index ace261574b8..ab2a98e130f 100644 --- a/chromium/chromeos/services/assistant/public/mojom/settings.mojom +++ b/chromium/chromeos/services/assistant/public/mojom/settings.mojom @@ -41,4 +41,7 @@ interface AssistantSettingsManager { // Stops speaker id enrollment. StopSpeakerIdEnrollment() => (); + + // Sync speaker id enrollment status. + SyncSpeakerIdEnrollmentStatus(); }; diff --git a/chromium/chromeos/services/device_sync/BUILD.gn b/chromium/chromeos/services/device_sync/BUILD.gn index b86ef306392..93659697beb 100644 --- a/chromium/chromeos/services/device_sync/BUILD.gn +++ b/chromium/chromeos/services/device_sync/BUILD.gn @@ -2,8 +2,6 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//services/service_manager/public/service_manifest.gni") - assert(is_chromeos, "Non-ChromeOS builds cannot depend on //chromeos") static_library("device_sync") { @@ -13,6 +11,8 @@ static_library("device_sync") { "cryptauth_client.h", "cryptauth_client_impl.cc", "cryptauth_client_impl.h", + "cryptauth_constants.cc", + "cryptauth_constants.h", "cryptauth_device_manager.cc", "cryptauth_device_manager.h", "cryptauth_device_manager_impl.cc", @@ -28,6 +28,8 @@ static_library("device_sync") { "cryptauth_enrollment_manager_impl.h", "cryptauth_enrollment_result.cc", "cryptauth_enrollment_result.h", + "cryptauth_enrollment_scheduler.cc", + "cryptauth_enrollment_scheduler.h", "cryptauth_gcm_manager.cc", "cryptauth_gcm_manager.h", "cryptauth_gcm_manager_impl.cc", @@ -36,10 +38,21 @@ static_library("device_sync") { "cryptauth_key.h", "cryptauth_key_bundle.cc", "cryptauth_key_bundle.h", + "cryptauth_key_creator.cc", + "cryptauth_key_creator.h", + "cryptauth_key_creator_impl.cc", + "cryptauth_key_creator_impl.h", + "cryptauth_key_proof_computer.h", + "cryptauth_key_proof_computer_impl.cc", + "cryptauth_key_proof_computer_impl.h", "cryptauth_key_registry.cc", "cryptauth_key_registry.h", "cryptauth_key_registry_impl.cc", "cryptauth_key_registry_impl.h", + "cryptauth_v2_enroller.cc", + "cryptauth_v2_enroller.h", + "cryptauth_v2_enroller_impl.cc", + "cryptauth_v2_enroller_impl.h", "device_sync_base.cc", "device_sync_base.h", "device_sync_impl.cc", @@ -48,8 +61,12 @@ static_library("device_sync") { "device_sync_service.h", "device_sync_type_converters.cc", "device_sync_type_converters.h", + "network_aware_enrollment_scheduler.cc", + "network_aware_enrollment_scheduler.h", "network_request_error.cc", "network_request_error.h", + "persistent_enrollment_scheduler.cc", + "persistent_enrollment_scheduler.h", "pref_names.cc", "pref_names.h", "remote_device_loader.cc", @@ -81,6 +98,7 @@ static_library("device_sync") { "//base", "//chromeos/components/multidevice", "//chromeos/components/multidevice/logging", + "//chromeos/network", "//chromeos/services/device_sync/proto:util", "//chromeos/services/device_sync/public/cpp", "//chromeos/services/device_sync/public/mojom", @@ -99,11 +117,6 @@ static_library("device_sync") { ] } -service_manifest("manifest") { - name = "device_sync" - source = "manifest.json" -} - static_library("test_support") { testonly = true @@ -112,8 +125,14 @@ static_library("test_support") { "fake_cryptauth_device_manager.h", "fake_cryptauth_enrollment_manager.cc", "fake_cryptauth_enrollment_manager.h", + "fake_cryptauth_enrollment_scheduler.cc", + "fake_cryptauth_enrollment_scheduler.h", "fake_cryptauth_gcm_manager.cc", "fake_cryptauth_gcm_manager.h", + "fake_cryptauth_key_creator.cc", + "fake_cryptauth_key_creator.h", + "fake_cryptauth_key_proof_computer.cc", + "fake_cryptauth_key_proof_computer.h", "fake_device_sync.cc", "fake_device_sync.h", "fake_device_sync_observer.cc", @@ -153,9 +172,14 @@ source_set("unit_tests") { "cryptauth_enrollment_manager_impl_unittest.cc", "cryptauth_gcm_manager_impl_unittest.cc", "cryptauth_key_bundle_unittest.cc", + "cryptauth_key_creator_impl_unittest.cc", + "cryptauth_key_proof_computer_impl_unittest.cc", "cryptauth_key_registry_impl_unittest.cc", "cryptauth_key_unittest.cc", + "cryptauth_v2_enroller_impl_unittest.cc", "device_sync_service_unittest.cc", + "network_aware_enrollment_scheduler_unittest.cc", + "persistent_enrollment_scheduler_unittest.cc", "remote_device_loader_unittest.cc", "remote_device_provider_impl_unittest.cc", "software_feature_manager_impl_unittest.cc", @@ -170,6 +194,8 @@ source_set("unit_tests") { "//chromeos/components/multidevice", "//chromeos/components/multidevice:test_support", "//chromeos/dbus:test_support", + "//chromeos/network", + "//chromeos/network:test_support", "//chromeos/services/device_sync/proto:util", "//chromeos/services/device_sync/public/cpp:test_support", "//chromeos/services/device_sync/public/cpp:unit_tests", diff --git a/chromium/chromeos/services/device_sync/public/cpp/BUILD.gn b/chromium/chromeos/services/device_sync/public/cpp/BUILD.gn index ca926ff6b24..ebf7cbec9b0 100644 --- a/chromium/chromeos/services/device_sync/public/cpp/BUILD.gn +++ b/chromium/chromeos/services/device_sync/public/cpp/BUILD.gn @@ -4,11 +4,14 @@ source_set("cpp") { sources = [ + "client_app_metadata_provider.h", "cryptauth_device_id_provider.h", "device_sync_client.cc", "device_sync_client.h", "device_sync_client_impl.cc", "device_sync_client_impl.h", + "gcm_constants.cc", + "gcm_constants.h", "gcm_device_info_provider.h", ] @@ -68,3 +71,17 @@ source_set("unit_tests") { "//testing/gtest", ] } + +source_set("manifest") { + sources = [ + "manifest.cc", + "manifest.h", + ] + + deps = [ + "//base", + "//chromeos/services/device_sync/public/mojom", + "//services/preferences/public/mojom", + "//services/service_manager/public/cpp", + ] +} diff --git a/chromium/chromeos/services/ime/BUILD.gn b/chromium/chromeos/services/ime/BUILD.gn index 1b8d048bb89..9ff04eebb6a 100644 --- a/chromium/chromeos/services/ime/BUILD.gn +++ b/chromium/chromeos/services/ime/BUILD.gn @@ -3,7 +3,6 @@ # found in the LICENSE file. import("//chromeos/services/ime/public/features.gni") -import("//services/service_manager/public/service_manifest.gni") assert(is_chromeos, "Non-ChromeOS builds cannot depend on //chromeos") @@ -26,6 +25,7 @@ source_set("lib") { if (enable_cros_ime_decoder) { sources += [ + "//chromeos/services/ime/public/cpp/shared_lib:interfaces", "decoder/decoder_engine.cc", "decoder/decoder_engine.h", ] @@ -45,11 +45,6 @@ source_set("sandbox_hook") { ] } -service_manifest("manifest") { - name = "ime" - source = "manifest.json" -} - source_set("unit_tests") { testonly = true deps = [ @@ -65,6 +60,7 @@ source_set("services_unittests") { "//base/test:test_support", "//chromeos/services/ime/public/mojom", "//mojo/public/cpp/bindings", + "//services/network:test_support", "//services/service_manager/public/cpp", "//services/service_manager/public/cpp/test:test_support", "//testing/gmock", diff --git a/chromium/chromeos/services/ime/public/cpp/BUILD.gn b/chromium/chromeos/services/ime/public/cpp/BUILD.gn index 0a8d0208379..c8c17bf2e46 100644 --- a/chromium/chromeos/services/ime/public/cpp/BUILD.gn +++ b/chromium/chromeos/services/ime/public/cpp/BUILD.gn @@ -106,3 +106,16 @@ source_set("rulebased_unit_tests") { "rulebased/rulebased_unittest.cc", ] } + +source_set("manifest") { + sources = [ + "manifest.cc", + "manifest.h", + ] + + deps = [ + "//base", + "//chromeos/services/ime/public/mojom", + "//services/service_manager/public/cpp", + ] +} diff --git a/chromium/chromeos/services/ime/public/cpp/shared_lib/BUILD.gn b/chromium/chromeos/services/ime/public/cpp/shared_lib/BUILD.gn new file mode 100644 index 00000000000..d84e1d24d61 --- /dev/null +++ b/chromium/chromeos/services/ime/public/cpp/shared_lib/BUILD.gn @@ -0,0 +1,9 @@ +# Copyright 2019 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. + +source_set("interfaces") { + sources = [ + "interfaces.h", + ] +} diff --git a/chromium/chromeos/services/media_perception/public/mojom/media_perception_service.mojom b/chromium/chromeos/services/media_perception/public/mojom/media_perception_service.mojom index 12151a5d6ce..4ac06df4618 100644 --- a/chromium/chromeos/services/media_perception/public/mojom/media_perception_service.mojom +++ b/chromium/chromeos/services/media_perception/public/mojom/media_perception_service.mojom @@ -7,7 +7,7 @@ module chromeos.media_perception.mojom; import "chromeos/services/media_perception/public/mojom/media_perception.mojom"; -import "services/video_capture/public/mojom/device_factory.mojom"; +import "services/video_capture/public/mojom/video_source_provider.mojom"; // Used to establish two-way communication between a client and the media // perception service. @@ -24,6 +24,7 @@ interface MediaPerceptionController { interface MediaPerceptionControllerClient { // Interface for the service to connect to the Video Capture Service // directly via a Mojo pipe set up through a DeviceFactory request. - ConnectToVideoCaptureService@0(video_capture.mojom.DeviceFactory& request); + ConnectToVideoCaptureService@0( + video_capture.mojom.VideoSourceProvider& request); }; diff --git a/chromium/chromeos/services/multidevice_setup/BUILD.gn b/chromium/chromeos/services/multidevice_setup/BUILD.gn index 326660f3e29..256bdf6825d 100644 --- a/chromium/chromeos/services/multidevice_setup/BUILD.gn +++ b/chromium/chromeos/services/multidevice_setup/BUILD.gn @@ -2,8 +2,6 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//services/service_manager/public/service_manifest.gni") - assert(is_chromeos, "Non-ChromeOS builds cannot depend on //chromeos") static_library("multidevice_setup") { @@ -83,11 +81,6 @@ static_library("multidevice_setup") { ] } -service_manifest("manifest") { - name = "multidevice_setup" - source = "manifest.json" -} - static_library("test_support") { testonly = true diff --git a/chromium/chromeos/services/multidevice_setup/public/cpp/BUILD.gn b/chromium/chromeos/services/multidevice_setup/public/cpp/BUILD.gn index d26bd575950..835cd92d689 100644 --- a/chromium/chromeos/services/multidevice_setup/public/cpp/BUILD.gn +++ b/chromium/chromeos/services/multidevice_setup/public/cpp/BUILD.gn @@ -155,3 +155,16 @@ source_set("unit_tests") { "//testing/gtest", ] } + +source_set("manifest") { + sources = [ + "manifest.cc", + "manifest.h", + ] + + deps = [ + "//base", + "//chromeos/services/multidevice_setup/public/mojom", + "//services/service_manager/public/cpp", + ] +} diff --git a/chromium/chromeos/services/secure_channel/BUILD.gn b/chromium/chromeos/services/secure_channel/BUILD.gn index 7c66b2bb782..1aa62e7a505 100644 --- a/chromium/chromeos/services/secure_channel/BUILD.gn +++ b/chromium/chromeos/services/secure_channel/BUILD.gn @@ -2,8 +2,6 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//services/service_manager/public/service_manifest.gni") - assert(is_chromeos, "Non-ChromeOS builds cannot depend on //chromeos") static_library("secure_channel") { @@ -174,11 +172,6 @@ static_library("secure_channel") { ] } -service_manifest("manifest") { - name = "secure_channel" - source = "manifest.json" -} - static_library("test_support") { testonly = true diff --git a/chromium/chromeos/services/secure_channel/public/cpp/BUILD.gn b/chromium/chromeos/services/secure_channel/public/cpp/BUILD.gn new file mode 100644 index 00000000000..86f43e620b4 --- /dev/null +++ b/chromium/chromeos/services/secure_channel/public/cpp/BUILD.gn @@ -0,0 +1,16 @@ +# Copyright 2019 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. + +source_set("manifest") { + sources = [ + "manifest.cc", + "manifest.h", + ] + + deps = [ + "//base", + "//chromeos/services/secure_channel/public/mojom", + "//services/service_manager/public/cpp", + ] +} diff --git a/chromium/chromeos/settings/BUILD.gn b/chromium/chromeos/settings/BUILD.gn index a527b563bb7..12d1ff9f4ed 100644 --- a/chromium/chromeos/settings/BUILD.gn +++ b/chromium/chromeos/settings/BUILD.gn @@ -11,7 +11,7 @@ component("settings") { deps = [ "//base", "//base:i18n", - "//chromeos:chromeos_constants", + "//chromeos/constants", "//chromeos/login/login_state", "//third_party/icu", ] @@ -36,7 +36,6 @@ source_set("unit_tests") { "//base", "//base:i18n", "//base/test:test_support", - "//chromeos:chromeos_constants", "//testing/gmock", "//testing/gtest", "//third_party/icu", diff --git a/chromium/chromeos/tpm/BUILD.gn b/chromium/chromeos/tpm/BUILD.gn index 2956e3bc1aa..2b5de0f2318 100644 --- a/chromium/chromeos/tpm/BUILD.gn +++ b/chromium/chromeos/tpm/BUILD.gn @@ -13,6 +13,7 @@ component("tpm") { "//chromeos/cryptohome", "//chromeos/dbus", "//chromeos/dbus:cryptohome_proto", + "//chromeos/dbus/constants", "//chromeos/login/login_state", "//components/account_id", "//components/policy/core/common:common_constants", @@ -37,10 +38,10 @@ source_set("unit_tests") { deps = [ ":tpm", "//base/test:test_support", - "//chromeos:chromeos_constants", "//chromeos/cryptohome:test_support", "//chromeos/dbus:cryptohome_proto", "//chromeos/dbus:test_support", + "//chromeos/dbus/constants", "//components/policy/proto", "//google_apis", "//testing/gtest", |