BASELINE: Update Chromium to 55.0.2883.105

And updates ninja to 1.7.2

Change-Id: I20d43c737f82764d857ada9a55586901b18b9243
Reviewed-by: Michael Brüning <michael.bruning@qt.io>

5 files changed, 48 insertions, 142 deletions

diff --git a/chromium/chromeos/BUILD.gn b/chromium/chromeos/BUILD.gn
index 9cdf567f071..95dd7f08c0b 100644
--- a/chromium/chromeos/BUILD.gn
+++ b/chromium/chromeos/BUILD.gn
@@ -24,6 +24,7 @@ component("chromeos") {
     "//dbus",
   ]
   deps = [
+    ":attestation_proto",
     ":cryptohome_proto",
     ":power_manager_proto",
     "//base",
@@ -52,7 +53,7 @@ component("chromeos") {
   }
 }
 
-# TYhis must be a static library instead of a source set because some of the
+# 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.
 #
 # TODO this should probably be changed such that it links in all cases and
@@ -61,6 +62,7 @@ static_library("test_support") {
   testonly = true
   configs += [ "//build/config/linux/dbus" ]
   public_deps = [
+    ":attestation_proto",
     ":chromeos",
     ":cryptohome_proto",
     ":power_manager_proto",
@@ -117,8 +119,6 @@ static_library("test_support") {
     "network/mock_network_device_handler.h",
     "network/onc/onc_test_utils.cc",
     "network/onc/onc_test_utils.h",
-    "system/fake_statistics_provider.cc",
-    "system/fake_statistics_provider.h",
   ]
 }
 
@@ -126,6 +126,7 @@ static_library("test_support_without_gmock") {
   testonly = true
   configs += [ "//build/config/linux/dbus" ]
   deps = [
+    ":attestation_proto",
     ":chromeos",
     ":cryptohome_proto",
     ":power_manager_proto",
@@ -149,6 +150,7 @@ test("chromeos_unittests") {
     "//third_party/nss:system_nss_no_ssl_config",
   ]
   deps = [
+    ":attestation_proto",
     ":cryptohome_proto",
     ":power_manager_proto",
     ":test_support",
@@ -203,6 +205,14 @@ proto_library("cryptohome_proto") {
   proto_out_dir = "chromeos/dbus/cryptohome"
 }
 
+proto_library("attestation_proto") {
+  sources = [
+    "dbus/proto/attestation.proto",
+  ]
+
+  proto_out_dir = "chromeos/attestation"
+}
+
 proto_library("cryptohome_signkey_proto") {
   sources = [
     "//third_party/cros_system_api/dbus/cryptohome/signed_secret.proto",
diff --git a/chromium/chromeos/chromeos.gyp b/chromium/chromeos/chromeos.gyp
index e8c0cca751d..f5d865f31ae 100644
--- a/chromium/chromeos/chromeos.gyp
+++ b/chromium/chromeos/chromeos.gyp
@@ -81,14 +81,8 @@
       'cryptohome/homedir_methods.h',
       'cryptohome/system_salt_getter.cc',
       'cryptohome/system_salt_getter.h',
-      'dbus/amplifier_client.cc',
-      'dbus/amplifier_client.h',
-      'dbus/ap_manager_client.cc',
-      'dbus/ap_manager_client.h',
       'dbus/arc_obb_mounter_client.cc',
       'dbus/arc_obb_mounter_client.h',
-      'dbus/audio_dsp_client.cc',
-      'dbus/audio_dsp_client.h',
       'dbus/audio_node.cc',
       'dbus/audio_node.h',
       'dbus/blocking_method_caller.cc',
@@ -99,9 +93,11 @@
       'dbus/cros_disks_client.h',
       'dbus/cryptohome_client.cc',
       'dbus/cryptohome_client.h',
-      'dbus/dbus_client_bundle.cc',
-      'dbus/dbus_client_bundle.h',
       'dbus/dbus_client_implementation_type.h',
+      'dbus/dbus_clients_browser.cc',
+      'dbus/dbus_clients_browser.h',
+      'dbus/dbus_clients_common.cc',
+      'dbus/dbus_clients_common.h',
       'dbus/dbus_method_call_status.cc',
       'dbus/dbus_method_call_status.h',
       'dbus/dbus_thread_manager.cc',
@@ -110,14 +106,8 @@
       'dbus/debug_daemon_client.h',
       'dbus/easy_unlock_client.cc',
       'dbus/easy_unlock_client.h',
-      'dbus/fake_amplifier_client.cc',
-      'dbus/fake_amplifier_client.h',
-      'dbus/fake_ap_manager_client.cc',
-      'dbus/fake_ap_manager_client.h',
       'dbus/fake_arc_obb_mounter_client.cc',
       'dbus/fake_arc_obb_mounter_client.h',
-      'dbus/fake_audio_dsp_client.cc',
-      'dbus/fake_audio_dsp_client.h',
       'dbus/fake_cras_audio_client.cc',
       'dbus/fake_cras_audio_client.h',
       'dbus/fake_cros_disks_client.cc',
@@ -132,30 +122,14 @@
       'dbus/fake_gsm_sms_client.h',
       'dbus/fake_image_burner_client.cc',
       'dbus/fake_image_burner_client.h',
-      'dbus/fake_introspectable_client.cc',
-      'dbus/fake_introspectable_client.h',
       'dbus/fake_lorgnette_manager_client.cc',
       'dbus/fake_lorgnette_manager_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_peer_daemon_manager_client.cc',
-      'dbus/fake_peer_daemon_manager_client.h',
       'dbus/fake_permission_broker_client.cc',
       'dbus/fake_permission_broker_client.h',
       'dbus/fake_power_manager_client.cc',
       'dbus/fake_power_manager_client.h',
-      'dbus/fake_privet_daemon_manager_client.cc',
-      'dbus/fake_privet_daemon_manager_client.h',
       'dbus/fake_shill_device_client.cc',
       'dbus/fake_shill_device_client.h',
       'dbus/fake_shill_ipconfig_client.cc',
@@ -176,28 +150,10 @@
       'dbus/gsm_sms_client.h',
       'dbus/image_burner_client.cc',
       'dbus/image_burner_client.h',
-      'dbus/introspectable_client.cc',
-      'dbus/introspectable_client.h',
       'dbus/lorgnette_manager_client.cc',
       'dbus/lorgnette_manager_client.h',
       'dbus/modem_messaging_client.cc',
       'dbus/modem_messaging_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/peer_daemon_manager_client.cc',
-      'dbus/peer_daemon_manager_client.h',
       'dbus/permission_broker_client.cc',
       'dbus/permission_broker_client.h',
       'dbus/pipe_reader.cc',
@@ -206,8 +162,6 @@
       'dbus/power_manager_client.h',
       'dbus/power_policy_controller.cc',
       'dbus/power_policy_controller.h',
-      'dbus/privet_daemon_manager_client.cc',
-      'dbus/privet_daemon_manager_client.h',
       'dbus/services/console_service_provider.cc',
       'dbus/services/console_service_provider.h',
       'dbus/services/cros_dbus_service.cc',
@@ -391,6 +345,13 @@
       'network/shill_property_handler.h',
       'network/shill_property_util.cc',
       'network/shill_property_util.h',
+      'printing/fake_printer_discoverer.cc',
+      'printing/fake_printer_discoverer.h',
+      'printing/printer_configuration.cc',
+      'printing/printer_configuration.h',
+      'printing/printer_discoverer.h',
+      'printing/printer_translator.cc',
+      'printing/printer_translator.h',
       'process_proxy/process_output_watcher.cc',
       'process_proxy/process_output_watcher.h',
       'process_proxy/process_proxy.cc',
@@ -407,6 +368,11 @@
       'settings/timezone_settings_helper.h',
       'system/devicetype.cc',
       'system/devicetype.h',
+
+      # Used when running mash, both on Linux and on real devices.
+      'system/fake_statistics_provider.cc',
+      'system/fake_statistics_provider.h',
+
       'system/name_value_pairs_parser.cc',
       'system/name_value_pairs_parser.h',
       'system/statistics_provider.cc',
@@ -448,15 +414,14 @@
       'dbus/blocking_method_caller_unittest.cc',
       'dbus/cras_audio_client_unittest.cc',
       'dbus/cros_disks_client_unittest.cc',
-      'dbus/dbus_client_bundle_unittest.cc',
+      'dbus/dbus_thread_manager_unittest.cc',
+      'dbus/fake_cryptohome_client_unittest.cc',
       'dbus/fake_easy_unlock_client_unittest.cc',
       'dbus/fake_power_manager_client_unittest.cc',
       'dbus/gsm_sms_client_unittest.cc',
-      'dbus/introspectable_client_unittest.cc',
       'dbus/modem_messaging_client_unittest.cc',
-      'dbus/nfc_client_unittest.cc',
+      'dbus/power_manager_client_unittest.cc',
       'dbus/power_policy_controller_unittest.cc',
-      'dbus/privet_daemon_manager_client_unittest.cc',
       'dbus/services/cros_dbus_service_unittest.cc',
       'dbus/services/proxy_resolution_service_provider_unittest.cc',
       'dbus/shill_client_unittest_base.cc',
@@ -497,6 +462,7 @@
       'network/onc/onc_validator_unittest.cc',
       'network/prohibited_technologies_handler_unittest.cc',
       'network/shill_property_handler_unittest.cc',
+      'printing/printer_translator_unittest.cc',
       'process_proxy/process_output_watcher_unittest.cc',
       'process_proxy/process_proxy_unittest.cc',
       'settings/timezone_settings_unittest.cc',
@@ -536,6 +502,7 @@
         '../third_party/libxml/libxml.gyp:libxml',
         '../third_party/protobuf/protobuf.gyp:protobuf_lite',
         '../url/url.gyp:url_lib',
+        'attestation_proto',
         'cryptohome_proto',
         'power_manager_proto',
       ],
@@ -609,8 +576,6 @@
         'network/mock_network_device_handler.h',
         'network/onc/onc_test_utils.cc',
         'network/onc/onc_test_utils.h',
-        'system/fake_statistics_provider.cc',
-        'system/fake_statistics_provider.h',
       ],
       'include_dirs': [
         '..',
@@ -723,6 +688,20 @@
       'includes': ['../build/protoc.gypi'],
     },
     {
+      # GN version: //chromeos:cryptohome_attestation
+      # Protobuf compiler/generator for attestation related protocol buffers.
+      'target_name': 'attestation_proto',
+      'type': 'static_library',
+      'sources': [
+        'dbus/proto/attestation.proto',
+      ],
+      'variables': {
+        'proto_in_dir': 'dbus/proto',
+        'proto_out_dir': 'chromeos/cryptohome',
+      },
+      'includes': ['../build/protoc.gypi'],
+    },
+    {
       # GN version: //chromeos:cryptohome_signkey_proto
       # Protobuf compiler/generator for cryptohome key signing protocol buffer.
       'target_name': 'cryptohome_signkey_proto',
diff --git a/chromium/chromeos/chromeos_tools.gypi b/chromium/chromeos/chromeos_tools.gypi
deleted file mode 100644
index b634240b85d..00000000000
--- a/chromium/chromeos/chromeos_tools.gypi
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright (c) 2013 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.
-
-{
-  'targets' : [
-    {
-      'target_name': 'onc_validator',
-      'type': 'executable',
-      'dependencies': [
-        '../base/base.gyp:base',
-        'chromeos.gyp:chromeos',
-      ],
-      'sources': [
-        'tools/onc_validator/onc_validator.cc',
-      ],
-    },
-  ],
-}
diff --git a/chromium/chromeos/chromeos_unittests.isolate b/chromium/chromeos/chromeos_unittests.isolate
deleted file mode 100644
index f2d5f98aca9..00000000000
--- a/chromium/chromeos/chromeos_unittests.isolate
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2015 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.
-{
-  'variables': {
-    'command': [
-      '../testing/test_env.py',
-      '<(PRODUCT_DIR)/chromeos_unittests<(EXECUTABLE_SUFFIX)',
-      '--brave-new-test-launcher',
-      '--test-launcher-bot-mode',
-      '--asan=<(asan)',
-      '--msan=<(msan)',
-      '--tsan=<(tsan)',
-    ],
-    'files': [
-      '../net/data/',
-      '../testing/test_env.py',
-      'test/data/',
-    ],
-  },
-  'includes': [
-    '../base/base.isolate',
-  ],
-}
diff --git a/chromium/chromeos/ime/input_method.gyp b/chromium/chromeos/ime/input_method.gyp
deleted file mode 100644
index 1da130ef289..00000000000
--- a/chromium/chromeos/ime/input_method.gyp
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright (c) 2012 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.
-
-{
-  'variables': {
-    'input_method_out_dir':
-      '<(SHARED_INTERMEDIATE_DIR)/chromeos/ime',
-  },
-  'targets': [
-    {
-      'target_name': 'gencode',
-      'type': 'none',
-      'actions': [
-        {
-          'inputs': [
-            'input_methods.txt',
-            'gen_input_methods.py',
-          ],
-          'outputs': [
-            '<(input_method_out_dir)/input_methods.h',
-          ],
-          'action_name': 'gen_input_methods',
-          'action': [
-            'python',
-            'gen_input_methods.py',
-            'input_methods.txt',
-            '<(input_method_out_dir)/input_methods.h',
-          ],
-          'message': 'Generating input_methods.h',
-        },
-      ],
-      'direct_dependent_settings': {
-        'include_dirs': [
-          '<(SHARED_INTERMEDIATE_DIR)',
-        ],
-      },
-    },
-  ]
-}