Update to new stable branch 1750

This also includes an updated ninja and chromium dependencies
needed on Windows.

Change-Id: Icd597d80ed3fa4425933c9f1334c3c2e31291c42
Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu>
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>

1 files changed, 75 insertions, 91 deletions

diff --git a/chromium/chromeos/chromeos.gyp b/chromium/chromeos/chromeos.gyp
index 3dc7a825fd5..635c705ca1b 100644
--- a/chromium/chromeos/chromeos.gyp
+++ b/chromium/chromeos/chromeos.gyp
@@ -17,6 +17,7 @@
       'dependencies': [
         '../base/base.gyp:base',
         '../base/base.gyp:base_prefs',
+        '../components/components.gyp:onc_component',
         '../crypto/crypto.gyp:crypto',
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../build/linux/system.gyp:dbus',
@@ -42,6 +43,7 @@
         'audio/cras_audio_handler.h',
         'audio/audio_devices_pref_handler_stub.cc',
         'audio/audio_devices_pref_handler_stub.h',
+        'audio/chromeos_sounds.h',
         'attestation/attestation_constants.cc',
         'attestation/attestation_constants.h',
         'attestation/attestation_flow.cc',
@@ -57,8 +59,10 @@
         'chromeos_switches.h',
         'cryptohome/async_method_caller.cc',
         'cryptohome/async_method_caller.h',
-        'cryptohome/cryptohome_library.cc',
-        'cryptohome/cryptohome_library.h',
+        'cryptohome/cryptohome_util.cc',
+        'cryptohome/cryptohome_util.h',
+        'cryptohome/system_salt_getter.cc',
+        'cryptohome/system_salt_getter.h',
         'dbus/audio_node.cc',
         'dbus/audio_node.h',
         'dbus/blocking_method_caller.cc',
@@ -85,9 +89,8 @@
         'dbus/cros_disks_client.h',
         'dbus/cryptohome_client.cc',
         'dbus/cryptohome_client.h',
-        'dbus/cryptohome_client_stub.cc',
-        'dbus/cryptohome_client_stub.h',
         'dbus/dbus_client_implementation_type.h',
+        'dbus/dbus_method_call_status.cc',
         'dbus/dbus_method_call_status.h',
         'dbus/dbus_thread_manager.cc',
         'dbus/dbus_thread_manager.h',
@@ -107,57 +110,76 @@
         'dbus/fake_bluetooth_profile_manager_client.h',
         'dbus/fake_bluetooth_profile_service_provider.cc',
         'dbus/fake_bluetooth_profile_service_provider.h',
+        'dbus/fake_cryptohome_client.cc',
+        'dbus/fake_cryptohome_client.h',
+        'dbus/fake_dbus_thread_manager.cc',
+        'dbus/fake_dbus_thread_manager.h',
+        'dbus/fake_debug_daemon_client.cc',
+        'dbus/fake_debug_daemon_client.h',
         'dbus/fake_gsm_sms_client.cc',
         'dbus/fake_gsm_sms_client.h',
+        'dbus/fake_introspectable_client.cc',
+        'dbus/fake_introspectable_client.h',
+        'dbus/fake_modem_messaging_client.cc',
+        'dbus/fake_modem_messaging_client.h',
+        'dbus/fake_nfc_adapter_client.cc',
+        'dbus/fake_nfc_adapter_client.h',
+        'dbus/fake_nfc_device_client.cc',
+        'dbus/fake_nfc_device_client.h',
+        'dbus/fake_nfc_manager_client.cc',
+        'dbus/fake_nfc_manager_client.h',
+        'dbus/fake_nfc_record_client.cc',
+        'dbus/fake_nfc_record_client.h',
+        'dbus/fake_nfc_tag_client.cc',
+        'dbus/fake_nfc_tag_client.h',
         'dbus/fake_image_burner_client.cc',
         'dbus/fake_image_burner_client.h',
+        'dbus/fake_permission_broker_client.cc',
+        'dbus/fake_permission_broker_client.h',
+        'dbus/fake_shill_device_client.cc',
+        'dbus/fake_shill_device_client.h',
+        'dbus/fake_shill_ipconfig_client.cc',
+        'dbus/fake_shill_ipconfig_client.h',
+        'dbus/fake_shill_manager_client.cc',
+        'dbus/fake_shill_manager_client.h',
+        'dbus/fake_shill_profile_client.cc',
+        'dbus/fake_shill_profile_client.h',
+        'dbus/fake_shill_service_client.cc',
+        'dbus/fake_shill_service_client.h',
+        'dbus/fake_sms_client.cc',
+        'dbus/fake_sms_client.h',
         'dbus/fake_system_clock_client.cc',
         'dbus/fake_system_clock_client.h',
         'dbus/gsm_sms_client.cc',
         'dbus/gsm_sms_client.h',
+        'dbus/nfc_adapter_client.cc',
+        'dbus/nfc_adapter_client.h',
+        'dbus/nfc_client_helpers.cc',
+        'dbus/nfc_client_helpers.h',
+        'dbus/nfc_device_client.cc',
+        'dbus/nfc_device_client.h',
+        'dbus/nfc_manager_client.cc',
+        'dbus/nfc_manager_client.h',
+        'dbus/nfc_property_set.cc',
+        'dbus/nfc_property_set.h',
+        'dbus/nfc_record_client.cc',
+        'dbus/nfc_record_client.h',
+        'dbus/nfc_tag_client.cc',
+        'dbus/nfc_tag_client.h',
         'dbus/shill_client_helper.cc',
         'dbus/shill_client_helper.h',
         'dbus/shill_device_client.cc',
         'dbus/shill_device_client.h',
-        'dbus/shill_device_client_stub.cc',
-        'dbus/shill_device_client_stub.h',
         'dbus/shill_ipconfig_client.cc',
         'dbus/shill_ipconfig_client.h',
-        'dbus/shill_ipconfig_client_stub.cc',
-        'dbus/shill_ipconfig_client_stub.h',
         'dbus/shill_manager_client.cc',
         'dbus/shill_manager_client.h',
-        'dbus/shill_manager_client_stub.cc',
-        'dbus/shill_manager_client_stub.h',
         'dbus/shill_profile_client.cc',
         'dbus/shill_profile_client.h',
-        'dbus/shill_profile_client_stub.cc',
-        'dbus/shill_profile_client_stub.h',
         'dbus/shill_service_client.cc',
         'dbus/shill_service_client.h',
-        'dbus/shill_service_client_stub.cc',
-        'dbus/shill_service_client_stub.h',
         'dbus/shill_stub_helper.cc',
         'dbus/shill_stub_helper.h',
-        'dbus/ibus/ibus_client.cc',
-        'dbus/ibus/ibus_client.h',
-        'dbus/ibus/ibus_component.cc',
-        'dbus/ibus/ibus_component.h',
-        'dbus/ibus/ibus_constants.h',
-        'dbus/ibus/ibus_engine_service.cc',
-        'dbus/ibus/ibus_engine_service.h',
-        'dbus/ibus/ibus_engine_factory_service.cc',
-        'dbus/ibus/ibus_engine_factory_service.h',
-        'dbus/ibus/ibus_lookup_table.cc',
-        'dbus/ibus/ibus_lookup_table.h',
-        'dbus/ibus/ibus_object.cc',
-        'dbus/ibus/ibus_object.h',
-        'dbus/ibus/ibus_property.cc',
-        'dbus/ibus/ibus_property.h',
-        'dbus/ibus/ibus_text.cc',
-        'dbus/ibus/ibus_text.h',
-        'dbus/ibus/ibus_input_context_client.cc',
-        'dbus/ibus/ibus_input_context_client.h',
         'dbus/image_burner_client.cc',
         'dbus/image_burner_client.h',
         'dbus/introspectable_client.cc',
@@ -188,18 +210,16 @@
         'display/output_util.h',
         'display/real_output_configurator_delegate.cc',
         'display/real_output_configurator_delegate.h',
+        'ime/candidate_window.cc',
+        'ime/candidate_window.h',
         'ime/component_extension_ime_manager.cc',
         'ime/component_extension_ime_manager.h',
         'ime/extension_ime_util.cc',
         'ime/extension_ime_util.h',
-        'ime/ibus_bridge.cc',
-        'ime/ibus_bridge.h',
-        'ime/ibus_daemon_controller.cc',
-        'ime/ibus_daemon_controller.h',
         'ime/ibus_keymap.cc',
         'ime/ibus_keymap.h',
-        'ime/input_method_config.cc',
-        'ime/input_method_config.h',
+        'ime/ibus_text.cc',
+        'ime/ibus_text.h',
         'ime/input_method_delegate.h',
         'ime/input_method_descriptor.cc',
         'ime/input_method_descriptor.h',
@@ -273,8 +293,6 @@
         'network/onc/onc_certificate_importer.h',
         'network/onc/onc_certificate_importer_impl.cc',
         'network/onc/onc_certificate_importer_impl.h',
-        'network/onc/onc_constants.cc',
-        'network/onc/onc_constants.h',
         'network/onc/onc_mapper.cc',
         'network/onc/onc_mapper.h',
         'network/onc/onc_merger.cc',
@@ -308,8 +326,16 @@
         'process_proxy/process_proxy.h',
         'process_proxy/process_proxy_registry.cc',
         'process_proxy/process_proxy_registry.h',
+        'settings/cros_settings_names.cc',
+        'settings/cros_settings_names.h',
+        'settings/cros_settings_provider.cc',
+        'settings/cros_settings_provider.h',
+        'settings/timezone_settings.cc',
+        'settings/timezone_settings.h',
         'system/name_value_pairs_parser.cc',
         'system/name_value_pairs_parser.h',
+        'system/statistics_provider.cc',
+        'system/statistics_provider.h',
       ],
       'conditions': [
         ['use_x11 == 1', {
@@ -359,28 +385,16 @@
         'chromeos_test_utils.h',
         'cryptohome/mock_async_method_caller.cc',
         'cryptohome/mock_async_method_caller.h',
-        'cryptohome/mock_cryptohome_library.cc',
-        'cryptohome/mock_cryptohome_library.h',
         'dbus/mock_cryptohome_client.cc',
         'dbus/mock_cryptohome_client.h',
-        'dbus/mock_dbus_thread_manager.cc',
-        'dbus/mock_dbus_thread_manager.h',
-        'dbus/mock_gsm_sms_client.cc',
-        'dbus/mock_gsm_sms_client.h',
         'dbus/mock_session_manager_client.cc',
         'dbus/mock_session_manager_client.h',
-        'dbus/mock_shill_device_client.cc',
-        'dbus/mock_shill_device_client.h',
-        'dbus/mock_shill_ipconfig_client.cc',
-        'dbus/mock_shill_ipconfig_client.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/shill_profile_client_stub.cc',
-        'dbus/shill_profile_client_stub.h',
         'disks/mock_disk_mount_manager.cc',
         'disks/mock_disk_mount_manager.h',
         'ime/mock_component_extension_ime_manager_delegate.cc',
@@ -391,6 +405,8 @@
         'network/onc/mock_certificate_importer.h',
         'network/onc/onc_test_utils.cc',
         'network/onc/onc_test_utils.h',
+        'system/mock_statistics_provider.cc',
+        'system/mock_statistics_provider.h',
       ],
       'include_dirs': [
         '..',
@@ -401,6 +417,7 @@
       'type': 'static_library',
       'dependencies': [
         '../build/linux/system.gyp:dbus',
+        '../crypto/crypto.gyp:crypto',
         '../dbus/dbus.gyp:dbus',
         'chromeos',
         'power_manager_proto',
@@ -408,46 +425,16 @@
       'sources': [
         'dbus/fake_cros_disks_client.cc',
         'dbus/fake_cros_disks_client.h',
-        'dbus/fake_cryptohome_client.cc',
-        'dbus/fake_cryptohome_client.h',
-        'dbus/fake_gsm_sms_client.cc',
-        'dbus/fake_gsm_sms_client.h',
-        'dbus/fake_image_burner_client.cc',
-        'dbus/fake_image_burner_client.h',
         'dbus/fake_power_manager_client.cc',
         'dbus/fake_power_manager_client.h',
         'dbus/fake_session_manager_client.cc',
         'dbus/fake_session_manager_client.h',
-        'dbus/fake_shill_device_client.cc',
-        'dbus/fake_shill_device_client.h',
         'dbus/fake_shill_manager_client.cc',
         'dbus/fake_shill_manager_client.h',
-        'dbus/fake_system_clock_client.cc',
-        'dbus/fake_system_clock_client.h',
         'dbus/fake_update_engine_client.cc',
         'dbus/fake_update_engine_client.h',
-        'dbus/mock_dbus_thread_manager_without_gmock.cc',
-        'dbus/mock_dbus_thread_manager_without_gmock.h',
-        'dbus/ibus/mock_ibus_client.cc',
-        'dbus/ibus/mock_ibus_client.h',
-        'dbus/ibus/mock_ibus_input_context_client.cc',
-        'dbus/ibus/mock_ibus_input_context_client.h',
-        'dbus/ibus/mock_ibus_engine_factory_service.cc',
-        'dbus/ibus/mock_ibus_engine_factory_service.h',
-        'dbus/ibus/mock_ibus_engine_service.cc',
-        'dbus/ibus/mock_ibus_engine_service.h',
         'ime/fake_input_method_delegate.cc',
         'ime/fake_input_method_delegate.h',
-        'ime/mock_ibus_daemon_controller.cc',
-        'ime/mock_ibus_daemon_controller.h',
-        'ime/mock_ime_candidate_window_handler.cc',
-        'ime/mock_ime_candidate_window_handler.h',
-        'ime/mock_ime_engine_handler.cc',
-        'ime/mock_ime_engine_handler.h',
-        'ime/mock_ime_input_context_handler.cc',
-        'ime/mock_ime_input_context_handler.h',
-        'ime/mock_ime_property_handler.cc',
-        'ime/mock_ime_property_handler.h',
         'ime/mock_xkeyboard.cc',
         'ime/mock_xkeyboard.h',
       ],
@@ -463,6 +450,7 @@
         '../base/base.gyp:test_support_base',
         '../build/linux/system.gyp:dbus',
         '../build/linux/system.gyp:ssl',
+        '../components/components.gyp:onc_component',
         '../crypto/crypto.gyp:crypto',
         '../dbus/dbus.gyp:dbus_test_support',
         '../net/net.gyp:net',
@@ -477,19 +465,13 @@
         'app_mode/kiosk_oem_manifest_parser_unittest.cc',
         'attestation/attestation_flow_unittest.cc',
         'audio/cras_audio_handler_unittest.cc',
+        'cryptohome/system_salt_getter_unittest.cc',
         'dbus/blocking_method_caller_unittest.cc',
         'dbus/cros_disks_client_unittest.cc',
         'dbus/gsm_sms_client_unittest.cc',
-        'dbus/ibus/ibus_client_unittest.cc',
-        'dbus/ibus/ibus_component_unittest.cc',
-        'dbus/ibus/ibus_engine_factory_service_unittest.cc',
-        'dbus/ibus/ibus_input_context_client_unittest.cc',
-        'dbus/ibus/ibus_lookup_table_unittest.cc',
-        'dbus/ibus/ibus_object_unittest.cc',
-        'dbus/ibus/ibus_property_unittest.cc',
-        'dbus/ibus/ibus_text_unittest.cc',
         'dbus/introspectable_client_unittest.cc',
         'dbus/modem_messaging_client_unittest.cc',
+        'dbus/nfc_client_unittest.cc',
         'dbus/power_policy_controller_unittest.cc',
         'dbus/shill_client_unittest_base.cc',
         'dbus/shill_client_unittest_base.h',
@@ -501,8 +483,10 @@
         'disks/disk_mount_manager_unittest.cc',
         'display/output_configurator_unittest.cc',
         'display/output_util_unittest.cc',
+        'ime/candidate_window_unittest.cc',
         'ime/component_extension_ime_manager_unittest.cc',
         'ime/extension_ime_util_unittest.cc',
+        'ime/ibus_text_unittest.cc',
         'ime/input_method_manager.h',
         'ime/input_method_property_unittest.cc',
         'ime/input_method_whitelist_unittest.cc',