BASELINE: Update Chromium to 79.0.3945.139

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

9 files changed, 53 insertions, 29 deletions

diff --git a/chromium/chrome/chrome_cleaner/BUILD.gn b/chromium/chrome/chrome_cleaner/BUILD.gn
index 1671a3f7d09..be85435fabb 100644
--- a/chromium/chrome/chrome_cleaner/BUILD.gn
+++ b/chromium/chrome/chrome_cleaner/BUILD.gn
@@ -73,20 +73,9 @@ test("chrome_cleaner_unittests") {
     ":engine_definitions",
     ":engine_target_factory",
     ":other_executable_definitions",
-    "//base",
-    "//base/test:test_support",
-    "//chrome/chrome_cleaner:buildflags",
-    "//chrome/chrome_cleaner/crash:crashpad_lib",
-    "//chrome/chrome_cleaner/ipc:sandbox",
-    "//chrome/chrome_cleaner/logging:common",
-    "//chrome/chrome_cleaner/os:cleaner_os",
     "//chrome/chrome_cleaner/os:common_os",
-    "//chrome/chrome_cleaner/pup_data:pup_data_base",
-    "//chrome/chrome_cleaner/settings:settings_types",
-    "//chrome/chrome_cleaner/test:test_pup_data",
     "//chrome/chrome_cleaner/test:test_util",
-    "//sandbox/win:sandbox",
-    "//testing/gtest",
+    "//chrome/chrome_cleaner/test:test_uws_catalog",
 
     # Tests from sub-directories.
     "//chrome/chrome_cleaner/chrome_utils:unittest_sources",
diff --git a/chromium/chrome/chrome_cleaner/engines/target/BUILD.gn b/chromium/chrome/chrome_cleaner/engines/target/BUILD.gn
index ac24f4a2c5f..905752eeaf0 100644
--- a/chromium/chrome/chrome_cleaner/engines/target/BUILD.gn
+++ b/chromium/chrome/chrome_cleaner/engines/target/BUILD.gn
@@ -42,6 +42,7 @@ source_set("common") {
     "//chrome/chrome_cleaner/pup_data:pup_data_base",
     "//chrome/chrome_cleaner/strings",
     "//components/chrome_cleaner/public/constants:constants",
+    "//mojo/public/cpp/bindings",
     "//sandbox/win:sandbox",
   ]
 
@@ -110,9 +111,11 @@ source_set("test_support") {
     "//chrome/chrome_cleaner/engines/common",
     "//chrome/chrome_cleaner/engines/common:resources_header",
     "//chrome/chrome_cleaner/ipc:ipc_test_util",
+    "//chrome/chrome_cleaner/mojom:engine_sandbox_interface",
     "//chrome/chrome_cleaner/os:cleaner_os",
     "//chrome/chrome_cleaner/os:common_os",
     "//chrome/chrome_cleaner/pup_data:pup_data_base",
+    "//mojo/public/cpp/bindings",
   ]
 }
 
