From ff3cb90d20b507571364c8029579451b2b9c29a4 Mon Sep 17 00:00:00 2001
From: Brian Clifton <brian@clifton.me>
Date: Mon, 4 Nov 2024 00:15:01 -0700
Subject: [PATCH] FIXUP: small edits for CI and string changes

---
 app/brave_settings_strings.grdp                             | 4 ++--
 browser/ui/webui/brave_settings_ui.cc                       | 1 +
 components/sync/service/brave_sync_service_impl_unittest.cc | 2 ++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/brave_settings_strings.grdp b/app/brave_settings_strings.grdp
index 44fe2f61ccf..375870ca8d7 100644
--- a/app/brave_settings_strings.grdp
+++ b/app/brave_settings_strings.grdp
@@ -748,10 +748,10 @@
     Could not sync Brave on your devices
   </message>
   <message name="IDS_SETTINGS_BRAVE_CUSTOM_SYNC_URL_TITLE" desc="Title for custom sync url">
-    Custom sync url
+    Custom sync URL
   </message>
   <message name="IDS_SETTINGS_ENTER_CUSTOM_SYNC_URL" desc="Input label for a custom sync url">
-    Enter custom sync url
+    Enter custom sync URL
   </message>
   <message name="IDS_SETTINGS_BRAVE_SYNC_MANAGER_TITLE" desc="Brave Sync manager title">
     Sync Manager
diff --git a/browser/ui/webui/brave_settings_ui.cc b/browser/ui/webui/brave_settings_ui.cc
index bc5b2947418..46e26068380 100644
--- a/browser/ui/webui/brave_settings_ui.cc
+++ b/browser/ui/webui/brave_settings_ui.cc
@@ -37,6 +37,7 @@
 #include "brave/components/ai_chat/core/common/features.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"
diff --git a/components/sync/service/brave_sync_service_impl_unittest.cc b/components/sync/service/brave_sync_service_impl_unittest.cc
index a2b29de761d..635ec58337e 100644
--- a/components/sync/service/brave_sync_service_impl_unittest.cc
+++ b/components/sync/service/brave_sync_service_impl_unittest.cc
@@ -164,6 +164,7 @@ class BraveSyncServiceImplTest : public testing::Test {
   raw_ptr<SyncServiceImplDelegateMock> sync_service_delegate_;
 };
 
+#if !BUILDFLAG(IS_ANDROID)
 TEST_F(BraveSyncServiceImplTest, GroupPolicyOverride) {
   pref_service()->SetManagedPref(brave_sync::kCustomSyncServiceUrl,
                                  base::Value("https://sync.example.com/v2"));
@@ -184,6 +185,7 @@ TEST_F(BraveSyncServiceImplTest, GroupPolicyOverride) {
   pref_service()->SetManagedPref(brave_sync::kCustomSyncServiceUrl,
                                  base::Value(""));
 }
+#endif  // !BUILDFLAG(IS_ANDROID)
 
 TEST_F(BraveSyncServiceImplTest, GroupPolicyNonHttpsOverride) {
   pref_service()->SetManagedPref(brave_sync::kCustomSyncServiceUrl,