BASELINE: Update Chromium to 68.0.3440.125

Change-Id: I23f19369e01f688e496f5bf179abb521ad73874f
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

1 files changed, 62 insertions, 11 deletions

diff --git a/chromium/chromeos/BUILD.gn b/chromium/chromeos/BUILD.gn
index f81b139c652..b5f23578a13 100644
--- a/chromium/chromeos/BUILD.gn
+++ b/chromium/chromeos/BUILD.gn
@@ -2,6 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//build/config/chromeos/rules.gni")
 import("//build/config/ui.gni")
 import("//testing/libfuzzer/fuzzer_test.gni")
 import("//testing/test.gni")
@@ -34,6 +35,7 @@ component("chromeos") {
     "//base",
     "//base:i18n",
     "//base/third_party/dynamic_annotations",
+    "//components/account_id",
     "//components/device_event_log",
     "//components/onc",
     "//components/password_manager/core/browser:hash_password_manager",
@@ -42,7 +44,6 @@ component("chromeos") {
     "//components/pref_registry",
     "//components/prefs",
     "//components/proxy_config",
-    "//components/signin/core/account_id",
     "//components/url_formatter",
     "//components/user_manager",
     "//crypto:platform",
@@ -65,6 +66,8 @@ component("chromeos") {
     "accelerometer/accelerometer_types.h",
     "account_manager/account_manager.cc",
     "account_manager/account_manager.h",
+    "account_manager/account_manager_factory.cc",
+    "account_manager/account_manager_factory.h",
     "app_mode/kiosk_oem_manifest_parser.cc",
     "app_mode/kiosk_oem_manifest_parser.h",
     "attestation/attestation_constants.cc",
@@ -117,6 +120,8 @@ component("chromeos") {
     "chromeos_constants.cc",
     "chromeos_constants.h",
     "chromeos_export.h",
+    "chromeos_features.cc",
+    "chromeos_features.h",
     "chromeos_paths.cc",
     "chromeos_paths.h",
     "chromeos_pref_names.cc",
@@ -135,6 +140,8 @@ component("chromeos") {
     "cryptohome/system_salt_getter.h",
     "cryptohome/tpm_util.cc",
     "cryptohome/tpm_util.h",
+    "dbus/arc_appfuse_provider_client.cc",
+    "dbus/arc_appfuse_provider_client.h",
     "dbus/arc_midis_client.cc",
     "dbus/arc_midis_client.h",
     "dbus/arc_obb_mounter_client.cc",
@@ -151,6 +158,8 @@ component("chromeos") {
     "dbus/biod/fake_biod_client.h",
     "dbus/blocking_method_caller.cc",
     "dbus/blocking_method_caller.h",
+    "dbus/cec_service_client.cc",
+    "dbus/cec_service_client.h",
     "dbus/concierge_client.cc",
     "dbus/concierge_client.h",
     "dbus/cras_audio_client.cc",
@@ -172,6 +181,8 @@ component("chromeos") {
     "dbus/debug_daemon_client.h",
     "dbus/easy_unlock_client.cc",
     "dbus/easy_unlock_client.h",
+    "dbus/fake_arc_appfuse_provider_client.cc",
+    "dbus/fake_arc_appfuse_provider_client.h",
     "dbus/fake_arc_midis_client.cc",
     "dbus/fake_arc_midis_client.h",
     "dbus/fake_arc_obb_mounter_client.cc",
@@ -180,6 +191,8 @@ component("chromeos") {
     "dbus/fake_arc_oemcrypto_client.h",
     "dbus/fake_auth_policy_client.cc",
     "dbus/fake_auth_policy_client.h",
+    "dbus/fake_cec_service_client.cc",
+    "dbus/fake_cec_service_client.h",
     "dbus/fake_concierge_client.cc",
     "dbus/fake_concierge_client.h",
     "dbus/fake_cras_audio_client.cc",
@@ -258,14 +271,10 @@ component("chromeos") {
     "dbus/power_policy_controller.h",
     "dbus/services/chrome_features_service_provider.cc",
     "dbus/services/chrome_features_service_provider.h",
-    "dbus/services/component_updater_service_provider.cc",
-    "dbus/services/component_updater_service_provider.h",
-    "dbus/services/console_service_provider.cc",
-    "dbus/services/console_service_provider.h",
     "dbus/services/cros_dbus_service.cc",
     "dbus/services/cros_dbus_service.h",
-    "dbus/services/display_power_service_provider.cc",
-    "dbus/services/display_power_service_provider.h",
+    "dbus/services/drive_file_stream_service_provider.cc",
+    "dbus/services/drive_file_stream_service_provider.h",
     "dbus/services/liveness_service_provider.cc",
     "dbus/services/liveness_service_provider.h",
     "dbus/services/proxy_resolution_service_provider.cc",
@@ -509,6 +518,8 @@ component("chromeos") {
     "system/devicemode.h",
     "system/devicetype.cc",
     "system/devicetype.h",
+    "system/factory_ping_embargo_check.cc",
+    "system/factory_ping_embargo_check.h",
 
     # Used when running mash, both on Linux and on real devices.
     "system/fake_statistics_provider.cc",
@@ -543,10 +554,9 @@ component("chromeos") {
 copy("dbus_service_files") {
   sources = [
     "dbus/services/org.chromium.ChromeFeaturesService.conf",
-    "dbus/services/org.chromium.ComponentUpdaterService.conf",
     "dbus/services/org.chromium.DisplayService.conf",
+    "dbus/services/org.chromium.DriveFileStreamService.conf",
     "dbus/services/org.chromium.KioskAppService.conf",
-    "dbus/services/org.chromium.LibCrosService.conf",
     "dbus/services/org.chromium.LivenessService.conf",
     "dbus/services/org.chromium.NetworkProxyService.conf",
     "dbus/services/org.chromium.VirtualFileRequestService.conf",
@@ -574,7 +584,7 @@ static_library("test_support") {
   ]
   deps = [
     ":test_support_without_gmock",
-    "//components/signin/core/account_id",
+    "//components/account_id",
     "//dbus:test_support",
     "//google_apis",
     "//net:test_support",
@@ -663,10 +673,10 @@ test("chromeos_unittests") {
     ":test_support_without_gmock",
     "//base/test:test_support",
     "//chromeos/services:unit_tests",
+    "//components/account_id",
     "//components/onc",
     "//components/prefs:test_support",
     "//components/proxy_config",
-    "//components/signin/core/account_id",
     "//crypto",
     "//crypto:test_support",
     "//dbus:test_support",
@@ -692,6 +702,7 @@ test("chromeos_unittests") {
     "dbus/biod/biod_client_unittest.cc",
     "dbus/biod/fake_biod_client_unittest.cc",
     "dbus/blocking_method_caller_unittest.cc",
+    "dbus/cec_service_client_unittest.cc",
     "dbus/cras_audio_client_unittest.cc",
     "dbus/cros_disks_client_unittest.cc",
     "dbus/dbus_thread_manager_unittest.cc",
@@ -752,12 +763,14 @@ test("chromeos_unittests") {
     "printing/ppd_cache_unittest.cc",
     "printing/ppd_line_reader_unittest.cc",
     "printing/ppd_provider_unittest.cc",
+    "printing/printer_configuration_unittest.cc",
     "printing/printer_translator_unittest.cc",
     "process_proxy/process_output_watcher_unittest.cc",
     "process_proxy/process_proxy_unittest.cc",
     "run_all_unittests.cc",
     "settings/timezone_settings_unittest.cc",
     "system/cpu_temperature_reader_unittest.cc",
+    "system/factory_ping_embargo_check_unittest.cc",
     "system/name_value_pairs_parser_unittest.cc",
     "system/version_loader_unittest.cc",
     "timezone/timezone_unittest.cc",
@@ -786,6 +799,44 @@ test("chromeos_unittests") {
   ]
 }
 
+if (cros_board != "") {
+  generate_vm_runner_script("cros_vm_launcher") {
+    generated_script = "$root_build_dir/bin/launch_cros_vm"
+  }
+
+  # The sanity test's actual binary is baked into the vm image. All we need to
+  # do is build the test wrapper and build our own browser to push to the VM
+  # before testing it.
+  generate_vm_runner_script("cros_vm_sanity_test_wrapper") {
+    test_exe = "$root_out_dir/cros_vm_sanity_test"
+    generated_script = "$root_build_dir/bin/run_cros_vm_sanity_test"
+
+    # The sanity test needs to strip down Chrome and its deps to fit it into
+    # the VM. It does so by using binutils in the toolchain. So signal that we
+    # need the toolchain in the data.
+    need_toolchain = true
+  }
+  group("cros_vm_sanity_test") {
+    testonly = true
+    write_runtime_deps = "$root_out_dir/cros_vm_sanity_test.runtime_deps"
+    data_deps = [
+      "//:chromiumos_preflight",  # Builds the browser.
+      ":cros_vm_sanity_test_wrapper",  # Builds the test wrapper.
+    ]
+
+    # The following dependencies are needed to deploy chrome to the VM. See the
+    # link for the full list:
+    # https://codesearch.chromium.org/chromium/src/third_party/chromite/lib/chrome_util.py?l=341
+    data_deps += [ "//chrome:xdg_mime" ]
+
+    # TODO(bpastene): Figure out what's generating resources/chromeos/ and
+    # declare it as a dep instead of adding the dir directly.
+    data = [
+      "$root_out_dir/resources/chromeos/",
+    ]
+  }
+}
+
 fuzzer_test("variable_expander_fuzzer") {
   sources = [
     "tools/variable_expander_fuzzer.cc",