diff --git a/chromium/chrome/chrome_cleaner/mojom/engine_sandbox.mojom b/chromium/chrome/chrome_cleaner/mojom/engine_sandbox.mojom
index 890bdb33fa6..69c719a1290 100644
--- a/chromium/chrome/chrome_cleaner/mojom/engine_sandbox.mojom
+++ b/chromium/chrome/chrome_cleaner/mojom/engine_sandbox.mojom
@@ -52,12 +52,14 @@ interface EngineCommands {
   // and |results| is not used. Otherwise a success result code is returned and
   // any further errors will be reported by calling Done on the |results|
   // interface.
-  StartScan(array<uint32> enabled_uws,
-            array<TraceLocation> enabled_trace_locations,
-            bool include_details,
-            associated EngineFileRequests file_requests,
-            associated EngineRequests sandboxed_engine_requests,
-            associated EngineScanResults results) => (uint32 result_code);
+  StartScan(
+    array<uint32> enabled_uws,
+    array<TraceLocation> enabled_trace_locations,
+    bool include_details,
+    associated EngineFileRequests file_requests,
+    associated EngineRequests sandboxed_engine_requests,
+    pending_associated_remote<EngineScanResults> results) =>
+      (uint32 result_code);
 
   // Starts cleaning up the user's system. |enabled_uws| contains a list of UwS
   // IDs to cleanup.
@@ -66,12 +68,13 @@ interface EngineCommands {
   // and |results| is not used. Otherwise a success result code is returned and
   // any further errors will be reported by calling Done on the |results|
   // interface.
-  StartCleanup(array<uint32> enabled_uws,
-               associated EngineFileRequests file_requests,
-               associated EngineRequests sandboxed_engine_requests,
-               associated CleanerEngineRequests
-                 sandboxed_cleaner_engine_requests,
-               associated EngineCleanupResults results) => (uint32 result_code);
+  StartCleanup(
+    array<uint32> enabled_uws,
+    associated EngineFileRequests file_requests,
+    associated EngineRequests sandboxed_engine_requests,
+    associated CleanerEngineRequests sandboxed_cleaner_engine_requests,
+    pending_associated_remote<EngineCleanupResults> results) =>
+      (uint32 result_code);
 
   // Runs the engine's finalization routine.
   Finalize() => (uint32 result_code);
diff --git a/chromium/chrome/chrome_cleaner/os/BUILD.gn b/chromium/chrome/chrome_cleaner/os/BUILD.gn
index 3b4c8e18767..c71cbc20213 100644
--- a/chromium/chrome/chrome_cleaner/os/BUILD.gn
+++ b/chromium/chrome/chrome_cleaner/os/BUILD.gn
@@ -142,7 +142,6 @@ source_set("unittest_sources") {
     "resource_util_unittest.cc",
     "shutdown_watchdog_unittest.cc",
     "system_util_cleaner_unittest.cc",
-    "system_util_unittest.cc",
     "task_scheduler_unittest.cc",
     "whitelisted_directory_unittest.cc",
   ]
diff --git a/chromium/chrome/chrome_cleaner/pup_data/BUILD.gn b/chromium/chrome/chrome_cleaner/pup_data/BUILD.gn
index 6dc889dd93f..c0b924b3b9f 100644
--- a/chromium/chrome/chrome_cleaner/pup_data/BUILD.gn
+++ b/chromium/chrome/chrome_cleaner/pup_data/BUILD.gn
@@ -11,8 +11,6 @@ source_set("pup_data_base") {
   sources = [
     "pup_data.cc",
     "pup_data.h",
-    "pup_disk_util.cc",
-    "pup_disk_util.h",
     "uws_catalog.h",
   ]
 
@@ -81,7 +79,6 @@ source_set("unittest_sources") {
     "dynamic_pup_unittest.cc",
     "pup_cleaner_util_unittest.cc",
     "pup_data_unittest.cc",
-    "pup_disk_util_unittest.cc",
   ]
 
   deps = [
diff --git a/chromium/chrome/chrome_cleaner/scanner/BUILD.gn b/chromium/chrome/chrome_cleaner/scanner/BUILD.gn
index d1d4a59354e..f837a525c37 100644
--- a/chromium/chrome/chrome_cleaner/scanner/BUILD.gn
+++ b/chromium/chrome/chrome_cleaner/scanner/BUILD.gn
@@ -25,7 +25,6 @@ source_set("matcher_util") {
     "//base",
     "//chrome/chrome_cleaner/constants:common_strings",
     "//chrome/chrome_cleaner/os:common_os",
-    "//chrome/chrome_cleaner/pup_data:pup_data_base",
     "//chrome/chrome_cleaner/scanner:signature_matcher_api",
     "//chrome/chrome_cleaner/settings",
     "//chrome/chrome_cleaner/strings",
diff --git a/chromium/chrome/chrome_cleaner/test/BUILD.gn b/chromium/chrome/chrome_cleaner/test/BUILD.gn
index 4b053fdcaf1..af4feffe3d5 100644
--- a/chromium/chrome/chrome_cleaner/test/BUILD.gn
+++ b/chromium/chrome/chrome_cleaner/test/BUILD.gn
@@ -180,6 +180,9 @@ source_set("test_util") {
     "//base",
     "//base/test:test_support",
     "//chrome/chrome_cleaner/constants:common_strings",
+    "//chrome/chrome_cleaner/crash:crashpad_lib",
+    "//chrome/chrome_cleaner/ipc:sandbox",
+    "//chrome/chrome_cleaner/logging:common",
     "//chrome/chrome_cleaner/os:cleaner_os",
     "//chrome/chrome_cleaner/os:common_os",
     "//chrome/chrome_cleaner/os:file_remover_api",
@@ -187,6 +190,7 @@ source_set("test_util") {
     "//chrome/chrome_cleaner/scanner:matcher_util",
     "//chrome/chrome_cleaner/scanner:signature_matcher_api",
     "//chrome/chrome_cleaner/settings",
+    "//chrome/chrome_cleaner/settings:settings_types",
     "//chrome/chrome_cleaner/strings",
     "//components/chrome_cleaner/public/constants:constants",
     "//sandbox/win:sandbox",
@@ -215,6 +219,7 @@ source_set("integration_test_sources") {
 
   sources = [
     "cleaner_test.cc",
+    "generate_test_uws_test.cc",
     "secure_dll_loading_test.cc",
   ]
 
@@ -242,6 +247,7 @@ source_set("integration_test_sources") {
     ":empty_dll",
     "//chrome/chrome_cleaner/executables:chrome_cleanup_tool",
     "//chrome/chrome_cleaner/executables:software_reporter_tool",
+    "//chrome/chrome_cleaner/tools:generate_test_uws",
   ]
 }
 
diff --git a/chromium/chrome/chrome_cleaner/tools/BUILD.gn b/chromium/chrome/chrome_cleaner/tools/BUILD.gn
new file mode 100644
index 00000000000..4c5da257807
--- /dev/null
+++ b/chromium/chrome/chrome_cleaner/tools/BUILD.gn
@@ -0,0 +1,26 @@
+# Copyright 2019 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.
+
+# Nothing outside //chrome/chrome_cleaner can depend on these targets.
+visibility = [ "//chrome/chrome_cleaner/*" ]
+
+# We need at least one non-executable to prevent an "unused visibility
+# declaration" warning.
+source_set("generate_test_uws_src") {
+  sources = [
+    "generate_test_uws.cc",
+  ]
+
+  deps = [
+    "//base:base",
+    "//chrome/chrome_cleaner/pup_data:test_uws",
+  ]
+}
+
+executable("generate_test_uws") {
+  deps = [
+    ":generate_test_uws_src",
+    "//build/win:default_exe_manifest",
+  ]
+}
diff --git a/chromium/chrome/chrome_cleaner/zip_archiver/broker/BUILD.gn b/chromium/chrome/chrome_cleaner/zip_archiver/broker/BUILD.gn
index 31fa16964a3..4b62ea7fc61 100644
--- a/chromium/chrome/chrome_cleaner/zip_archiver/broker/BUILD.gn
+++ b/chromium/chrome/chrome_cleaner/zip_archiver/broker/BUILD.gn
@@ -18,6 +18,7 @@ static_library("common") {
     "//chrome/chrome_cleaner/ipc:sandbox",
     "//chrome/chrome_cleaner/mojom:zip_archiver_interface",
     "//components/chrome_cleaner/public/constants:constants",
+    "//mojo/public/cpp/bindings",
     "//mojo/public/cpp/system:system",
     "//sandbox/win:sandbox",
   ]
@@ -37,6 +38,7 @@ source_set("unittest_sources") {
     "//chrome/chrome_cleaner/mojom:zip_archiver_interface",
     "//chrome/chrome_cleaner/zip_archiver:test_support",
     "//chrome/chrome_cleaner/zip_archiver/target:common",
+    "//mojo/public/cpp/bindings",
     "//mojo/public/cpp/system:system",
     "//sandbox/win:sandbox",
     "//testing/gtest",