extensions: Add ErrorConsole to the desktop Android build
And enable a WebRequest API test that depends on it.
This requires moving the kExtensionsUIDeveloperMode pref registration
into its own file because we can't yet depend on the webui support file
extensions_ui.cc where the pref is registered today.
Bug: 371324825
Change-Id: I1e4c77c09e0774ceff083227eda0b1c27ec4f4f6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6222162
Reviewed-by: Dominic Battré <[email protected]>
Commit-Queue: James Cook <[email protected]>
Reviewed-by: Devlin Cronin <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1415132}
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 3d9633c4..dc8800d 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -206,6 +206,7 @@
#if BUILDFLAG(ENABLE_EXTENSIONS_CORE)
#include "chrome/browser/extensions/extension_web_ui.h"
+#include "chrome/browser/ui/webui/extensions/extensions_ui_prefs.h"
#include "extensions/browser/api/runtime/runtime_api.h"
#include "extensions/browser/extension_prefs.h"
#include "extensions/browser/permissions_manager.h"
@@ -2057,6 +2058,7 @@
extensions::PermissionsManager::RegisterProfilePrefs(registry);
extensions::ExtensionPrefs::RegisterProfilePrefs(registry);
extensions::RuntimeAPI::RegisterPrefs(registry);
+ extensions_ui_prefs::RegisterProfilePrefs(registry);
ExtensionWebUI::RegisterProfilePrefs(registry);
#endif // BUILDFLAG(ENABLE_EXTENSIONS_CORE)
@@ -2064,7 +2066,6 @@
RegisterAnimationPolicyPrefs(registry);
extensions::ActivityLog::RegisterProfilePrefs(registry);
extensions::AudioAPI::RegisterUserPrefs(registry);
- extensions::ExtensionsUI::RegisterProfilePrefs(registry);
#if BUILDFLAG(IS_CHROMEOS_ASH)
extensions::shared_storage::RegisterProfilePrefs(registry);
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
