Rename brave_components_sync_driver_[sources/deps] -> brave_component…

…s_sync_service_[sources/deps]. And Remove some unused includes.
brave · Oct 8, 2024 · ae64392 · ae64392
1 parent 9f0092d
commit ae64392
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 14 deletions.
diff --git a/app/brave_main_delegate.cc b/app/brave_main_delegate.cc
@@ -9,32 +9,26 @@
 #include <optional>
 #include <string>
 
-#include "base/base_switches.h"
 #include "base/lazy_instance.h"
 #include "base/path_service.h"
-#include "base/strings/strcat.h"
-#include "base/time/time.h"
 #include "brave/browser/brave_content_browser_client.h"
 #include "brave/common/resource_bundle_helper.h"
 #include "brave/components/brave_component_updater/browser/features.h"
 #include "brave/components/brave_component_updater/browser/switches.h"
 #include "brave/components/brave_sync/buildflags.h"
-#include "brave/components/constants/brave_switches.h"
 #include "brave/components/speedreader/common/buildflags/buildflags.h"
 #include "brave/components/update_client/buildflags.h"
 #include "brave/components/variations/command_line_utils.h"
 #include "brave/renderer/brave_content_renderer_client.h"
 #include "brave/utility/brave_content_utility_client.h"
 #include "build/build_config.h"
 #include "chrome/app/chrome_main_delegate.h"
-#include "chrome/common/chrome_features.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_paths_internal.h"
 #include "chrome/common/chrome_switches.h"
 #include "components/component_updater/component_updater_switches.h"
 #include "components/dom_distiller/core/dom_distiller_switches.h"
 #include "components/embedder_support/switches.h"
-#include "components/sync/base/command_line_switches.h"
 #include "google_apis/gaia/gaia_switches.h"
 
 #if BUILDFLAG(IS_LINUX)

diff --git a/browser/extensions/BUILD.gn b/browser/extensions/BUILD.gn
@@ -177,6 +177,7 @@ source_set("extensions") {
     "//brave/components/brave_rewards/browser",
     "//brave/components/brave_rewards/common/mojom",
     "//brave/components/brave_shields/core/common",
+    "//brave/components/brave_sync:prefs",
     "//brave/components/brave_vpn/common/buildflags",
     "//brave/components/brave_wallet/browser:pref_names",
     "//brave/components/brave_wallet/browser:utils",

diff --git a/browser/ui/webui/brave_settings_ui.cc b/browser/ui/webui/brave_settings_ui.cc
@@ -13,7 +13,6 @@
 #include "brave/browser/brave_rewards/rewards_util.h"
 #include "brave/browser/brave_wallet/brave_wallet_context_utils.h"
 #include "brave/browser/ntp_background/view_counter_service_factory.h"
-#include "brave/browser/resources/settings/grit/brave_settings_resources.h"
 #include "brave/browser/resources/settings/grit/brave_settings_resources_map.h"
 #include "brave/browser/resources/settings/shortcuts_page/grit/commands_generated_map.h"
 #include "brave/browser/shell_integrations/buildflags/buildflags.h"
@@ -30,12 +29,10 @@
 #include "brave/components/ai_chat/core/common/buildflags/buildflags.h"
 #include "brave/components/brave_sync/brave_sync_prefs.h"
 #include "brave/components/brave_vpn/common/buildflags/buildflags.h"
-#include "brave/components/brave_vpn/common/features.h"
 #include "brave/components/brave_wallet/common/features.h"
 #include "brave/components/commander/common/features.h"
 #include "brave/components/commands/common/commands.mojom.h"
 #include "brave/components/commands/common/features.h"
-#include "brave/components/constants/pref_names.h"
 #include "brave/components/ntp_background_images/browser/view_counter_service.h"
 #include "brave/components/playlist/common/buildflags/buildflags.h"
 #include "brave/components/speedreader/common/buildflags/buildflags.h"

diff --git a/browser/ui/webui/settings/brave_sync_handler.cc b/browser/ui/webui/settings/brave_sync_handler.cc
@@ -13,7 +13,6 @@
 #include "base/functional/bind.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/types/cxx23_to_underlying.h"
-#include "brave/components/brave_sync/brave_sync_prefs.h"
 #include "brave/components/brave_sync/crypto/crypto.h"
 #include "brave/components/brave_sync/qr_code_data.h"
 #include "brave/components/brave_sync/sync_service_impl_helper.h"

diff --git a/components/sync/service/sources.gni b/components/sync/service/sources.gni
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at https://mozilla.org/MPL/2.0/.
 
-brave_components_sync_driver_sources = [
+brave_components_sync_service_sources = [
   "//brave/components/sync/service/brave_sync_auth_manager.cc",
   "//brave/components/sync/service/brave_sync_auth_manager.h",
   "//brave/components/sync/service/brave_sync_service_impl.cc",
@@ -13,7 +13,7 @@ brave_components_sync_driver_sources = [
   "//brave/components/sync/service/sync_service_impl_delegate.h",
 ]
 
-brave_components_sync_driver_deps = [
+brave_components_sync_service_deps = [
   "//brave/components/brave_sync",
   "//brave/components/brave_sync:crypto",
   "//brave/components/brave_sync:network_time_helper",
@@ -22,5 +22,5 @@ brave_components_sync_driver_deps = [
 ]
 
 if (is_android) {
-  brave_components_sync_driver_deps += [ "//brave/build/android:jni_headers" ]
+  brave_components_sync_service_deps += [ "//brave/build/android:jni_headers" ]
 }
diff --git a/patches/components-sync-service-BUILD.gn.patch b/patches/components-sync-service-BUILD.gn.patch
@@ -6,5 +6,5 @@ index ec3e83b6a7514e2ba7b01d9c889c5e017c00307d..a92b9826b22ebd1d1be41181b25ac437
    }
 
    configs += [ "//build/config/compiler:wexit_time_destructors" ]
-+  sources += brave_components_sync_driver_sources deps += brave_components_sync_driver_deps
++  sources += brave_components_sync_service_sources deps += brave_components_sync_service_deps
  }