Uplift of #21746 (squashed) to release

brave · Jan 29, 2024 · 419375f · 419375f
1 parent a6dce93
commit 419375f
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 177 deletions.
diff --git a/chromium_src/components/sync/engine/syncer.cc b/chromium_src/components/sync/engine/syncer.cc
diff --git a/components/sync/engine/BUILD.gn b/components/sync/engine/BUILD.gn
@@ -6,10 +6,8 @@
 source_set("unit_tests") {
   testonly = true
 
-  sources = [
-    "//brave/components/sync/engine/brave_model_type_worker_unittest.cc",
-    "//brave/components/sync/engine/brave_syncer_device_poll_unittest.cc",
-  ]
+  sources =
+      [ "//brave/components/sync/engine/brave_model_type_worker_unittest.cc" ]
 
   deps = [
     "//base",

diff --git a/components/sync/engine/brave_syncer_device_poll.cc b/components/sync/engine/brave_syncer_device_poll.cc
diff --git a/components/sync/engine/brave_syncer_device_poll.h b/components/sync/engine/brave_syncer_device_poll.h
diff --git a/components/sync/engine/brave_syncer_device_poll_unittest.cc b/components/sync/engine/brave_syncer_device_poll_unittest.cc
diff --git a/components/sync/engine/sources.gni b/components/sync/engine/sources.gni
@@ -10,6 +10,4 @@ brave_components_sync_engine_sources = [
   "//brave/components/sync/engine/brave_sync_manager_impl.h",
   "//brave/components/sync/engine/brave_sync_server_commands.cc",
   "//brave/components/sync/engine/brave_sync_server_commands.h",
-  "//brave/components/sync/engine/brave_syncer_device_poll.cc",
-  "//brave/components/sync/engine/brave_syncer_device_poll.h",
 ]
diff --git a/patches/components-sync-engine-syncer.cc.patch b/patches/components-sync-engine-syncer.cc.patch