BASELINE: Update Chromium to 87.0.4280.67

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

8 files changed, 110 insertions, 61 deletions

diff --git a/chromium/chrome/updater/BUILD.gn b/chromium/chrome/updater/BUILD.gn
index 0ea0ba235e8..be742de91ee 100644
--- a/chromium/chrome/updater/BUILD.gn
+++ b/chromium/chrome/updater/BUILD.gn
@@ -12,8 +12,6 @@ import("//testing/test.gni")
 # dependencies are modified until a presubmit is written to automatically
 # check that the C++ includes match the build dependency graph.
 
-set_sources_assignment_filter([])
-
 # TODO(sorin): make the code build on Linux. https://crbug.com/1014320
 group("updater") {
   if (is_win) {
@@ -55,6 +53,7 @@ if (is_win || is_mac) {
       "registration_data.cc",
       "registration_data.h",
       "service_scope.h",
+      "splash_screen.h",
       "unzipper.cc",
       "unzipper.h",
       "update_service.cc",
@@ -83,10 +82,14 @@ if (is_win || is_mac) {
     sources = [
       "app/app.cc",
       "app/app.h",
+      "app/app_install.cc",
+      "app/app_install.h",
       "app/app_server.cc",
       "app/app_server.h",
       "app/app_uninstall.cc",
       "app/app_uninstall.h",
+      "app/app_update.cc",
+      "app/app_update.h",
       "app/app_wake.cc",
       "app/app_wake.h",
       "configurator.cc",
@@ -100,9 +103,12 @@ if (is_win || is_mac) {
       "installer.cc",
       "installer.h",
       "lib_util.h",
+      "policy_service.cc",
+      "policy_service.h",
       "prefs.cc",
       "prefs.h",
       "prefs_impl.h",
+      "setup.h",
       "tag.cc",
       "tag.h",
       "update_service_in_process.cc",
@@ -123,13 +129,16 @@ if (is_win || is_mac) {
         "app/server/mac/update_service_wrappers.mm",
         "external_constants_mac.mm",
         "installer_mac.cc",
+        "launchd_util.cc",
+        "launchd_util.h",
         "lib_util_mac.mm",
         "mac/control_service_out_of_process.h",
         "mac/control_service_out_of_process.mm",
         "mac/update_service_out_of_process.h",
         "mac/update_service_out_of_process.mm",
         "prefs_mac.mm",
-        "update_apps_mac.mm",
+        "service_factory_mac.mm",
+        "setup_mac.mm",
       ]
     }
 
@@ -148,6 +157,8 @@ if (is_win || is_mac) {
         "lib_util_win.cc",
         "prefs_win.cc",
         "service_factory_win.cc",
+        "setup_win.cc",
+        "win/wrl_module.h",
       ]
     }
 
@@ -155,6 +166,7 @@ if (is_win || is_mac) {
       ":base",
       ":version_header",
       "//base",
+      "//base:i18n",
       "//chrome/updater/device_management",
       "//components/crash/core/common:crash_key",
       "//components/crx_file:crx_file",
@@ -176,6 +188,7 @@ if (is_win || is_mac) {
     if (is_mac) {
       deps += [
         "//chrome/updater/app/server/mac:protocol",
+        "//chrome/updater/mac:enterprise",
         "//chrome/updater/mac:installer_sources",
         "//chrome/updater/mac:network_fetcher_sources",
         "//chrome/updater/mac:updater_setup_sources",
@@ -189,7 +202,10 @@ if (is_win || is_mac) {
 
     if (is_win) {
       configs -= [ "//build/config/win:winver" ]
-      configs += [ "//chrome/updater/app/server/win:winver" ]
+      configs += [
+        "//chrome/updater/app/server/win:winver",
+        "//chrome/updater/win:wrl_strict",
+      ]
     }
   }
 
@@ -217,50 +233,6 @@ if (is_win || is_mac) {
     output = "$target_gen_dir/updater_version.h"
   }
 
-  # This build target is defined to minimize the impact of -Wno-missing-braces
-  # compiler switch. In the future it might be possible to isolate the
-  # dependency of ATL in the UI so ATL headers are not visible in the
-  # compilation units outside the UI itself.
-  # TODO(sorin): https://crbug.com/1014311
-  source_set("app_install") {
-    sources = [ "app/app_install.h" ]
-
-    if (is_mac) {
-      sources += [ "mac/setup/app_install.cc" ]
-    }
-
-    if (is_win) {
-      sources += [ "win/app_install.cc" ]
-    }
-
-    deps = [
-      ":lib",
-      "//base",
-      "//chrome/updater:base",
-      "//chrome/updater:version_header",
-    ]
-    if (is_mac) {
-      deps += [ "//chrome/updater/mac:updater_setup_sources" ]
-    }
-
-    if (is_win) {
-      deps += [
-        "//base:i18n",
-        "//chrome/updater/win:install_progress_observer",
-        "//chrome/updater/win:lib",
-        "//chrome/updater/win/ui",
-        "//components/prefs",
-        "//components/update_client",
-      ]
-    }
-
-    allow_circular_includes_from = [ ":lib" ]
-
-    if (is_win) {
-      cflags_cc = [ "-Wno-missing-braces" ]
-    }
-  }
-
   source_set("updater_tests_support") {
     testonly = true
 
@@ -276,6 +248,7 @@ if (is_win || is_mac) {
     ]
   }
 
+  # These tests are run serially since they mutate system state.
   test("updater_tests") {
     testonly = true
 
@@ -286,13 +259,16 @@ if (is_win || is_mac) {
       "lib_util_unittest.cc",
       "persisted_data_unittest.cc",
       "policy_manager_unittest.cc",
+      "policy_service_unittest.cc",
       "prefs_unittest.cc",
       "run_all_unittests.cc",
+      "service_scope_unittest.cc",
       "tag_unittest.cc",
       "test/integration_tests.cc",
       "test/integration_tests.h",
       "unittest_util_unittest.cc",
       "updater_unittest.cc",
+      "util_unittest.cc",
     ]
 
     deps = [
@@ -305,7 +281,8 @@ if (is_win || is_mac) {
       "//base/test:test_support",
       "//chrome/common:constants",
       "//chrome/updater/device_management:unittest",
-      "//chrome/updater/test/test_app",
+      "//chrome/updater/test/test_app:constants",
+      "//chrome/updater/test/test_app:version_header",
       "//chrome/updater/tools:unittest",
       "//components/prefs:test_support",
       "//components/update_client",
@@ -352,7 +329,23 @@ if (is_win || is_mac) {
         "//third_party/ocmock",
       ]
 
-      data_deps = [ "//chrome/updater/mac:updater_bundle" ]
+      data_deps = [
+        "//chrome/updater/mac:updater_bundle",
+        "//chrome/updater/test/test_app",
+      ]
     }
   }
+
+  group("updater_integration_tests") {
+    testonly = true
+
+    data = [
+      "//chrome/updater/run_updater_tests.py",
+      "//chrome/updater/test/",
+      "//testing/scripts/common.py",
+      "//testing/scripts/run_isolated_script_test.py",
+      "//testing/xvfb.py",
+      "//third_party/catapult/third_party/typ/",
+    ]
+  }
 }
diff --git a/chromium/chrome/updater/app/server/win/BUILD.gn b/chromium/chrome/updater/app/server/win/BUILD.gn
index fd303ba58a0..5506d9d5c3c 100644
--- a/chromium/chrome/updater/app/server/win/BUILD.gn
+++ b/chromium/chrome/updater/app/server/win/BUILD.gn
@@ -30,6 +30,7 @@ midl("updater_idl_idl") {
   sources = get_target_outputs(":generate_updater_idl")
 
   defines = [
+    "IUPDATESTATE_IID=46ACF70B-AC13-406D-B53B-B2C4BF091FF6",
     "ICOMPLETESTATUS_IID=2FCD14AF-B645-4351-8359-E80A0E202A0B",
     "IUPDATEROBSERVER_IID=7B416CFD-4216-4FD6-BD83-7C586054676E",
     "IUPDATER_IID=63B8FFB1-5314-48C9-9C57-93EC8BC6184B",
diff --git a/chromium/chrome/updater/device_management/BUILD.gn b/chromium/chrome/updater/device_management/BUILD.gn
index b50baf42f92..8dd30fb10d6 100644
--- a/chromium/chrome/updater/device_management/BUILD.gn
+++ b/chromium/chrome/updater/device_management/BUILD.gn
@@ -8,8 +8,6 @@ import("//build/util/process_version.gni")
 import("//chrome/updater/branding.gni")
 import("//testing/test.gni")
 
-set_sources_assignment_filter([])
-
 source_set("device_management") {
   sources = [
     "dm_cached_policy_info.cc",
diff --git a/chromium/chrome/updater/mac/BUILD.gn b/chromium/chrome/updater/mac/BUILD.gn
index c60cdda578e..33bd327853c 100644
--- a/chromium/chrome/updater/mac/BUILD.gn
+++ b/chromium/chrome/updater/mac/BUILD.gn
@@ -12,7 +12,6 @@ group("mac") {
     ":browser_install_script",
     ":updater_bundle",
     ":updater_install_script",
-    "//chrome/updater:app_install",
     "//chrome/updater/mac/signing",
   ]
 }
@@ -61,7 +60,6 @@ mac_app_bundle("updater_bundle") {
   deps = [
     ":network_fetcher_sources",
     ":updater_setup_sources",
-    "//chrome/updater:app_install",
     "//chrome/updater:lib",
   ]
 }
@@ -169,7 +167,6 @@ source_set("updater_setup_tests") {
     "//base",
     "//base/test:test_support",
     "//chrome/common:constants",
-    "//chrome/updater:app_install",
     "//testing/gtest",
   ]
 }
diff --git a/chromium/chrome/updater/test/test_app/BUILD.gn b/chromium/chrome/updater/test/test_app/BUILD.gn
index b445fb94df2..3689decf702 100644
--- a/chromium/chrome/updater/test/test_app/BUILD.gn
+++ b/chromium/chrome/updater/test/test_app/BUILD.gn
@@ -7,6 +7,13 @@ import("//build/util/process_version.gni")
 import("//build/util/version.gni")
 import("//chrome/updater/branding.gni")
 
+# This file depends on the legacy global sources assignment filter. It should
+# be converted to check target platform before assigning source files to the
+# sources variable. Remove this import and set_sources_assignment_filter call
+# when the file has been converted. See https://crbug.com/1018739 for details.
+import("//build/config/deprecated_default_sources_assignment_filter.gni")
+set_sources_assignment_filter(deprecated_default_sources_assignment_filter)
+
 app_name = "UpdaterTestApp"
 app_bundle_id = "org.chromium.updatertestapp"
 
@@ -38,12 +45,17 @@ process_version("version_header") {
   output = "$target_gen_dir/test_app_version.h"
 }
 
+source_set("constants") {
+  sources = [
+    "constants.cc",
+    "constants.h",
+  ]
+}
+
 source_set("app_sources") {
   sources = [
     "//chrome/updater/app/app.cc",
     "//chrome/updater/app/app.h",
-    "constants.cc",
-    "constants.h",
     "test_app.cc",
     "test_app.h",
     "test_app_mac.mm",
@@ -57,6 +69,7 @@ source_set("app_sources") {
   ]
 
   deps = [
+    ":constants",
     ":version_header",
     "//base",
     "//chrome/updater:base",
diff --git a/chromium/chrome/updater/win/BUILD.gn b/chromium/chrome/updater/win/BUILD.gn
index 4a5bcf5d639..0bea86764f0 100644
--- a/chromium/chrome/updater/win/BUILD.gn
+++ b/chromium/chrome/updater/win/BUILD.gn
@@ -13,9 +13,17 @@ group("win") {
   deps = [
     ":updater",
     "//chrome/updater/win/installer:installer",
+    "//chrome/updater/win/signing",
   ]
 }
 
+config("wrl_strict") {
+  # This definition is used in <wrl/module.h> to specify that only COM
+  # support is provided by WRL, and thus, avoid a dependency on WinRT, which
+  # is not available in Windows 7.
+  defines = [ "__WRL_CLASSIC_COM_STRICT__" ]
+}
+
 executable("updater") {
   sources = [
     "main.cc",
@@ -25,10 +33,10 @@ executable("updater") {
   configs += [ "//build/config/win:windowed" ]
 
   deps = [
+    ":app_install_controller",
     ":lib",
     ":version_resources",
     "//build/win:default_exe_manifest",
-    "//chrome/updater:app_install",
     "//chrome/updater:lib",
     "//chrome/updater/win/ui:ui_resources",
   ]
@@ -136,6 +144,33 @@ source_set("install_progress_observer") {
   deps = [ "//base" ]
 }
 
+# This build target is defined to minimize the impact of -Wno-missing-braces
+# compiler switch. In the future it might be possible to isolate the
+# dependency of ATL in the UI so ATL headers are not visible in the
+# compilation units outside the UI itself.
+# TODO(sorin): https://crbug.com/1014311
+source_set("app_install_controller") {
+  if (is_win) {
+    visibility = [ "//chrome/updater/win/*" ]
+    allow_circular_includes_from = [ "//chrome/updater:lib" ]
+
+    cflags_cc = [ "-Wno-missing-braces" ]
+
+    sources = [ "app_install_controller.cc" ]
+
+    deps = [
+      ":install_progress_observer",
+      ":lib",
+      "//base",
+      "//base:i18n",
+      "//chrome/updater:base",
+      "//chrome/updater:lib",
+      "//chrome/updater:version_header",
+      "//chrome/updater/win/ui",
+    ]
+  }
+}
+
 source_set("updater_tests") {
   testonly = true
 
@@ -149,11 +184,11 @@ source_set("updater_tests") {
   ]
 
   deps = [
+    ":app_install_controller",
     ":constants",
     ":lib",
     ":tag_extractor",
     "//base/test:test_support",
-    "//chrome/updater:app_install",
     "//testing/gtest",
     "//url:url",
   ]
@@ -183,10 +218,10 @@ test("updater_unittests") {
   ]
 
   deps = [
+    ":app_install_controller",
     ":lib",
     "//base",
     "//base/test:test_support",
-    "//chrome/updater:app_install",
     "//chrome/updater:version_header",
     "//chrome/updater/win/test:test_executables",
     "//chrome/updater/win/test:test_strings",
diff --git a/chromium/chrome/updater/win/signing/BUILD.gn b/chromium/chrome/updater/win/signing/BUILD.gn
new file mode 100644
index 00000000000..3a4f7edd2ef
--- /dev/null
+++ b/chromium/chrome/updater/win/signing/BUILD.gn
@@ -0,0 +1,12 @@
+# Copyright 2020 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.
+
+copy("signing") {
+  sources = [
+    "//chrome/tools/build/win/resedit.py",
+    "sign.py",
+  ]
+
+  outputs = [ "$root_out_dir/Updater Signing/{{source_file_part}}" ]
+}
diff --git a/chromium/chrome/updater/win/test/BUILD.gn b/chromium/chrome/updater/win/test/BUILD.gn
index be115c4ef15..a964ea9eff3 100644
--- a/chromium/chrome/updater/win/test/BUILD.gn
+++ b/chromium/chrome/updater/win/test/BUILD.gn
@@ -25,8 +25,8 @@ source_set("test_common") {
 
   deps = [
     "//base",
-    "//chrome/updater:app_install",
     "//chrome/updater:base",
+    "//chrome/updater/win:app_install_controller",
     "//chrome/updater/win:lib",
   ]
 }