Reorganize utility code

Utility code is now (for the most part) stored in
//chrome/updater/util/.

Additionally, some platform dependent code was folded into a single
file. E.g. chrome/updater/util_mac.h has merged with
chrome/updater/mac/mac_util.h into chrome/updater/util/mac_util.h.

Fixed: 1382574
Change-Id: If4fe0a40b9c30c3119cac05b21fffc29a79c072d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4021245
Auto-Submit: Noah Rose Ledesma <noahrose@google.com>
Commit-Queue: Sorin Jianu <sorin@chromium.org>
Reviewed-by: Sorin Jianu <sorin@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1070617}

chrome/browser/component_updater/updater_state.cc

@@ -22,7 +22,7 @@
 #include "build/branding_buildflags.h"
 #include "build/build_config.h"
 #include "chrome/updater/updater_scope.h"
-#include "chrome/updater/util.h"
+#include "chrome/updater/util/util.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
 
 namespace component_updater {

chrome/browser/component_updater/updater_state_unittest.cc

@@ -11,7 +11,7 @@
 #include "build/branding_buildflags.h"
 #include "build/build_config.h"
 #include "chrome/updater/updater_scope.h"
-#include "chrome/updater/util.h"
+#include "chrome/updater/util/util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
 

chrome/browser/updater/scheduler_mac.cc

@@ -19,7 +19,7 @@
 #include "chrome/browser/updater/browser_updater_client_util.h"
 #include "chrome/common/chrome_features.h"
 #include "chrome/updater/updater_scope.h"
-#include "chrome/updater/util.h"
+#include "chrome/updater/util/util.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
 
 namespace updater {

chrome/updater/BUILD.gn

@@ -507,8 +507,8 @@ if (is_win || is_mac || is_linux) {
       "update_service.h",
       "updater_scope.cc",
       "updater_scope.h",
-      "util.cc",
-      "util.h",
+      "util/util.cc",
+      "util/util.h",
     ]
 
     deps = [
@@ -523,15 +523,14 @@ if (is_win || is_mac || is_linux) {
       sources += [
         "ipc/update_service_proxy_win.cc",
         "ipc/update_service_proxy_win.h",
-        "util_win.cc",
+        "util/win_util.cc",
+        "util/win_util.h",
         "win/proxy_impl_base.h",
         "win/scoped_handle.h",
         "win/user_info.cc",
         "win/user_info.h",
         "win/win_constants.cc",
         "win/win_constants.h",
-        "win/win_util.cc",
-        "win/win_util.h",
       ]
 
       deps += [ "//chrome/updater/app/server/win:updater_idl_idl" ]
@@ -549,8 +548,8 @@ if (is_win || is_mac || is_linux) {
         "ipc/update_service_proxy_linux.h",
         "linux/ipc_constants.cc",
         "linux/ipc_constants.h",
-        "linux/linux_util.cc",
-        "linux/linux_util.h",
+        "util/linux_util.cc",
+        "util/linux_util.h",
       ]
 
       deps += [ "//chrome/updater/app/server/linux/mojom" ]
@@ -564,12 +563,11 @@ if (is_win || is_mac || is_linux) {
         "app/server/mac/update_service_wrappers.mm",
         "ipc/update_service_proxy_mac.h",
         "ipc/update_service_proxy_mac.mm",
-        "mac/mac_util.h",
-        "mac/mac_util.mm",
         "mac/privileged_helper/service_protocol.h",
         "mac/xpc_service_names.h",
         "mac/xpc_service_names.mm",
-        "util_mac.mm",
+        "util/mac_util.h",
+        "util/mac_util.mm",
       ]
 
       deps += [ "//chrome/common/mac:launchd" ]

chrome/updater/activity_impl_mac.cc

@@ -17,9 +17,9 @@
 #include "base/logging.h"
 #include "base/posix/eintr_wrapper.h"
 #include "base/ranges/algorithm.h"
-#include "chrome/updater/mac/mac_util.h"
 #include "chrome/updater/updater_branding.h"
 #include "chrome/updater/updater_scope.h"
+#include "chrome/updater/util/mac_util.h"
 
 namespace updater {
 namespace {

chrome/updater/activity_impl_win.cc

@@ -14,9 +14,9 @@
 #include "base/win/registry.h"
 #include "base/win/windows_types.h"
 #include "chrome/updater/updater_scope.h"
+#include "chrome/updater/util/win_util.h"
 #include "chrome/updater/win/user_info.h"
 #include "chrome/updater/win/win_constants.h"
-#include "chrome/updater/win/win_util.h"
 
 namespace updater {
 namespace {

chrome/updater/activity_impl_win_unittest.cc

@@ -14,9 +14,9 @@
 #include "base/win/windows_types.h"
 #include "chrome/updater/test_scope.h"
 #include "chrome/updater/updater_scope.h"
+#include "chrome/updater/util/win_util.h"
 #include "chrome/updater/win/user_info.h"
 #include "chrome/updater/win/win_constants.h"
-#include "chrome/updater/win/win_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace updater {

chrome/updater/app/app_install.cc

@@ -33,7 +33,7 @@
 #include "chrome/updater/update_service.h"
 #include "chrome/updater/update_service_internal.h"
 #include "chrome/updater/updater_version.h"
-#include "chrome/updater/util.h"
+#include "chrome/updater/util/util.h"
 #include "components/prefs/pref_service.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
 

chrome/updater/app/app_install_mac.mm

@@ -9,8 +9,8 @@
 #include "base/time/time.h"
 #include "chrome/updater/constants.h"
 #include "chrome/updater/launchd_util.h"
-#import "chrome/updater/mac/mac_util.h"
 #include "chrome/updater/mac/xpc_service_names.h"
+#import "chrome/updater/util/mac_util.h"
 
 namespace updater {
 

chrome/updater/app/app_install_win.cc

@@ -48,13 +48,13 @@
 #include "chrome/updater/update_service_internal.h"
 #include "chrome/updater/updater_branding.h"
 #include "chrome/updater/updater_scope.h"
-#include "chrome/updater/util.h"
+#include "chrome/updater/util/util.h"
 #include "chrome/updater/win/install_progress_observer.h"
 #include "chrome/updater/win/manifest_util.h"
 #include "chrome/updater/win/scoped_impersonation.h"
 #include "chrome/updater/win/user_info.h"
 #include "chrome/updater/win/win_constants.h"
-#include "chrome/updater/win/win_util.h"
+#include "chrome/updater/util/win_util.h"
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wmissing-braces"

chrome/updater/app/app_server_unittest.cc

@@ -19,7 +19,7 @@
 #include "chrome/updater/update_service_internal.h"
 #include "chrome/updater/updater_scope.h"
 #include "chrome/updater/updater_version.h"
-#include "chrome/updater/util.h"
+#include "chrome/updater/util/util.h"
 #include "components/prefs/pref_service.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"

chrome/updater/app/app_uninstall.cc

@@ -25,7 +25,7 @@
 #include "chrome/updater/constants.h"
 #include "chrome/updater/persisted_data.h"
 #include "chrome/updater/prefs.h"
-#include "chrome/updater/util.h"
+#include "chrome/updater/util/util.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
 
 #if BUILDFLAG(IS_WIN)

chrome/updater/app/server/win/com_classes.cc

@@ -26,7 +26,7 @@
 #include "chrome/updater/registration_data.h"
 #include "chrome/updater/update_service.h"
 #include "chrome/updater/updater_version.h"
-#include "chrome/updater/win/win_util.h"
+#include "chrome/updater/util/win_util.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
 
 namespace updater {

chrome/updater/app/server/win/com_classes_legacy.cc

@@ -47,12 +47,12 @@
 #include "chrome/updater/update_service.h"
 #include "chrome/updater/updater_scope.h"
 #include "chrome/updater/updater_version.h"
-#include "chrome/updater/util.h"
+#include "chrome/updater/util/util.h"
+#include "chrome/updater/util/win_util.h"
 #include "chrome/updater/win/app_command_runner.h"
 #include "chrome/updater/win/scoped_handle.h"
 #include "chrome/updater/win/setup/setup_util.h"
 #include "chrome/updater/win/win_constants.h"
-#include "chrome/updater/win/win_util.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
 
 namespace {

chrome/updater/app/server/win/com_classes_legacy.h

@@ -22,10 +22,10 @@
 #include "chrome/updater/policy/service.h"
 #include "chrome/updater/update_service.h"
 #include "chrome/updater/updater_scope.h"
-#include "chrome/updater/util.h"
+#include "chrome/updater/util/util.h"
+#include "chrome/updater/util/win_util.h"
 #include "chrome/updater/win/app_command_runner.h"
 #include "chrome/updater/win/setup/setup_util.h"
-#include "chrome/updater/win/win_util.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
 
 // Definitions for COM updater classes provided for backward compatibility

chrome/updater/app/server/win/com_classes_legacy_unittest.cc

@@ -28,11 +28,11 @@
 #include "chrome/updater/test/integration_tests_impl.h"
 #include "chrome/updater/test_scope.h"
 #include "chrome/updater/unittest_util_win.h"
-#include "chrome/updater/util.h"
+#include "chrome/updater/util/util.h"
+#include "chrome/updater/util/win_util.h"
 #include "chrome/updater/win/setup/setup_util.h"
 #include "chrome/updater/win/test/test_executables.h"
 #include "chrome/updater/win/test/test_strings.h"
-#include "chrome/updater/win/win_util.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"

chrome/updater/app/server/win/server.cc

@@ -36,11 +36,11 @@
 #include "chrome/updater/update_service_internal.h"
 #include "chrome/updater/updater_scope.h"
 #include "chrome/updater/updater_version.h"
-#include "chrome/updater/util.h"
+#include "chrome/updater/util/util.h"
+#include "chrome/updater/util/win_util.h"
 #include "chrome/updater/win/setup/setup_util.h"
 #include "chrome/updater/win/setup/uninstall.h"
 #include "chrome/updater/win/win_constants.h"
-#include "chrome/updater/win/win_util.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
 
 namespace updater {

chrome/updater/app/server/win/service_main.cc

@@ -21,8 +21,8 @@
 #include "chrome/updater/app/server/win/com_classes_legacy.h"
 #include "chrome/updater/app/server/win/server.h"
 #include "chrome/updater/constants.h"
+#include "chrome/updater/util/win_util.h"
 #include "chrome/updater/win/win_constants.h"
-#include "chrome/updater/win/win_util.h"
 
 namespace updater {
 

chrome/updater/auto_run_on_os_upgrade_task.cc

@@ -22,15 +22,15 @@
 #include "base/task/thread_pool.h"
 #include "chrome/updater/constants.h"
 #include "chrome/updater/persisted_data.h"
-#include "chrome/updater/util.h"
+#include "chrome/updater/util/util.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
 
 #if BUILDFLAG(IS_WIN)
 #include <windows.h>
 
+#include "chrome/updater/util/win_util.h"
 #include "chrome/updater/win/app_command_runner.h"
 #include "chrome/updater/win/win_constants.h"
-#include "chrome/updater/win/win_util.h"
 #endif
 
 namespace updater {

chrome/updater/auto_run_on_os_upgrade_task_unittest.cc

@@ -19,7 +19,7 @@
 #include "chrome/updater/persisted_data.h"
 #include "chrome/updater/test_scope.h"
 #include "chrome/updater/unittest_util_win.h"
-#include "chrome/updater/win/win_util.h"
+#include "chrome/updater/util/win_util.h"
 #include "components/prefs/pref_registry_simple.h"
 #include "components/prefs/testing_pref_service.h"
 #include "components/update_client/update_client.h"

chrome/updater/check_for_updates_task.cc

@@ -20,7 +20,7 @@
 #include "chrome/updater/policy/manager.h"
 #include "chrome/updater/policy/service.h"
 #include "chrome/updater/update_service_impl.h"
-#include "chrome/updater/util.h"
+#include "chrome/updater/util/util.h"
 #include "components/prefs/pref_service.h"
 #include "components/update_client/update_client.h"
 

chrome/updater/configurator.cc

@@ -26,7 +26,7 @@
 #include "chrome/updater/policy/service.h"
 #include "chrome/updater/prefs.h"
 #include "chrome/updater/updater_scope.h"
-#include "chrome/updater/util.h"
+#include "chrome/updater/util/util.h"
 #include "components/crx_file/crx_verifier.h"
 #include "components/prefs/pref_service.h"
 #include "components/update_client/buildflags.h"

chrome/updater/crash_client.cc

@@ -14,7 +14,7 @@
 #include "build/build_config.h"
 #include "chrome/updater/tag.h"
 #include "chrome/updater/updater_scope.h"
-#include "chrome/updater/util.h"
+#include "chrome/updater/util/util.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
 #include "third_party/crashpad/crashpad/client/crash_report_database.h"
 #include "third_party/crashpad/crashpad/client/crashpad_client.h"

chrome/updater/crash_reporter.cc

@@ -23,7 +23,7 @@
 #include "chrome/updater/constants.h"
 #include "chrome/updater/updater_branding.h"
 #include "chrome/updater/updater_scope.h"
-#include "chrome/updater/util.h"
+#include "chrome/updater/util/util.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
 #include "third_party/crashpad/crashpad/client/crashpad_client.h"
 #include "third_party/crashpad/crashpad/handler/handler_main.h"

chrome/updater/device_management/dm_client.cc

@@ -29,7 +29,7 @@
 #include "chrome/updater/policy/service.h"
 #include "chrome/updater/updater_branding.h"
 #include "chrome/updater/updater_version.h"
-#include "chrome/updater/util.h"
+#include "chrome/updater/util/util.h"
 #include "components/update_client/network.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
 #include "url/gurl.h"

chrome/updater/device_management/dm_storage.cc

@@ -23,7 +23,7 @@
 #include "chrome/updater/device_management/dm_message.h"
 #include "chrome/updater/protos/omaha_settings.pb.h"
 #include "chrome/updater/updater_scope.h"
-#include "chrome/updater/util.h"
+#include "chrome/updater/util/util.h"
 #include "components/policy/proto/device_management_backend.pb.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
 

chrome/updater/device_management/dm_storage_mac.mm

@@ -18,8 +18,8 @@
 #include "base/memory/scoped_refptr.h"
 #include "base/strings/string_util.h"
 #include "base/strings/sys_string_conversions.h"
-#include "chrome/updater/mac/mac_util.h"
 #include "chrome/updater/updater_branding.h"
+#include "chrome/updater/util/mac_util.h"
 
 namespace updater {
 namespace {

chrome/updater/device_management/dm_storage_win.cc

@@ -13,8 +13,8 @@
 #include "base/strings/sys_string_conversions.h"
 #include "base/win/registry.h"
 #include "chrome/updater/updater_branding.h"
+#include "chrome/updater/util/win_util.h"
 #include "chrome/updater/win/win_constants.h"
-#include "chrome/updater/win/win_util.h"
 
 namespace updater {
 

chrome/updater/external_constants_builder.cc

@@ -17,7 +17,7 @@
 #include "chrome/updater/external_constants_default.h"
 #include "chrome/updater/external_constants_override.h"
 #include "chrome/updater/updater_scope.h"
-#include "chrome/updater/util.h"
+#include "chrome/updater/util/util.h"
 #include "components/crx_file/crx_verifier.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
 #include "url/gurl.h"

chrome/updater/external_constants_builder_unittest.cc

@@ -19,7 +19,7 @@
 #include "chrome/updater/test_scope.h"
 #include "chrome/updater/unittest_util.h"
 #include "chrome/updater/updater_branding.h"
-#include "chrome/updater/util.h"
+#include "chrome/updater/util/util.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
 #include "url/gurl.h"
 

chrome/updater/external_constants_override.cc

@@ -25,7 +25,7 @@
 #include "chrome/updater/updater_branding.h"
 #include "chrome/updater/updater_scope.h"
 #include "chrome/updater/updater_version.h"
-#include "chrome/updater/util.h"
+#include "chrome/updater/util/util.h"
 #include "components/crx_file/crx_verifier.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
 #include "url/gurl.h"

chrome/updater/installer.cc

@@ -23,7 +23,7 @@
 #include "chrome/updater/constants.h"
 #include "chrome/updater/update_service.h"
 #include "chrome/updater/updater_scope.h"
-#include "chrome/updater/util.h"
+#include "chrome/updater/util/util.h"
 #include "components/crx_file/crx_verifier.h"
 #include "components/update_client/update_client_errors.h"
 #include "components/update_client/utils.h"

chrome/updater/ipc/update_service_proxy_linux.cc

@@ -27,7 +27,7 @@
 #include "chrome/updater/service_proxy_factory.h"
 #include "chrome/updater/update_service.h"
 #include "chrome/updater/updater_scope.h"
-#include "chrome/updater/util.h"
+#include "chrome/updater/util/util.h"
 #include "mojo/public/cpp/bindings/callback_helpers.h"
 #include "mojo/public/cpp/bindings/pending_receiver.h"
 #include "mojo/public/cpp/bindings/receiver.h"

chrome/updater/ipc/update_service_proxy_win.cc

@@ -29,7 +29,7 @@
 #include "chrome/updater/app/server/win/updater_idl.h"
 #include "chrome/updater/registration_data.h"
 #include "chrome/updater/updater_scope.h"
-#include "chrome/updater/util.h"
+#include "chrome/updater/util/util.h"
 #include "chrome/updater/win/proxy_impl_base.h"
 #include "chrome/updater/win/win_constants.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"