From e8a861cae304c33d2cf732b02df7a775054bb7e3 Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Thu, 23 Dec 2021 21:53:23 +0100 Subject: [PATCH] Adapt to new param of sync_preferences::TestingPrefServiceSyncable() It expects an extra PrefStore for |standalone_browser_prefs| now. Chromium change: https://source.chromium.org/chromium/chromium/src/+/2ff27e52ab7c6bc47b275da47ed62a2616d79553 commit 2ff27e52ab7c6bc47b275da47ed62a2616d79553 Author: Ian Helmke Date: Thu Dec 16 23:44:56 2021 +0000 Add LacrosPrefStore for lacros settings This change adds a LacrosPrefStore for ash. This PrefStore will exist only in ash and holds prefs sent from lacros to ash. In particular, it will be used to store extension-controlled prefs. In a follow-up, this PrefStore will be persisted. It is not persisted or used in this change. Bug: 1218145 --- .../browser/signin/account_consistency_disabled_unittest.cc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/chromium_src/chrome/browser/signin/account_consistency_disabled_unittest.cc b/chromium_src/chrome/browser/signin/account_consistency_disabled_unittest.cc index 627b8d1aaca..6357b70d0a8 100644 --- a/chromium_src/chrome/browser/signin/account_consistency_disabled_unittest.cc +++ b/chromium_src/chrome/browser/signin/account_consistency_disabled_unittest.cc @@ -43,10 +43,9 @@ TEST(AccountConsistencyDisabledTest, NewProfile) { /*managed_prefs=*/new TestingPrefStore(), /*supervised_user_prefs=*/new TestingPrefStore(), /*extension_prefs=*/new TestingPrefStore(), - user_prefs, + /*standalone_browser_prefs=*/new TestingPrefStore(), user_prefs, /*recommended_prefs=*/new TestingPrefStore(), - new user_prefs::PrefRegistrySyncable(), - new PrefNotifierImpl()); + new user_prefs::PrefRegistrySyncable(), new PrefNotifierImpl()); RegisterUserProfilePrefs(pref_service->registry()); profile_builder.SetPrefService(std::move(pref_service)); }