Componentize kAlternateErrorPagesAllowed pref
This pref is used by CaptivePortalService, which we are in the process
of componentizing. As it controls various aspects of Chrome beyond
just the usage of the CaptivePortalService, we place it in
//components/embedder_support rather than //components/captive_portal.
Bug: 1030692
Change-Id: I69aa83aa26250ced18175375488c3621f46caa58
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2010962
Reviewed-by: Matt Menke <[email protected]>
Commit-Queue: Colin Blundell <[email protected]>
Cr-Commit-Position: refs/heads/master@{#734005}
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index 134f644..6140622 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -2012,6 +2012,7 @@
"//components/download/content/factory",
"//components/download/database",
"//components/download/public/background_service:public",
+ "//components/embedder_support",
"//components/encrypted_messages",
"//components/error_page/common",
"//components/favicon/content",
diff --git a/chrome/browser/DEPS b/chrome/browser/DEPS
index 1513ddb1..3d285b9e 100644
--- a/chrome/browser/DEPS
+++ b/chrome/browser/DEPS
@@ -94,7 +94,7 @@
"+components/download/public/task",
"+components/download/quarantine",
"+components/drive",
- "+components/embedder_support/android/delegate",
+ "+components/embedder_support",
"+components/encrypted_messages",
"+components/exo",
"+components/favicon_base",
diff --git a/chrome/browser/android/preferences/prefs.h b/chrome/browser/android/preferences/prefs.h
index 0a3a9fe..f68011217 100644
--- a/chrome/browser/android/preferences/prefs.h
+++ b/chrome/browser/android/preferences/prefs.h
@@ -16,6 +16,7 @@
#include "components/feed/core/pref_names.h"
#endif // BUILDFLAG(ENABLE_FEED_IN_CHROME)
#include "components/content_settings/core/common/pref_names.h"
+#include "components/embedder_support/pref_names.h"
#include "components/ntp_snippets/pref_names.h"
#include "components/offline_pages/core/prefetch/prefetch_prefs.h"
#include "components/password_manager/core/common/password_manager_pref_names.h"
@@ -115,7 +116,7 @@
prefs::kPrintingEnabled,
prefs::kOfferTranslateEnabled,
prefs::kNotificationsVibrateEnabled,
- prefs::kAlternateErrorPagesEnabled,
+ embedder_support::kAlternateErrorPagesEnabled,
prefs::kGoogleServicesLastUsername,
prefs::kWebKitPasswordEchoEnabled,
prefs::kWebKitForceDarkModeEnabled,
diff --git a/chrome/browser/android/preferences/prefs_unittest.cc b/chrome/browser/android/preferences/prefs_unittest.cc
index a7b4620..e00e395 100644
--- a/chrome/browser/android/preferences/prefs_unittest.cc
+++ b/chrome/browser/android/preferences/prefs_unittest.cc
@@ -98,7 +98,7 @@
GetPrefName(OFFER_TRANSLATE_ENABLED));
EXPECT_EQ(prefs::kNotificationsVibrateEnabled,
GetPrefName(NOTIFICATIONS_VIBRATE_ENABLED));
- EXPECT_EQ(prefs::kAlternateErrorPagesEnabled,
+ EXPECT_EQ(embedder_support::kAlternateErrorPagesEnabled,
GetPrefName(ALTERNATE_ERROR_PAGES_ENABLED));
EXPECT_EQ(prefs::kGoogleServicesLastUsername,
GetPrefName(SYNC_LAST_ACCOUNT_NAME));
diff --git a/chrome/browser/captive_portal/captive_portal_browsertest.cc b/chrome/browser/captive_portal/captive_portal_browsertest.cc
index fd1f4ae4..bf196fa 100644
--- a/chrome/browser/captive_portal/captive_portal_browsertest.cc
+++ b/chrome/browser/captive_portal/captive_portal_browsertest.cc
@@ -48,6 +48,7 @@
#include "chrome/common/pref_names.h"
#include "chrome/test/base/in_process_browser_test.h"
#include "chrome/test/base/ui_test_utils.h"
+#include "components/embedder_support/pref_names.h"
#include "components/prefs/pref_service.h"
#include "components/security_interstitials/content/captive_portal_blocking_page.h"
#include "components/security_interstitials/content/security_interstitial_page.h"
@@ -1047,7 +1048,8 @@
void CaptivePortalBrowserTest::EnableCaptivePortalDetection(
Profile* profile, bool enabled) {
- profile->GetPrefs()->SetBoolean(prefs::kAlternateErrorPagesEnabled, enabled);
+ profile->GetPrefs()->SetBoolean(embedder_support::kAlternateErrorPagesEnabled,
+ enabled);
}
void CaptivePortalBrowserTest::RespondToProbeRequests(bool enabled) {
diff --git a/chrome/browser/captive_portal/captive_portal_service.cc b/chrome/browser/captive_portal/captive_portal_service.cc
index a9dc7b3..0d33372 100644
--- a/chrome/browser/captive_portal/captive_portal_service.cc
+++ b/chrome/browser/captive_portal/captive_portal_service.cc
@@ -11,8 +11,8 @@
#include "base/time/tick_clock.h"
#include "build/build_config.h"
#include "chrome/browser/chrome_notification_types.h"
-#include "chrome/common/pref_names.h"
#include "components/captive_portal/captive_portal_types.h"
+#include "components/embedder_support/pref_names.h"
#include "components/prefs/pref_service.h"
#include "content/public/browser/browser_context.h"
#include "content/public/browser/browser_thread.h"
@@ -198,7 +198,7 @@
// |resolve_errors_with_web_service_| must be initialized and |backoff_entry_|
// created before the call to UpdateEnabledState.
resolve_errors_with_web_service_.Init(
- prefs::kAlternateErrorPagesEnabled, pref_service,
+ embedder_support::kAlternateErrorPagesEnabled, pref_service,
base::Bind(&CaptivePortalService::UpdateEnabledState,
base::Unretained(this)));
ResetBackoffEntry(last_detection_result_);
diff --git a/chrome/browser/captive_portal/captive_portal_service_unittest.cc b/chrome/browser/captive_portal/captive_portal_service_unittest.cc
index 335a88c2..2119f94 100644
--- a/chrome/browser/captive_portal/captive_portal_service_unittest.cc
+++ b/chrome/browser/captive_portal/captive_portal_service_unittest.cc
@@ -15,6 +15,7 @@
#include "chrome/common/pref_names.h"
#include "chrome/test/base/testing_profile.h"
#include "components/captive_portal/captive_portal_testing_utils.h"
+#include "components/embedder_support/pref_names.h"
#include "components/prefs/pref_service.h"
#include "content/public/browser/notification_details.h"
#include "content/public/browser/notification_observer.h"
@@ -134,8 +135,8 @@
// Sets the captive portal checking preference.
void EnableCaptivePortalDetectionPreference(bool enabled) {
- profile()->GetPrefs()->SetBoolean(prefs::kAlternateErrorPagesEnabled,
- enabled);
+ profile()->GetPrefs()->SetBoolean(
+ embedder_support::kAlternateErrorPagesEnabled, enabled);
}
// Triggers a captive portal check, then simulates the URL request
diff --git a/chrome/browser/extensions/BUILD.gn b/chrome/browser/extensions/BUILD.gn
index 3293581c..ff72066 100644
--- a/chrome/browser/extensions/BUILD.gn
+++ b/chrome/browser/extensions/BUILD.gn
@@ -812,6 +812,7 @@
"//components/download/content/public",
"//components/download/public/common:public",
"//components/drive",
+ "//components/embedder_support",
"//components/favicon/content",
"//components/feedback",
"//components/gcm_driver",
diff --git a/chrome/browser/extensions/api/preference/preference_api.cc b/chrome/browser/extensions/api/preference/preference_api.cc
index 6b7620401..d6f8eb8 100644
--- a/chrome/browser/extensions/api/preference/preference_api.cc
+++ b/chrome/browser/extensions/api/preference/preference_api.cc
@@ -27,6 +27,7 @@
#include "components/autofill/core/common/autofill_prefs.h"
#include "components/content_settings/core/common/pref_names.h"
#include "components/data_reduction_proxy/core/common/data_reduction_proxy_pref_names.h"
+#include "components/embedder_support/pref_names.h"
#include "components/password_manager/core/common/password_manager_pref_names.h"
#include "components/prefs/pref_service.h"
#include "components/proxy_config/proxy_config_pref_names.h"
@@ -89,8 +90,9 @@
{"data_usage_reporting.enabled",
data_reduction_proxy::prefs::kDataUsageReportingEnabled,
APIPermission::kDataReductionProxy, APIPermission::kDataReductionProxy},
- {"alternateErrorPagesEnabled", prefs::kAlternateErrorPagesEnabled,
- APIPermission::kPrivacy, APIPermission::kPrivacy},
+ {"alternateErrorPagesEnabled",
+ embedder_support::kAlternateErrorPagesEnabled, APIPermission::kPrivacy,
+ APIPermission::kPrivacy},
{"autofillEnabled", autofill::prefs::kAutofillEnabledDeprecated,
APIPermission::kPrivacy, APIPermission::kPrivacy},
{"autofillAddressEnabled", autofill::prefs::kAutofillProfileEnabled,
diff --git a/chrome/browser/extensions/api/preference/preference_apitest.cc b/chrome/browser/extensions/api/preference/preference_apitest.cc
index 7d60e626..e5686fc4 100644
--- a/chrome/browser/extensions/api/preference/preference_apitest.cc
+++ b/chrome/browser/extensions/api/preference/preference_apitest.cc
@@ -22,6 +22,7 @@
#include "chrome/test/base/ui_test_utils.h"
#include "components/autofill/core/common/autofill_prefs.h"
#include "components/content_settings/core/common/pref_names.h"
+#include "components/embedder_support/pref_names.h"
#include "components/keep_alive_registry/keep_alive_types.h"
#include "components/keep_alive_registry/scoped_keep_alive.h"
#include "components/password_manager/core/common/password_manager_pref_names.h"
@@ -46,7 +47,8 @@
prefs::kBlockThirdPartyCookies);
ASSERT_TRUE(pref);
EXPECT_TRUE(pref->IsExtensionControlled());
- EXPECT_TRUE(prefs->GetBoolean(prefs::kAlternateErrorPagesEnabled));
+ EXPECT_TRUE(
+ prefs->GetBoolean(embedder_support::kAlternateErrorPagesEnabled));
EXPECT_TRUE(prefs->GetBoolean(autofill::prefs::kAutofillEnabledDeprecated));
EXPECT_TRUE(prefs->GetBoolean(autofill::prefs::kAutofillCreditCardEnabled));
EXPECT_TRUE(prefs->GetBoolean(autofill::prefs::kAutofillProfileEnabled));
@@ -68,7 +70,8 @@
prefs::kBlockThirdPartyCookies);
ASSERT_TRUE(pref);
EXPECT_FALSE(pref->IsExtensionControlled());
- EXPECT_FALSE(prefs->GetBoolean(prefs::kAlternateErrorPagesEnabled));
+ EXPECT_FALSE(
+ prefs->GetBoolean(embedder_support::kAlternateErrorPagesEnabled));
EXPECT_FALSE(
prefs->GetBoolean(autofill::prefs::kAutofillEnabledDeprecated));
EXPECT_FALSE(
@@ -123,7 +126,7 @@
#endif
IN_PROC_BROWSER_TEST_F(ExtensionPreferenceApiTest, MAYBE_Standard) {
PrefService* prefs = profile_->GetPrefs();
- prefs->SetBoolean(prefs::kAlternateErrorPagesEnabled, false);
+ prefs->SetBoolean(embedder_support::kAlternateErrorPagesEnabled, false);
prefs->SetBoolean(autofill::prefs::kAutofillEnabledDeprecated, false);
prefs->SetBoolean(autofill::prefs::kAutofillCreditCardEnabled, false);
prefs->SetBoolean(autofill::prefs::kAutofillProfileEnabled, false);
diff --git a/chrome/browser/extensions/api/settings_private/prefs_util.cc b/chrome/browser/extensions/api/settings_private/prefs_util.cc
index ed66802..13da3904 100644
--- a/chrome/browser/extensions/api/settings_private/prefs_util.cc
+++ b/chrome/browser/extensions/api/settings_private/prefs_util.cc
@@ -22,6 +22,7 @@
#include "components/component_updater/pref_names.h"
#include "components/content_settings/core/common/pref_names.h"
#include "components/drive/drive_pref_names.h"
+#include "components/embedder_support/pref_names.h"
#include "components/language/core/browser/pref_names.h"
#include "components/omnibox/browser/omnibox_pref_names.h"
#include "components/password_manager/core/common/password_manager_pref_names.h"
@@ -145,7 +146,7 @@
s_whitelist = new PrefsUtil::TypedPrefMap();
// Miscellaneous
- (*s_whitelist)[::prefs::kAlternateErrorPagesEnabled] =
+ (*s_whitelist)[::embedder_support::kAlternateErrorPagesEnabled] =
settings_api::PrefType::PREF_TYPE_BOOLEAN;
(*s_whitelist)[autofill::prefs::kAutofillProfileEnabled] =
settings_api::PrefType::PREF_TYPE_BOOLEAN;
diff --git a/chrome/browser/net/dns_probe_browsertest.cc b/chrome/browser/net/dns_probe_browsertest.cc
index c5b121ee..3fc6670b 100644
--- a/chrome/browser/net/dns_probe_browsertest.cc
+++ b/chrome/browser/net/dns_probe_browsertest.cc
@@ -26,6 +26,7 @@
#include "chrome/common/pref_names.h"
#include "chrome/test/base/in_process_browser_test.h"
#include "chrome/test/base/ui_test_utils.h"
+#include "components/embedder_support/pref_names.h"
#include "components/error_page/common/net_error_info.h"
#include "components/google/core/common/google_util.h"
#include "components/prefs/pref_service.h"
@@ -435,7 +436,7 @@
NetErrorTabHelper::set_state_for_testing(NetErrorTabHelper::TESTING_DEFAULT);
browser()->profile()->GetPrefs()->SetBoolean(
- prefs::kAlternateErrorPagesEnabled, true);
+ embedder_support::kAlternateErrorPagesEnabled, true);
base::PostTask(FROM_HERE, {BrowserThread::IO},
BindOnce(&DnsProbeBrowserTestIOThreadHelper::SetUpOnIOThread,
@@ -994,7 +995,7 @@
IN_PROC_BROWSER_TEST_F(DnsProbeUnreachableProbesTest, ProbesDisabled) {
// Disable probes (And corrections).
browser()->profile()->GetPrefs()->SetBoolean(
- prefs::kAlternateErrorPagesEnabled, false);
+ embedder_support::kAlternateErrorPagesEnabled, false);
SetCorrectionServiceBroken(true);
@@ -1012,7 +1013,7 @@
IN_PROC_BROWSER_TEST_F(DnsProbeFailingProbesTest, CorrectionsDisabled) {
// Disable corrections.
browser()->profile()->GetPrefs()->SetBoolean(
- prefs::kAlternateErrorPagesEnabled, false);
+ embedder_support::kAlternateErrorPagesEnabled, false);
// Requests to the correction service should work if any are made, so the test
// fails if that happens unexpectedly.
SetCorrectionServiceBroken(false);
diff --git a/chrome/browser/net/net_error_tab_helper.cc b/chrome/browser/net/net_error_tab_helper.cc
index 47d634b..7f17b1a 100644
--- a/chrome/browser/net/net_error_tab_helper.cc
+++ b/chrome/browser/net/net_error_tab_helper.cc
@@ -13,6 +13,7 @@
#include "chrome/browser/profiles/profile.h"
#include "chrome/common/pref_names.h"
#include "chrome/common/render_messages.h"
+#include "components/embedder_support/pref_names.h"
#include "components/error_page/common/net_error_info.h"
#include "components/pref_registry/pref_registry_syncable.h"
#include "components/prefs/pref_service.h"
@@ -214,7 +215,7 @@
// static
void NetErrorTabHelper::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* prefs) {
- // prefs::kAlternateErrorPagesEnabled is registered by
+ // embedder_support::kAlternateErrorPagesEnabled is registered by
// NavigationCorrectionTabObserver.
prefs->RegisterIntegerPref(prefs::kNetworkEasterEggHighScore, 0,
@@ -227,8 +228,7 @@
BrowserContext* browser_context = contents->GetBrowserContext();
Profile* profile = Profile::FromBrowserContext(browser_context);
resolve_errors_with_web_service_.Init(
- prefs::kAlternateErrorPagesEnabled,
- profile->GetPrefs());
+ embedder_support::kAlternateErrorPagesEnabled, profile->GetPrefs());
easter_egg_high_score_.Init(prefs::kNetworkEasterEggHighScore,
profile->GetPrefs());
}
diff --git a/chrome/browser/policy/configuration_policy_handler_list_factory.cc b/chrome/browser/policy/configuration_policy_handler_list_factory.cc
index 985c6f6..0e7b100b 100644
--- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc
+++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc
@@ -51,6 +51,7 @@
#include "components/content_settings/core/browser/cookie_settings_policy_handler.h"
#include "components/content_settings/core/common/pref_names.h"
#include "components/data_reduction_proxy/core/common/data_reduction_proxy_pref_names.h"
+#include "components/embedder_support/pref_names.h"
#include "components/history/core/common/pref_names.h"
#include "components/language/core/browser/pref_names.h"
#include "components/metrics/metrics_pref_names.h"
@@ -159,7 +160,7 @@
prefs::kURLsToRestoreOnStartup,
base::Value::Type::LIST },
{ key::kAlternateErrorPagesEnabled,
- prefs::kAlternateErrorPagesEnabled,
+ embedder_support::kAlternateErrorPagesEnabled,
base::Value::Type::BOOLEAN },
{ key::kSearchSuggestEnabled,
prefs::kSearchSuggestEnabled,
diff --git a/chrome/browser/prefs/pref_functional_browsertest.cc b/chrome/browser/prefs/pref_functional_browsertest.cc
index a66a403..9c0624e5 100644
--- a/chrome/browser/prefs/pref_functional_browsertest.cc
+++ b/chrome/browser/prefs/pref_functional_browsertest.cc
@@ -22,6 +22,7 @@
#include "components/content_settings/core/browser/website_settings_registry.h"
#include "components/content_settings/core/common/content_settings_types.h"
#include "components/content_settings/core/common/pref_names.h"
+#include "components/embedder_support/pref_names.h"
#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
#include "components/sync_preferences/pref_service_syncable.h"
#include "content/public/browser/web_contents.h"
@@ -220,8 +221,8 @@
EXPECT_TRUE(prefs->GetBoolean(prefs::kSafeBrowsingEnabled));
prefs->SetBoolean(prefs::kSafeBrowsingEnabled, false);
- EXPECT_TRUE(prefs->GetBoolean(prefs::kAlternateErrorPagesEnabled));
- prefs->SetBoolean(prefs::kAlternateErrorPagesEnabled, false);
+ EXPECT_TRUE(prefs->GetBoolean(embedder_support::kAlternateErrorPagesEnabled));
+ prefs->SetBoolean(embedder_support::kAlternateErrorPagesEnabled, false);
EXPECT_TRUE(prefs->GetBoolean(prefs::kSearchSuggestEnabled));
prefs->SetBoolean(prefs::kSearchSuggestEnabled, false);
@@ -234,7 +235,8 @@
EXPECT_EQ(chrome_browser_net::NETWORK_PREDICTION_NEVER,
prefs->GetInteger(prefs::kNetworkPredictionOptions));
EXPECT_FALSE(prefs->GetBoolean(prefs::kSafeBrowsingEnabled));
- EXPECT_FALSE(prefs->GetBoolean(prefs::kAlternateErrorPagesEnabled));
+ EXPECT_FALSE(
+ prefs->GetBoolean(embedder_support::kAlternateErrorPagesEnabled));
EXPECT_FALSE(prefs->GetBoolean(prefs::kSearchSuggestEnabled));
}
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
index 13547eed..cfd3f73e 100644
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -437,7 +437,7 @@
"//components/domain_reliability",
"//components/download/content/factory",
"//components/download/content/public",
- "//components/embedder_support:switches",
+ "//components/embedder_support",
"//components/encrypted_messages:encrypted_message_proto",
"//components/favicon/content",
"//components/favicon/core",
diff --git a/chrome/browser/ui/navigation_correction_tab_observer.cc b/chrome/browser/ui/navigation_correction_tab_observer.cc
index 1b02879..b3e3237 100644
--- a/chrome/browser/ui/navigation_correction_tab_observer.cc
+++ b/chrome/browser/ui/navigation_correction_tab_observer.cc
@@ -12,6 +12,7 @@
#include "chrome/common/navigation_corrector.mojom.h"
#include "chrome/common/pref_names.h"
#include "chrome/common/render_messages.h"
+#include "components/embedder_support/pref_names.h"
#include "components/google/core/common/google_util.h"
#include "components/pref_registry/pref_registry_syncable.h"
#include "components/prefs/pref_service.h"
@@ -41,7 +42,7 @@
if (prefs) {
pref_change_registrar_.Init(prefs);
pref_change_registrar_.Add(
- prefs::kAlternateErrorPagesEnabled,
+ embedder_support::kAlternateErrorPagesEnabled,
base::Bind(&NavigationCorrectionTabObserver::OnEnabledChanged,
base::Unretained(this)));
}
@@ -57,7 +58,8 @@
// static
void NavigationCorrectionTabObserver::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* prefs) {
- prefs->RegisterBooleanPref(prefs::kAlternateErrorPagesEnabled, true,
+ prefs->RegisterBooleanPref(embedder_support::kAlternateErrorPagesEnabled,
+ true,
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
}
@@ -79,7 +81,8 @@
GURL NavigationCorrectionTabObserver::GetNavigationCorrectionURL() const {
// Disable navigation corrections when the preference is disabled or when in
// Incognito mode.
- if (!profile_->GetPrefs()->GetBoolean(prefs::kAlternateErrorPagesEnabled) ||
+ if (!profile_->GetPrefs()->GetBoolean(
+ embedder_support::kAlternateErrorPagesEnabled) ||
profile_->IsOffTheRecord() || !g_allow_enable_corrections_for_testing) {
return GURL();
}
diff --git a/chrome/browser/ui/navigation_correction_tab_observer.h b/chrome/browser/ui/navigation_correction_tab_observer.h
index 5069dd5..efde838 100644
--- a/chrome/browser/ui/navigation_correction_tab_observer.h
+++ b/chrome/browser/ui/navigation_correction_tab_observer.h
@@ -6,6 +6,7 @@
#define CHROME_BROWSER_UI_NAVIGATION_CORRECTION_TAB_OBSERVER_H_
#include "base/macros.h"
+#include "components/embedder_support/pref_names.h"
#include "components/prefs/pref_change_registrar.h"
#include "content/public/browser/web_contents_observer.h"
#include "content/public/browser/web_contents_user_data.h"
@@ -24,8 +25,8 @@
~NavigationCorrectionTabObserver() override;
// Sets whether navigation corrections can be enable via
- // prefs::kAlternateErrorPagesEnabled. Currently, this is false in production,
- // due to a server issue.
+ // embedder_support::kAlternateErrorPagesEnabled. Currently, this is false in
+ // production, due to a server issue.
static void SetAllowEnableCorrectionsForTesting(
bool allow_enable_corrections_for_testing);
diff --git a/chrome/browser/unified_consent/unified_consent_browsertest.cc b/chrome/browser/unified_consent/unified_consent_browsertest.cc
index 613a54b..b4aa9aa9 100644
--- a/chrome/browser/unified_consent/unified_consent_browsertest.cc
+++ b/chrome/browser/unified_consent/unified_consent_browsertest.cc
@@ -15,6 +15,7 @@
#include "chrome/common/pref_names.h"
#include "chrome/test/base/scoped_testing_local_state.h"
#include "chrome/test/base/testing_profile.h"
+#include "components/embedder_support/pref_names.h"
#include "components/sync/test/fake_server/fake_server_network_resources.h"
#include "components/unified_consent/unified_consent_metrics.h"
#include "components/unified_consent/unified_consent_service.h"
@@ -100,7 +101,7 @@
IN_PROC_BROWSER_TEST_F(UnifiedConsentBrowserTest,
SettingsOptInTakeOverServicePrefChanges) {
std::string pref_A = prefs::kSearchSuggestEnabled;
- std::string pref_B = prefs::kAlternateErrorPagesEnabled;
+ std::string pref_B = embedder_support::kAlternateErrorPagesEnabled;
// First client: Enable sync.
EnableSync(0);
diff --git a/chrome/browser/unified_consent/unified_consent_service_factory.cc b/chrome/browser/unified_consent/unified_consent_service_factory.cc
index 1e4a574..d4a3adb4 100644
--- a/chrome/browser/unified_consent/unified_consent_service_factory.cc
+++ b/chrome/browser/unified_consent/unified_consent_service_factory.cc
@@ -10,6 +10,7 @@
#include "chrome/browser/signin/identity_manager_factory.h"
#include "chrome/browser/sync/profile_sync_service_factory.h"
#include "chrome/common/pref_names.h"
+#include "components/embedder_support/pref_names.h"
#include "components/keyed_service/content/browser_context_dependency_manager.h"
#include "components/prefs/pref_registry_simple.h"
#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
@@ -33,7 +34,7 @@
std::vector<std::string> GetSyncedServicePrefNames() {
return {
- prefs::kSearchSuggestEnabled, prefs::kAlternateErrorPagesEnabled,
+ prefs::kSearchSuggestEnabled, embedder_support::kAlternateErrorPagesEnabled,
prefs::kSafeBrowsingEnabled, prefs::kSafeBrowsingScoutReportingEnabled,
spellcheck::prefs::kSpellCheckUseSpellingService,
#if defined(OS_ANDROID)
