diff --git a/browser/brave_profile_prefs.cc b/browser/brave_profile_prefs.cc index 6c9024a326bf..b011b7c4d518 100644 --- a/browser/brave_profile_prefs.cc +++ b/browser/brave_profile_prefs.cc @@ -8,7 +8,6 @@ #include "brave/common/pref_names.h" #include "brave/components/brave_shields/browser/brave_shields_web_contents_observer.h" #include "brave/components/brave_webtorrent/browser/buildflags/buildflags.h" -#include "brave/components/brave_sync/brave_sync_prefs.h" #include "chrome/browser/net/prediction_options.h" #include "chrome/browser/prefs/session_startup_pref.h" #include "chrome/common/pref_names.h" @@ -45,9 +44,6 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref(kLocationBarIsWide, false); registry->RegisterBooleanPref(kHideBraveRewardsButton, false); - //TODO(darkdh): merge into upstream SyncPrefs - brave_sync::prefs::Prefs::RegisterProfilePrefs(registry); - registry->RegisterBooleanPref(kWidevineOptedIn, false); registry->RegisterBooleanPref(kAskWidevineInstall, true); #if BUILDFLAG(BUNDLE_WIDEVINE_CDM) diff --git a/chromium_src/components/sync/base/sync_prefs.cc b/chromium_src/components/sync/base/sync_prefs.cc new file mode 100644 index 000000000000..beada7e637d7 --- /dev/null +++ b/chromium_src/components/sync/base/sync_prefs.cc @@ -0,0 +1,2 @@ +#include "brave/components/brave_sync/brave_sync_prefs.h" +#include "../../../../components/sync/base/sync_prefs.cc" diff --git a/components/brave_sync/test_util.cc b/components/brave_sync/test_util.cc index ede54853e6fe..7879ba204ee0 100644 --- a/components/brave_sync/test_util.cc +++ b/components/brave_sync/test_util.cc @@ -6,7 +6,6 @@ #include "base/files/file_util.h" #include "base/strings/utf_string_conversions.h" -#include "brave/components/brave_sync/brave_sync_prefs.h" #include "brave/components/brave_sync/tools.h" #include "brave/components/brave_sync/values_conv.h" #include "chrome/browser/prefs/browser_prefs.h" @@ -32,7 +31,6 @@ std::unique_ptr CreateBraveSyncProfile(const base::FilePath& path) { std::unique_ptr prefs( factory.CreateSyncable(registry.get())); RegisterUserProfilePrefs(registry.get()); - prefs::Prefs::RegisterProfilePrefs(registry.get()); TestingProfile::Builder profile_builder; profile_builder.SetPrefService(std::move(prefs)); diff --git a/patches/components-sync-base-sync_prefs.cc.patch b/patches/components-sync-base-sync_prefs.cc.patch new file mode 100644 index 000000000000..04c067ef6526 --- /dev/null +++ b/patches/components-sync-base-sync_prefs.cc.patch @@ -0,0 +1,12 @@ +diff --git a/components/sync/base/sync_prefs.cc b/components/sync/base/sync_prefs.cc +index e0233e2c1fe41e7aca1514321881a9defe99e11f..8331c1add5cbc209023cfb938b11ef8c564e2b90 100644 +--- a/components/sync/base/sync_prefs.cc ++++ b/components/sync/base/sync_prefs.cc +@@ -186,6 +186,7 @@ void SyncPrefs::RegisterProfilePrefs( + #if defined(OS_CHROMEOS) + registry->RegisterStringPref(kSyncSpareBootstrapToken, ""); + #endif ++ brave_sync::prefs::Prefs::RegisterProfilePrefs(registry); + } + + void SyncPrefs::AddSyncPrefObserver(SyncPrefObserver* sync_pref_observer) {