summaryrefslogtreecommitdiff
path: root/chromium/chromeos
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2018-01-31 16:33:43 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2018-02-06 16:33:22 +0000
commitda51f56cc21233c2d30f0fe0d171727c3102b2e0 (patch)
tree4e579ab70ce4b19bee7984237f3ce05a96d59d83 /chromium/chromeos
parentc8c2d1901aec01e934adf561a9fdf0cc776cdef8 (diff)
downloadqtwebengine-chromium-da51f56cc21233c2d30f0fe0d171727c3102b2e0.tar.gz
BASELINE: Update Chromium to 65.0.3525.40
Also imports missing submodules Change-Id: I36901b7c6a325cda3d2c10cedb2186c25af3b79b Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/chromeos')
-rw-r--r--chromium/chromeos/BUILD.gn10
-rw-r--r--chromium/chromeos/components/tether/BUILD.gn19
2 files changed, 22 insertions, 7 deletions
diff --git a/chromium/chromeos/BUILD.gn b/chromium/chromeos/BUILD.gn
index 2e794264aa6..0659b2e5b42 100644
--- a/chromium/chromeos/BUILD.gn
+++ b/chromium/chromeos/BUILD.gn
@@ -32,6 +32,7 @@ component("chromeos") {
"//base/third_party/dynamic_annotations",
"//components/device_event_log",
"//components/onc",
+ "//components/password_manager/core/browser:hash_password_manager",
"//components/policy:cloud_policy_proto_generated_compile",
"//components/policy/proto",
"//components/pref_registry",
@@ -126,6 +127,8 @@ component("chromeos") {
"cryptohome/homedir_methods.h",
"cryptohome/system_salt_getter.cc",
"cryptohome/system_salt_getter.h",
+ "cryptohome/tpm_util.cc",
+ "cryptohome/tpm_util.h",
"dbus/arc_midis_client.cc",
"dbus/arc_midis_client.h",
"dbus/arc_obb_mounter_client.cc",
@@ -559,12 +562,6 @@ static_library("test_support") {
"cryptohome/mock_homedir_methods.h",
"dbus/biod/test_utils.cc",
"dbus/biod/test_utils.h",
- "dbus/mock_shill_manager_client.cc",
- "dbus/mock_shill_manager_client.h",
- "dbus/mock_shill_profile_client.cc",
- "dbus/mock_shill_profile_client.h",
- "dbus/mock_shill_service_client.cc",
- "dbus/mock_shill_service_client.h",
"dbus/services/service_provider_test_helper.cc",
"dbus/services/service_provider_test_helper.h",
"disks/mock_disk_mount_manager.cc",
@@ -602,6 +599,7 @@ static_library("test_support_without_gmock") {
":biod_proto",
":chromeos",
":cryptohome_proto",
+ ":login_manager_proto",
":power_manager_proto",
"//components/policy/proto",
"//crypto",
diff --git a/chromium/chromeos/components/tether/BUILD.gn b/chromium/chromeos/components/tether/BUILD.gn
index 803cd50c5c2..5a6595d9797 100644
--- a/chromium/chromeos/components/tether/BUILD.gn
+++ b/chromium/chromeos/components/tether/BUILD.gn
@@ -55,6 +55,10 @@ static_library("tether") {
"error_tolerant_ble_advertisement.h",
"error_tolerant_ble_advertisement_impl.cc",
"error_tolerant_ble_advertisement_impl.h",
+ "gms_core_notifications_state_tracker.cc",
+ "gms_core_notifications_state_tracker.h",
+ "gms_core_notifications_state_tracker_impl.cc",
+ "gms_core_notifications_state_tracker_impl.h",
"host_connection_metrics_logger.cc",
"host_connection_metrics_logger.h",
"host_scan_cache.cc",
@@ -71,6 +75,8 @@ static_library("tether") {
"host_scanner.h",
"host_scanner_operation.cc",
"host_scanner_operation.h",
+ "hotspot_usage_duration_tracker.cc",
+ "hotspot_usage_duration_tracker.h",
"keep_alive_operation.cc",
"keep_alive_operation.h",
"keep_alive_scheduler.cc",
@@ -112,10 +118,14 @@ static_library("tether") {
"tether_disconnector_impl.h",
"tether_host_fetcher.cc",
"tether_host_fetcher.h",
+ "tether_host_fetcher_impl.cc",
+ "tether_host_fetcher_impl.h",
"tether_host_response_recorder.cc",
"tether_host_response_recorder.h",
"tether_network_disconnection_handler.cc",
"tether_network_disconnection_handler.h",
+ "tether_session_completion_logger.cc",
+ "tether_session_completion_logger.h",
"timer_factory.cc",
"timer_factory.h",
"wifi_hotspot_connector.cc",
@@ -169,6 +179,8 @@ static_library("test_support") {
"fake_disconnect_tethering_request_sender.h",
"fake_error_tolerant_ble_advertisement.cc",
"fake_error_tolerant_ble_advertisement.h",
+ "fake_gms_core_notifications_state_tracker.cc",
+ "fake_gms_core_notifications_state_tracker.h",
"fake_host_scan_cache.cc",
"fake_host_scan_cache.h",
"fake_host_scan_scheduler.cc",
@@ -187,6 +199,8 @@ static_library("test_support") {
"fake_tether_disconnector.h",
"fake_tether_host_fetcher.cc",
"fake_tether_host_fetcher.h",
+ "fake_tether_session_completion_logger.cc",
+ "fake_tether_session_completion_logger.h",
"fake_wifi_hotspot_connector.cc",
"fake_wifi_hotspot_connector.h",
"fake_wifi_hotspot_disconnector.cc",
@@ -238,12 +252,14 @@ source_set("unit_tests") {
"disconnect_tethering_operation_unittest.cc",
"disconnect_tethering_request_sender_impl_unittest.cc",
"error_tolerant_ble_advertisement_impl_unittest.cc",
+ "gms_core_notifications_state_tracker_impl_unittest.cc",
"host_connection_metrics_logger_unittest.cc",
"host_scan_cache_unittest.cc",
"host_scan_device_prioritizer_impl_unittest.cc",
"host_scan_scheduler_impl_unittest.cc",
"host_scanner_operation_unittest.cc",
"host_scanner_unittest.cc",
+ "hotspot_usage_duration_tracker_unittest.cc",
"keep_alive_operation_unittest.cc",
"keep_alive_scheduler_unittest.cc",
"master_host_scan_cache_unittest.cc",
@@ -258,9 +274,10 @@ source_set("unit_tests") {
"tether_component_impl_unittest.cc",
"tether_connector_impl_unittest.cc",
"tether_disconnector_impl_unittest.cc",
- "tether_host_fetcher_unittest.cc",
+ "tether_host_fetcher_impl_unittest.cc",
"tether_host_response_recorder_unittest.cc",
"tether_network_disconnection_handler_unittest.cc",
+ "tether_session_completion_logger_unittest.cc",
"wifi_hotspot_connector_unittest.cc",
"wifi_hotspot_disconnector_impl_unittest.cc",
]