diff --git a/browser/brave_content_browser_client.cc b/browser/brave_content_browser_client.cc index 8b52b760a09..37fde166b14 100644 --- a/browser/brave_content_browser_client.cc +++ b/browser/brave_content_browser_client.cc @@ -1157,8 +1157,8 @@ bool BraveContentBrowserClient::HandleURLOverrideRewrite( #endif // no special win10 welcome page - if (url->host() == chrome::kChromeUIWelcomeHost) { - *url = GURL(chrome::kChromeUIWelcomeURL); + if (url->host() == kWelcomeHost) { + *url = GURL(kWelcomeURL); return true; } diff --git a/browser/brave_content_browser_client_browsertest.cc b/browser/brave_content_browser_client_browsertest.cc index 5af6554e2f3..ab1e658739c 100644 --- a/browser/brave_content_browser_client_browsertest.cc +++ b/browser/brave_content_browser_client_browsertest.cc @@ -17,6 +17,7 @@ #include "brave/components/brave_webtorrent/browser/buildflags/buildflags.h" #include "brave/components/constants/brave_paths.h" #include "brave/components/constants/pref_names.h" +#include "brave/components/constants/webui_url_constants.h" #include "brave/components/tor/buildflags/buildflags.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h" #include "chrome/browser/extensions/component_loader.h" @@ -152,7 +153,7 @@ class BraveContentBrowserClientTest : public InProcessBrowserTest { IN_PROC_BROWSER_TEST_F(BraveContentBrowserClientTest, CanLoadChromeURL) { std::vector pages{ - chrome::kChromeUIWelcomeHost, + kWelcomeHost, }; std::vector schemes{ diff --git a/browser/ui/startup/brave_startup_tab_provider_impl.cc b/browser/ui/startup/brave_startup_tab_provider_impl.cc index 5401f7349f8..7fddf73afe0 100644 --- a/browser/ui/startup/brave_startup_tab_provider_impl.cc +++ b/browser/ui/startup/brave_startup_tab_provider_impl.cc @@ -5,16 +5,16 @@ #include "brave/browser/ui/startup/brave_startup_tab_provider_impl.h" +#include "brave/components/constants/webui_url_constants.h" #include "chrome/browser/first_run/first_run.h" #include "chrome/browser/ui/startup/startup_tab.h" -#include "chrome/common/webui_url_constants.h" StartupTabs BraveStartupTabProviderImpl::GetDistributionFirstRunTabs( StartupBrowserCreator* browser_creator) const { StartupTabs tabs = StartupTabProviderImpl::GetDistributionFirstRunTabs(browser_creator); if (first_run::IsChromeFirstRun()) { - tabs.emplace_back(GURL(chrome::kChromeUIWelcomeURL)); + tabs.emplace_back(GURL(kWelcomeURL)); } return tabs; } diff --git a/browser/ui/webui/brave_web_ui_controller_factory.cc b/browser/ui/webui/brave_web_ui_controller_factory.cc index 46c16d5feb3..ff5657a8f28 100644 --- a/browser/ui/webui/brave_web_ui_controller_factory.cc +++ b/browser/ui/webui/brave_web_ui_controller_factory.cc @@ -201,8 +201,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui, // in WebUI. url.host_piece() == chrome::kChromeUINewTabHost || url.host_piece() == chrome::kChromeUISettingsHost || - ((url.host_piece() == kWelcomeHost || - url.host_piece() == chrome::kChromeUIWelcomeURL) && + ((url.host_piece() == kWelcomeHost || url.host_piece() == kWelcomeURL) && !profile->IsGuestSession()) || #endif // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(ENABLE_TOR) diff --git a/components/constants/webui_url_constants.h b/components/constants/webui_url_constants.h index e6b19768c4a..a9218b67250 100644 --- a/components/constants/webui_url_constants.h +++ b/components/constants/webui_url_constants.h @@ -23,6 +23,7 @@ inline constexpr char kRewardsPageTopHost[] = "rewards.top-chrome"; inline constexpr char kRewardsPageTopURL[] = "chrome://rewards.top-chrome"; inline constexpr char kRewardsInternalsHost[] = "rewards-internals"; inline constexpr char kWelcomeHost[] = "welcome"; +inline constexpr char kWelcomeURL[] = "chrome://welcome/"; inline constexpr char kWelcomeJS[] = "brave_welcome.js"; inline constexpr char kBraveRewardsPanelURL[] = "chrome://rewards-panel.top-chrome"; diff --git a/test/filters/browser_tests-windows.filter b/test/filters/browser_tests-windows.filter index 4dc4aec82c0..581899734a7 100644 --- a/test/filters/browser_tests-windows.filter +++ b/test/filters/browser_tests-windows.filter @@ -51,9 +51,6 @@ # These tests fail upstream when DCHECKs are enabled. -PenIdBrowserTest.* -# This test is disabled because we override the default handling of the welcome page --StartupBrowserCreatorTriggeredResetFirstRunTest.TestTriggeredResetDoesNotShowWithFirstRunURLs - -All/MediaEngagementAutoplayBrowserTest.* -All/ExternallyManagedBrowserTestWithPrefMigrationRead.ReinstallPolicyAppWithLocallyInstalledApp/1 -All/PDFPluginDisabledTest.* diff --git a/test/filters/unit_tests.filter b/test/filters/unit_tests.filter index c4ac1b7fb2c..150118da3c3 100644 --- a/test/filters/unit_tests.filter +++ b/test/filters/unit_tests.filter @@ -684,10 +684,6 @@ # This test fails because our badge doesn't match the upstream badge -IconBadgingTest.VerifyFromDisk -# This test fails because it no longer modifies its expectations now that the -# kForYouFre feature flag was removed --StartupBrowserCreatorImplTest.DetermineStartupTabs_NewFeaturesPage - # These tests fail because we stub signin::ShouldShowSyncPromo to always return # false -ShowSyncPromoTest.*