diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-01-29 16:35:13 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-02-01 15:33:35 +0000 |
commit | c8c2d1901aec01e934adf561a9fdf0cc776cdef8 (patch) | |
tree | 9157c3d9815e5870799e070b113813bec53e0535 /chromium/chromeos | |
parent | abefd5095b41dac94ca451d784ab6e27372e981a (diff) | |
download | qtwebengine-chromium-c8c2d1901aec01e934adf561a9fdf0cc776cdef8.tar.gz |
BASELINE: Update Chromium to 64.0.3282.139
Change-Id: I1cae68fe9c94ff7608b26b8382fc19862cdb293a
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/chromeos')
-rw-r--r-- | chromium/chromeos/BUILD.gn | 27 | ||||
-rw-r--r-- | chromium/chromeos/components/tether/BUILD.gn | 11 |
2 files changed, 33 insertions, 5 deletions
diff --git a/chromium/chromeos/BUILD.gn b/chromium/chromeos/BUILD.gn index 2ed5f54af50..2e794264aa6 100644 --- a/chromium/chromeos/BUILD.gn +++ b/chromium/chromeos/BUILD.gn @@ -26,10 +26,10 @@ component("chromeos") { ":login_manager_proto", ":media_perception_proto", ":power_manager_proto", + ":smbprovider_proto", "//base", "//base:i18n", "//base/third_party/dynamic_annotations", - "//chrome/browser/chromeos:device_policy_proto", "//components/device_event_log", "//components/onc", "//components/policy:cloud_policy_proto_generated_compile", @@ -64,8 +64,6 @@ component("chromeos") { "attestation/attestation_constants.h", "attestation/attestation_flow.cc", "attestation/attestation_flow.h", - "audio/audio_a11y_controller.cc", - "audio/audio_a11y_controller.h", "audio/audio_device.cc", "audio/audio_device.h", "audio/audio_devices_pref_handler.h", @@ -209,6 +207,8 @@ component("chromeos") { "dbus/fake_shill_service_client.h", "dbus/fake_shill_third_party_vpn_driver_client.cc", "dbus/fake_shill_third_party_vpn_driver_client.h", + "dbus/fake_smb_provider_client.cc", + "dbus/fake_smb_provider_client.h", "dbus/fake_sms_client.cc", "dbus/fake_sms_client.h", "dbus/fake_system_clock_client.cc", @@ -267,6 +267,8 @@ component("chromeos") { "dbus/shill_service_client.h", "dbus/shill_third_party_vpn_driver_client.cc", "dbus/shill_third_party_vpn_driver_client.h", + "dbus/smb_provider_client.cc", + "dbus/smb_provider_client.h", "dbus/sms_client.cc", "dbus/sms_client.h", "dbus/system_clock_client.cc", @@ -450,6 +452,8 @@ component("chromeos") { "network/tether_constants.h", "printing/ppd_cache.cc", "printing/ppd_cache.h", + "printing/ppd_line_reader.cc", + "printing/ppd_line_reader.h", "printing/ppd_provider.cc", "printing/ppd_provider.h", "printing/printer_configuration.cc", @@ -555,8 +559,6 @@ static_library("test_support") { "cryptohome/mock_homedir_methods.h", "dbus/biod/test_utils.cc", "dbus/biod/test_utils.h", - "dbus/mock_lorgnette_manager_client.cc", - "dbus/mock_lorgnette_manager_client.h", "dbus/mock_shill_manager_client.cc", "dbus/mock_shill_manager_client.h", "dbus/mock_shill_profile_client.cc", @@ -623,10 +625,12 @@ test("chromeos_unittests") { ] deps = [ ":attestation_proto", + ":authpolicy_proto", ":biod_proto", ":cryptohome_proto", ":power_manager_proto", ":test_support", + ":test_support_without_gmock", "//base/test:run_all_unittests", "//base/test:test_support", "//components/onc", @@ -665,6 +669,7 @@ test("chromeos_unittests") { "dbus/fake_power_manager_client_unittest.cc", "dbus/gsm_sms_client_unittest.cc", "dbus/modem_messaging_client_unittest.cc", + "dbus/pipe_reader_unittest.cc", "dbus/power_manager_client_unittest.cc", "dbus/power_policy_controller_unittest.cc", "dbus/services/cros_dbus_service_unittest.cc", @@ -680,6 +685,7 @@ test("chromeos_unittests") { "disks/disk_mount_manager_unittest.cc", "disks/suspend_unmount_manager_unittest.cc", "geolocation/simple_geolocation_unittest.cc", + "login/auth/authpolicy_login_helper_unittest.cc", "login/auth/key_unittest.cc", "login/login_state_unittest.cc", "network/auto_connect_handler_unittest.cc", @@ -711,6 +717,7 @@ test("chromeos_unittests") { "network/proxy/proxy_config_service_impl_unittest.cc", "network/shill_property_handler_unittest.cc", "printing/ppd_cache_unittest.cc", + "printing/ppd_line_reader_unittest.cc", "printing/ppd_provider_unittest.cc", "printing/printer_translator_unittest.cc", "process_proxy/process_output_watcher_unittest.cc", @@ -746,6 +753,7 @@ test("chromeos_unittests") { proto_library("power_manager_proto") { sources = [ + "//third_party/cros_system_api/dbus/power_manager/idle.proto", "//third_party/cros_system_api/dbus/power_manager/input_event.proto", "//third_party/cros_system_api/dbus/power_manager/peripheral_battery_status.proto", "//third_party/cros_system_api/dbus/power_manager/policy.proto", @@ -769,6 +777,7 @@ proto_library("cryptohome_proto") { proto_library("login_manager_proto") { sources = [ "//third_party/cros_system_api/dbus/login_manager/arc.proto", + "//third_party/cros_system_api/dbus/login_manager/policy_descriptor.proto", ] proto_out_dir = "chromeos/dbus/login_manager" @@ -814,3 +823,11 @@ proto_library("media_perception_proto") { proto_out_dir = "chromeos/media_perception" } + +proto_library("smbprovider_proto") { + sources = [ + "//third_party/cros_system_api/dbus/smbprovider/directory_entry.proto", + ] + + proto_out_dir = "chromeos/dbus/smbprovider" +} diff --git a/chromium/chromeos/components/tether/BUILD.gn b/chromium/chromeos/components/tether/BUILD.gn index 7d9fbb0d9f8..803cd50c5c2 100644 --- a/chromium/chromeos/components/tether/BUILD.gn +++ b/chromium/chromeos/components/tether/BUILD.gn @@ -10,6 +10,10 @@ static_library("tether") { "active_host.h", "active_host_network_state_updater.cc", "active_host_network_state_updater.h", + "ad_hoc_ble_advertiser.cc", + "ad_hoc_ble_advertiser.h", + "ad_hoc_ble_advertiser_impl.cc", + "ad_hoc_ble_advertiser_impl.h", "asynchronous_shutdown_object_container.h", "asynchronous_shutdown_object_container_impl.cc", "asynchronous_shutdown_object_container_impl.h", @@ -127,6 +131,7 @@ static_library("tether") { "//chromeos/components/tether/proto", "//components/cryptauth", "//components/cryptauth/ble", + "//components/pref_registry", "//components/prefs", "//components/proximity_auth/logging", "//components/signin/core/browser", @@ -146,6 +151,8 @@ static_library("test_support") { sources = [ "fake_active_host.cc", "fake_active_host.h", + "fake_ad_hoc_ble_advertiser.cc", + "fake_ad_hoc_ble_advertiser.h", "fake_asynchronous_shutdown_object_container.cc", "fake_asynchronous_shutdown_object_container.h", "fake_ble_advertiser.cc", @@ -204,6 +211,7 @@ static_library("test_support") { "//chromeos/components/tether/proto", "//components/cryptauth", "//components/cryptauth:test_support", + "//components/cryptauth/ble:test_support", "//device/bluetooth", "//testing/gmock", "//testing/gtest", @@ -217,6 +225,7 @@ source_set("unit_tests") { sources = [ "active_host_network_state_updater_unittest.cc", "active_host_unittest.cc", + "ad_hoc_ble_advertiser_impl_unittest.cc", "asynchronous_shutdown_object_container_impl_unittest.cc", "ble_advertisement_device_queue_unittest.cc", "ble_advertiser_impl_unittest.cc", @@ -266,8 +275,10 @@ source_set("unit_tests") { "//components/cryptauth", "//components/cryptauth:test_support", "//components/cryptauth/ble", + "//components/cryptauth/ble:test_support", "//components/prefs:test_support", "//components/signin/core/browser:test_support", + "//components/sync_preferences:test_support", "//device/bluetooth", "//device/bluetooth:mocks", "//testing/gmock", |