From 792819e173e1cc9683ce36d033e574b873ea7c32 Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Fri, 8 Aug 2025 22:23:47 +0100 Subject: [PATCH] [cr141] `ScopedTestingLocalState` deleted The local state is always valid, and should be retrieved from `TestingBrowserProcess::GetGlobal()->GetTestingLocalState()`. Chromium changes: https://chromium.googlesource.com/chromium/src/+/68994f1d5aaecfdb064cdb62384538c16a5c7472 commit 68994f1d5aaecfdb064cdb62384538c16a5c7472 Author: Jun Ishiguro Date: Wed Aug 6 22:16:21 2025 -0700 Remove ScopedTestingLocalState usage (part 6) This CL removes usages of ScopedTestingLocalState, which has been deprecated. This CL was made by Gemini CLI. Bug: 422039036 Change-Id: I143e5bff8b52c15fb530e1c9719a05eb08758df2 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6805174 Commit-Queue: Jun Ishiguro Reviewed-by: Georg Neis Cr-Commit-Position: refs/heads/main@{#1498019} --- browser/ai_chat/upload_file_helper_unittest.cc | 15 +++++++-------- browser/brave_content_browser_client_unittest.cc | 10 +++++----- .../brave_shields_util_profiles_unittest.cc | 5 +---- ...rave_vpn_dns_observer_service_win_unittest.cc | 12 ++++++------ ...pn_wireguard_observer_service_win_unittest.cc | 7 +++---- ...ntralized_dns_navigation_throttle_unittest.cc | 16 ++++++++-------- browser/decentralized_dns/test/utils_unittest.cc | 8 ++++---- .../metrics/metrics_reporting_util_unittest.cc | 5 ----- browser/misc_metrics/theme_metrics_unittest.cc | 4 ---- ..._block_tp_network_delegate_helper_unittest.cc | 13 ++++--------- ...lized_dns_network_delegate_helper_unittest.cc | 11 ++++------- browser/playlist/test/playlist_unittest_base.cc | 3 +-- browser/playlist/test/playlist_unittest_base.h | 2 -- .../profiles/brave_profile_manager_unittest.cc | 9 +++------ .../test/render_view_context_menu_unittest.cc | 5 +---- browser/sync/brave_sync_client_unittest.cc | 11 +++-------- .../ui/commands/accelerator_service_unittest.cc | 10 +++++----- .../brave_bookmark_sub_menu_model_unittest.cc | 3 --- .../ui/toolbar/brave_vpn_menu_model_unittest.cc | 9 ++++----- .../views/toolbar/brave_vpn_button_unittest.cc | 9 ++++----- .../brave_education_page_handler_unittest.cc | 2 -- ...stomize_color_scheme_mode_handler_unittest.cc | 2 -- .../settings/brave_wallet_handler_unittest.cc | 5 +---- browser/web_discovery/web_discovery_unittest.cc | 3 --- .../widevine_permission_android_unittest.cc | 1 - .../external_protocol_handler_unittest.cc | 3 --- components/brave_shields/core/test/DEPS | 3 +-- .../core/test/brave_shields_utils_unittest.cc | 4 +--- 28 files changed, 66 insertions(+), 124 deletions(-) diff --git a/browser/ai_chat/upload_file_helper_unittest.cc b/browser/ai_chat/upload_file_helper_unittest.cc index 59d5af199c1..a6a77557a79 100644 --- a/browser/ai_chat/upload_file_helper_unittest.cc +++ b/browser/ai_chat/upload_file_helper_unittest.cc @@ -15,10 +15,10 @@ #include "brave/components/ai_chat/core/common/mojom/ai_chat.mojom-shared.h" #include "chrome/browser/ui/chrome_select_file_policy.h" #include "chrome/common/pref_names.h" -#include "chrome/test/base/scoped_testing_local_state.h" #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_profile.h" #include "components/prefs/pref_registry_simple.h" +#include "components/prefs/testing_pref_service.h" #include "content/public/test/file_system_chooser_test_helpers.h" #include "content/public/test/test_renderer_host.h" #include "content/public/test/web_contents_tester.h" @@ -71,15 +71,15 @@ class UploadFileHelperTest : public content::RenderViewHostTestHarness { ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); auto* profile = Profile::FromBrowserContext(browser_context()); - testing_local_state_ = std::make_unique( - TestingBrowserProcess::GetGlobal()); #if BUILDFLAG(IS_ANDROID) - testing_local_state_->Get()->registry()->RegisterBooleanPref( - prefs::kAllowFileSelectionDialogs, true); + TestingBrowserProcess::GetGlobal() + ->GetTestingLocalState() + ->registry() + ->RegisterBooleanPref(prefs::kAllowFileSelectionDialogs, true); #endif // To fulfill ChromeSelectFilePolicy::CanOpenSelectFileDialog() - testing_local_state_->Get()->SetBoolean(prefs::kAllowFileSelectionDialogs, - true); + TestingBrowserProcess::GetGlobal()->GetTestingLocalState()->SetBoolean( + prefs::kAllowFileSelectionDialogs, true); file_helper_ = std::make_unique(web_contents(), profile); } @@ -108,7 +108,6 @@ class UploadFileHelperTest : public content::RenderViewHostTestHarness { protected: base::ScopedTempDir temp_dir_; - std::unique_ptr testing_local_state_; std::unique_ptr file_helper_; // Must persist throughout TearDown(). content::SelectFileDialogParams dialog_params_; diff --git a/browser/brave_content_browser_client_unittest.cc b/browser/brave_content_browser_client_unittest.cc index 3cf49a7828c..d48b11eb2c0 100644 --- a/browser/brave_content_browser_client_unittest.cc +++ b/browser/brave_content_browser_client_unittest.cc @@ -11,9 +11,9 @@ #include "brave/components/skus/common/skus_utils.h" #include "build/build_config.h" #include "chrome/browser/chrome_content_browser_client.h" -#include "chrome/test/base/scoped_testing_local_state.h" #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_profile.h" +#include "components/prefs/testing_pref_service.h" #include "content/public/test/browser_task_environment.h" #include "extensions/buildflags/buildflags.h" #include "testing/gtest/include/gtest/gtest.h" @@ -81,14 +81,14 @@ TEST_F(BraveContentBrowserClientTest, GetOriginsRequiringDedicatedProcess) { TEST_F(BraveContentBrowserClientTest, IsWindowsRecallDisabled) { BraveContentBrowserClient client; - ScopedTestingLocalState testing_local_state( - TestingBrowserProcess::GetGlobal()); #if BUILDFLAG(IS_WIN) base::test::ScopedOSInfoOverride win_version( base::test::ScopedOSInfoOverride::Type::kWin11Home); // Pref is registered. - EXPECT_TRUE(testing_local_state.Get()->FindPreference( - windows_recall::prefs::kWindowsRecallDisabled)); + EXPECT_TRUE( + TestingBrowserProcess::GetGlobal() + ->GetTestingLocalState() + ->FindPreference(windows_recall::prefs::kWindowsRecallDisabled)); // Disabled by default on Win11 or newer. EXPECT_TRUE(client.IsWindowsRecallDisabled()); #else diff --git a/browser/brave_shields/brave_shields_util_profiles_unittest.cc b/browser/brave_shields/brave_shields_util_profiles_unittest.cc index 72ecbc67e8e..c309b1a68b7 100644 --- a/browser/brave_shields/brave_shields_util_profiles_unittest.cc +++ b/browser/brave_shields/brave_shields_util_profiles_unittest.cc @@ -7,7 +7,6 @@ #include "chrome/browser/content_settings/cookie_settings_factory.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/test/base/scoped_testing_local_state.h" #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_profile.h" #include "chrome/test/base/testing_profile_manager.h" @@ -36,8 +35,7 @@ namespace brave_shields { class BraveShieldsUtilProfilesTest : public testing::Test { public: - BraveShieldsUtilProfilesTest() - : local_state_(TestingBrowserProcess::GetGlobal()) {} + BraveShieldsUtilProfilesTest() = default; ~BraveShieldsUtilProfilesTest() override = default; TestingProfile* regular_profile() { return &profile_; } @@ -84,7 +82,6 @@ class BraveShieldsUtilProfilesTest : public testing::Test { private: content::BrowserTaskEnvironment task_environment_; TestingProfile profile_; - ScopedTestingLocalState local_state_; }; TEST_F(BraveShieldsUtilProfilesTest, SetBraveShieldsEnabled) { diff --git a/browser/brave_vpn/dns/brave_vpn_dns_observer_service_win_unittest.cc b/browser/brave_vpn/dns/brave_vpn_dns_observer_service_win_unittest.cc index bed9f005222..4c05e3018c0 100644 --- a/browser/brave_vpn/dns/brave_vpn_dns_observer_service_win_unittest.cc +++ b/browser/brave_vpn/dns/brave_vpn_dns_observer_service_win_unittest.cc @@ -21,9 +21,9 @@ #include "chrome/browser/net/system_network_context_manager.h" #include "chrome/browser/prefs/browser_prefs.h" #include "chrome/common/pref_names.h" -#include "chrome/test/base/scoped_testing_local_state.h" #include "chrome/test/base/testing_browser_process.h" #include "components/prefs/pref_registry_simple.h" +#include "components/prefs/testing_pref_service.h" #include "components/sync_preferences/testing_pref_service_syncable.h" #include "content/public/test/browser_task_environment.h" #include "net/dns/public/secure_dns_mode.h" @@ -45,7 +45,7 @@ class BraveVpnDnsObserverServiceUnitTest : public testing::Test { BraveVpnDnsObserverFactory::GetInstance()->RegisterProfilePrefs( profile_pref_service_.registry()); stub_resolver_config_reader_ = std::make_unique( - scoped_testing_local_state_.Get()); + TestingBrowserProcess::GetGlobal()->GetTestingLocalState()); SystemNetworkContextManager::set_stub_resolver_config_reader_for_testing( stub_resolver_config_reader_.get()); CreateDnsObserverService(); @@ -73,7 +73,9 @@ class BraveVpnDnsObserverServiceUnitTest : public testing::Test { SystemNetworkContextManager::GetStubResolverConfigReader(); config_reader->OverrideParentalControlsForTesting(value); } - PrefService* local_state() { return scoped_testing_local_state_.Get(); } + PrefService* local_state() { + return TestingBrowserProcess::GetGlobal()->GetTestingLocalState(); + } PrefService* pref_service() { return &profile_pref_service_; } void FireBraveVPNStateChange(mojom::ConnectionState state) { @@ -138,7 +140,7 @@ class BraveVpnDnsObserverServiceUnitTest : public testing::Test { } void SetManagedMode(const std::string& value) { - scoped_testing_local_state_.Get()->SetManagedPref( + TestingBrowserProcess::GetGlobal()->GetTestingLocalState()->SetManagedPref( ::prefs::kDnsOverHttpsMode, base::Value(value)); } @@ -147,8 +149,6 @@ class BraveVpnDnsObserverServiceUnitTest : public testing::Test { content::BrowserTaskEnvironment task_environment_; std::unique_ptr dns_observer_service_; sync_preferences::TestingPrefServiceSyncable profile_pref_service_; - ScopedTestingLocalState scoped_testing_local_state_{ - TestingBrowserProcess::GetGlobal()}; std::unique_ptr stub_resolver_config_reader_; }; diff --git a/browser/brave_vpn/win/brave_vpn_wireguard_observer_service_win_unittest.cc b/browser/brave_vpn/win/brave_vpn_wireguard_observer_service_win_unittest.cc index 227f35bc3f5..6f42844cced 100644 --- a/browser/brave_vpn/win/brave_vpn_wireguard_observer_service_win_unittest.cc +++ b/browser/brave_vpn/win/brave_vpn_wireguard_observer_service_win_unittest.cc @@ -10,8 +10,8 @@ #include "base/run_loop.h" #include "base/test/bind.h" #include "brave/components/brave_vpn/common/brave_vpn_utils.h" -#include "chrome/test/base/scoped_testing_local_state.h" #include "chrome/test/base/testing_browser_process.h" +#include "components/prefs/testing_pref_service.h" #include "components/sync_preferences/testing_pref_service_syncable.h" #include "content/public/test/browser_task_environment.h" #include "testing/gtest/include/gtest/gtest.h" @@ -23,7 +23,8 @@ class BraveVpnWireguardObserverServiceUnitTest : public testing::Test { BraveVpnWireguardObserverServiceUnitTest() {} void SetUp() override { - EnableWireguardIfPossible(scoped_testing_local_state_.Get()); + EnableWireguardIfPossible( + TestingBrowserProcess::GetGlobal()->GetTestingLocalState()); CreateWireguardObserverService(); } @@ -56,8 +57,6 @@ class BraveVpnWireguardObserverServiceUnitTest : public testing::Test { private: content::BrowserTaskEnvironment task_environment_; - ScopedTestingLocalState scoped_testing_local_state_{ - TestingBrowserProcess::GetGlobal()}; std::unique_ptr wireguard_observer_service_; }; diff --git a/browser/decentralized_dns/test/decentralized_dns_navigation_throttle_unittest.cc b/browser/decentralized_dns/test/decentralized_dns_navigation_throttle_unittest.cc index 2f0a135a0fe..69587ea133b 100644 --- a/browser/decentralized_dns/test/decentralized_dns_navigation_throttle_unittest.cc +++ b/browser/decentralized_dns/test/decentralized_dns_navigation_throttle_unittest.cc @@ -8,10 +8,10 @@ #include "base/memory/raw_ptr.h" #include "brave/components/tor/buildflags/buildflags.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/test/base/scoped_testing_local_state.h" #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_profile.h" #include "chrome/test/base/testing_profile_manager.h" +#include "components/prefs/testing_pref_service.h" #include "components/sync_preferences/testing_pref_service_syncable.h" #include "components/user_prefs/user_prefs.h" #include "content/public/test/browser_task_environment.h" @@ -44,7 +44,6 @@ class DecentralizedDnsNavigationThrottleTest : public testing::Test { void SetUp() override { ASSERT_TRUE(profile_manager_.SetUp()); profile_ = profile_manager_.CreateTestingProfile(kTestProfileName); - local_state_ = TestingBrowserProcess::GetGlobal()->GetTestingLocalState(); web_contents_ = content::WebContentsTester::CreateTestWebContents(profile_, nullptr); } @@ -52,7 +51,9 @@ class DecentralizedDnsNavigationThrottleTest : public testing::Test { void TearDown() override { web_contents_.reset(); } PrefService* user_prefs() { return user_prefs::UserPrefs::Get(profile_); } - PrefService* local_state() { return local_state_; } + PrefService* local_state() { + return TestingBrowserProcess::GetGlobal()->GetTestingLocalState(); + } content::WebContents* web_contents() { return web_contents_.get(); } // Helper that creates simple test guest profile. @@ -71,7 +72,6 @@ class DecentralizedDnsNavigationThrottleTest : public testing::Test { TestingProfileManager profile_manager_; std::unique_ptr web_contents_; std::string locale_; - raw_ptr local_state_ = nullptr; raw_ptr profile_ = nullptr; }; @@ -132,8 +132,7 @@ class DecentralizedDnsNavigationThrottleSubframeTest public: DecentralizedDnsNavigationThrottleSubframeTest() : content::RenderViewHostTestHarness( - base::test::TaskEnvironment::TimeSource::MOCK_TIME), - local_state_(TestingBrowserProcess::GetGlobal()) {} + base::test::TaskEnvironment::TimeSource::MOCK_TIME) {} ~DecentralizedDnsNavigationThrottleSubframeTest() override = default; void SetUp() override { @@ -151,7 +150,9 @@ class DecentralizedDnsNavigationThrottleSubframeTest } PrefService* user_prefs() { return &prefs_; } - PrefService* local_state() { return local_state_.Get(); } + PrefService* local_state() { + return TestingBrowserProcess::GetGlobal()->GetTestingLocalState(); + } content::RenderFrameHost* subframe() { return subframe_; } std::string locale() { return kLocale; } @@ -159,7 +160,6 @@ class DecentralizedDnsNavigationThrottleSubframeTest raw_ptr subframe_; sync_preferences::TestingPrefServiceSyncable prefs_; - ScopedTestingLocalState local_state_; }; TEST_F(DecentralizedDnsNavigationThrottleSubframeTest, Subframe) { diff --git a/browser/decentralized_dns/test/utils_unittest.cc b/browser/decentralized_dns/test/utils_unittest.cc index b656554b59c..44b77d69d44 100644 --- a/browser/decentralized_dns/test/utils_unittest.cc +++ b/browser/decentralized_dns/test/utils_unittest.cc @@ -8,7 +8,6 @@ #include "base/test/task_environment.h" #include "brave/components/decentralized_dns/core/constants.h" #include "brave/components/decentralized_dns/core/pref_names.h" -#include "chrome/test/base/scoped_testing_local_state.h" #include "chrome/test/base/testing_browser_process.h" #include "components/prefs/testing_pref_service.h" #include "testing/gtest/include/gtest/gtest.h" @@ -17,14 +16,15 @@ namespace decentralized_dns { class UtilsUnitTest : public testing::Test { public: - UtilsUnitTest() : local_state_(TestingBrowserProcess::GetGlobal()) {} + UtilsUnitTest() = default; ~UtilsUnitTest() override = default; - PrefService* local_state() { return local_state_.Get(); } + PrefService* local_state() { + return TestingBrowserProcess::GetGlobal()->GetTestingLocalState(); + } private: base::test::TaskEnvironment task_environment_; - ScopedTestingLocalState local_state_; }; TEST_F(UtilsUnitTest, IsUnstoppableDomainsTLD) { diff --git a/browser/metrics/metrics_reporting_util_unittest.cc b/browser/metrics/metrics_reporting_util_unittest.cc index e404e6dc8e3..76ef483af90 100644 --- a/browser/metrics/metrics_reporting_util_unittest.cc +++ b/browser/metrics/metrics_reporting_util_unittest.cc @@ -7,7 +7,6 @@ #include "brave/browser/metrics/buildflags/buildflags.h" #include "brave/browser/metrics/metrics_reporting_util.h" -#include "chrome/test/base/scoped_testing_local_state.h" #include "chrome/test/base/testing_browser_process.h" #include "components/metrics/metrics_pref_names.h" #include "components/prefs/pref_service.h" @@ -15,10 +14,6 @@ TEST(MetricsUtilTest, CrashReportPermissionAskDialogTest) { #if BUILDFLAG(ENABLE_CRASH_DIALOG) - std::unique_ptr local_state = - std::make_unique( - TestingBrowserProcess::GetGlobal()); - g_browser_process->local_state()->SetBoolean( metrics::prefs::kMetricsReportingEnabled, false); EXPECT_TRUE(ShouldShowCrashReportPermissionAskDialog()); diff --git a/browser/misc_metrics/theme_metrics_unittest.cc b/browser/misc_metrics/theme_metrics_unittest.cc index be2657faeaa..b38eea38341 100644 --- a/browser/misc_metrics/theme_metrics_unittest.cc +++ b/browser/misc_metrics/theme_metrics_unittest.cc @@ -12,7 +12,6 @@ #include "brave/components/constants/pref_names.h" #include "chrome/browser/themes/theme_service.h" #include "chrome/browser/themes/theme_service_factory.h" -#include "chrome/test/base/scoped_testing_local_state.h" #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_profile.h" #include "components/prefs/pref_registry_simple.h" @@ -26,8 +25,6 @@ namespace misc_metrics { class ThemeMetricsTest : public testing::Test { public: void SetUp() override { - local_state_ = std::make_unique( - TestingBrowserProcess::GetGlobal()); theme_service_ = ThemeServiceFactory::GetForProfile(&profile_); dark_mode::SetUseSystemDarkModeEnabledForTest(true); theme_metrics_ = std::make_unique(theme_service_); @@ -35,7 +32,6 @@ class ThemeMetricsTest : public testing::Test { protected: content::BrowserTaskEnvironment task_environment_; - std::unique_ptr local_state_; TestingProfile profile_; raw_ptr theme_service_; std::unique_ptr theme_metrics_; diff --git a/browser/net/brave_ad_block_tp_network_delegate_helper_unittest.cc b/browser/net/brave_ad_block_tp_network_delegate_helper_unittest.cc index ebcf69d3f1d..ae2f8ff618d 100644 --- a/browser/net/brave_ad_block_tp_network_delegate_helper_unittest.cc +++ b/browser/net/brave_ad_block_tp_network_delegate_helper_unittest.cc @@ -22,8 +22,8 @@ #include "brave/test/base/testing_brave_browser_process.h" #include "chrome/browser/net/system_network_context_manager.h" #include "chrome/common/chrome_paths.h" -#include "chrome/test/base/scoped_testing_local_state.h" #include "chrome/test/base/testing_browser_process.h" +#include "components/prefs/testing_pref_service.h" #include "content/public/test/browser_task_environment.h" #include "net/base/net_errors.h" #include "net/dns/mock_host_resolver.h" @@ -89,12 +89,9 @@ void FakeAdBlockSubscriptionDownloadManagerGetter( class BraveAdBlockTPNetworkDelegateHelperTest : public testing::Test { protected: void SetUp() override { - local_state_ = std::make_unique( - TestingBrowserProcess::GetGlobal()); - brave_component_updater_delegate_ = std::make_unique( - local_state_->Get()); + TestingBrowserProcess::GetGlobal()->GetTestingLocalState()); base::FilePath user_data_dir; DCHECK(base::PathService::Get(chrome::DIR_USER_DATA, &user_data_dir)); @@ -113,8 +110,8 @@ class BraveAdBlockTPNetworkDelegateHelperTest : public testing::Test { host_resolver_.get(), net::NetLog::Get()); brave::SetAdblockCnameHostResolverForTesting(resolver_wrapper_.get()); - stub_resolver_config_reader_ = - std::make_unique(local_state_->Get()); + stub_resolver_config_reader_ = std::make_unique( + TestingBrowserProcess::GetGlobal()->GetTestingLocalState()); SystemNetworkContextManager::set_stub_resolver_config_reader_for_testing( stub_resolver_config_reader_.get()); } @@ -146,8 +143,6 @@ class BraveAdBlockTPNetworkDelegateHelperTest : public testing::Test { return rc == net::ERR_IO_PENDING; } - std::unique_ptr local_state_; - std::unique_ptr brave_component_updater_delegate_; diff --git a/browser/net/decentralized_dns_network_delegate_helper_unittest.cc b/browser/net/decentralized_dns_network_delegate_helper_unittest.cc index 72ff82f2cad..0f83838e8d0 100644 --- a/browser/net/decentralized_dns_network_delegate_helper_unittest.cc +++ b/browser/net/decentralized_dns_network_delegate_helper_unittest.cc @@ -27,7 +27,6 @@ #include "brave/components/decentralized_dns/core/pref_names.h" #include "brave/components/decentralized_dns/core/utils.h" #include "build/build_config.h" -#include "chrome/test/base/scoped_testing_local_state.h" #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_profile.h" #include "components/prefs/testing_pref_service.h" @@ -47,9 +46,7 @@ namespace decentralized_dns { class DecentralizedDnsNetworkDelegateHelperTest : public testing::Test { public: - DecentralizedDnsNetworkDelegateHelperTest() - : local_state_(std::make_unique( - TestingBrowserProcess::GetGlobal())) {} + DecentralizedDnsNetworkDelegateHelperTest() = default; ~DecentralizedDnsNetworkDelegateHelperTest() override = default; @@ -70,12 +67,13 @@ class DecentralizedDnsNetworkDelegateHelperTest : public testing::Test { void TearDown() override { json_rpc_service_ = nullptr; profile_.reset(); - local_state_.reset(); } content::BrowserContext* browser_context() { return profile_.get(); } TestingProfile* profile() { return profile_.get(); } - PrefService* local_state() { return local_state_->Get(); } + PrefService* local_state() { + return TestingBrowserProcess::GetGlobal()->GetTestingLocalState(); + } network::TestURLLoaderFactory& test_url_loader_factory() { return test_url_loader_factory_; } @@ -84,7 +82,6 @@ class DecentralizedDnsNetworkDelegateHelperTest : public testing::Test { private: std::unique_ptr profile_; - std::unique_ptr local_state_; network::TestURLLoaderFactory test_url_loader_factory_; scoped_refptr shared_url_loader_factory_; raw_ptr json_rpc_service_ = nullptr; diff --git a/browser/playlist/test/playlist_unittest_base.cc b/browser/playlist/test/playlist_unittest_base.cc index 882d35a5704..7a46aeb117e 100644 --- a/browser/playlist/test/playlist_unittest_base.cc +++ b/browser/playlist/test/playlist_unittest_base.cc @@ -14,8 +14,7 @@ #include "components/sync_preferences/testing_pref_service_syncable.h" namespace playlist { -PlaylistUnitTestBase::PlaylistUnitTestBase() - : scoped_testing_local_state_(TestingBrowserProcess::GetGlobal()) {} +PlaylistUnitTestBase::PlaylistUnitTestBase() = default; PlaylistUnitTestBase::~PlaylistUnitTestBase() = default; diff --git a/browser/playlist/test/playlist_unittest_base.h b/browser/playlist/test/playlist_unittest_base.h index a9cbf7790d3..c0dab68b32d 100644 --- a/browser/playlist/test/playlist_unittest_base.h +++ b/browser/playlist/test/playlist_unittest_base.h @@ -10,7 +10,6 @@ #include "base/test/scoped_feature_list.h" #include "brave/components/playlist/common/features.h" -#include "chrome/test/base/scoped_testing_local_state.h" #include "components/prefs/testing_pref_service.h" #include "content/public/test/test_renderer_host.h" @@ -31,7 +30,6 @@ class PlaylistUnitTestBase : public content::RenderViewHostTestHarness { // content::RenderViewHostTestHarness: std::unique_ptr CreateBrowserContext() override; - ScopedTestingLocalState scoped_testing_local_state_; base::test::ScopedFeatureList feature_list_{features::kPlaylist}; }; } // namespace playlist diff --git a/browser/profiles/brave_profile_manager_unittest.cc b/browser/profiles/brave_profile_manager_unittest.cc index ff4a15c30a0..b09796cfef4 100644 --- a/browser/profiles/brave_profile_manager_unittest.cc +++ b/browser/profiles/brave_profile_manager_unittest.cc @@ -1,7 +1,7 @@ -// Copyright 2021 The Brave Authors. All rights reserved. +// Copyright (c) 2021 The Brave Authors. All rights reserved. // This Source Code Form is subject to the terms of the Mozilla Public // License, v. 2.0. If a copy of the MPL was not distributed with this file, -// you can obtain one at http://mozilla.org/MPL/2.0/. +// You can obtain one at https://mozilla.org/MPL/2.0/. #include "brave/browser/profiles/brave_profile_manager.h" @@ -19,7 +19,6 @@ #include "chrome/browser/profiles/profile_attributes_storage.h" #include "chrome/browser/ui/browser.h" #include "chrome/common/pref_names.h" -#include "chrome/test/base/scoped_testing_local_state.h" #include "chrome/test/base/test_browser_window.h" #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_profile.h" @@ -71,8 +70,7 @@ class TestingBraveProfileManager : public BraveProfileManagerWithoutInit { class BraveProfileManagerTest : public testing::Test { public: - BraveProfileManagerTest() - : local_state_(TestingBrowserProcess::GetGlobal()) {} + BraveProfileManagerTest() = default; void SetUp() override { ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); @@ -95,7 +93,6 @@ class BraveProfileManagerTest : public testing::Test { private: base::ScopedTempDir temp_dir_; content::BrowserTaskEnvironment task_environment_; - ScopedTestingLocalState local_state_; }; TEST_F(BraveProfileManagerTest, EnableMediaRouterOnRestartDefaultValue) { diff --git a/browser/renderer_context_menu/test/render_view_context_menu_unittest.cc b/browser/renderer_context_menu/test/render_view_context_menu_unittest.cc index ee791c2a7b0..38cb5d86fbb 100644 --- a/browser/renderer_context_menu/test/render_view_context_menu_unittest.cc +++ b/browser/renderer_context_menu/test/render_view_context_menu_unittest.cc @@ -15,7 +15,6 @@ #include "chrome/browser/custom_handlers/protocol_handler_registry_factory.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/ui/browser.h" -#include "chrome/test/base/scoped_testing_local_state.h" #include "chrome/test/base/test_browser_window.h" #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_profile.h" @@ -80,8 +79,7 @@ class BraveRenderViewContextMenuMock : public BraveRenderViewContextMenu { class BraveRenderViewContextMenuTest : public testing::Test { protected: - BraveRenderViewContextMenuTest() - : testing_local_state_(TestingBrowserProcess::GetGlobal()) {} + BraveRenderViewContextMenuTest() = default; content::WebContents* GetWebContents() { return web_contents_.get(); } // Returns a test context menu. @@ -148,7 +146,6 @@ class BraveRenderViewContextMenuTest : public testing::Test { private: content::BrowserTaskEnvironment browser_task_environment; - ScopedTestingLocalState testing_local_state_; std::unique_ptr profile_; std::unique_ptr registry_; std::unique_ptr browser_; diff --git a/browser/sync/brave_sync_client_unittest.cc b/browser/sync/brave_sync_client_unittest.cc index 1a00fe1420d..6bb641beacf 100644 --- a/browser/sync/brave_sync_client_unittest.cc +++ b/browser/sync/brave_sync_client_unittest.cc @@ -15,10 +15,10 @@ #include "chrome/browser/sync/chrome_sync_client.h" #include "chrome/browser/sync/sync_service_factory.h" #include "chrome/common/chrome_paths.h" -#include "chrome/test/base/scoped_testing_local_state.h" #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_profile.h" #include "chrome/test/base/testing_profile_manager.h" +#include "components/prefs/testing_pref_service.h" #include "components/search_engines/search_engines_pref_names.h" #include "components/sync/test/test_sync_service.h" #include "components/sync_preferences/pref_service_mock_factory.h" @@ -78,8 +78,6 @@ class BraveSyncClientTest : public testing::Test { content::BrowserTaskEnvironment task_environment_; std::unique_ptr profile_; base::ScopedTempDir temp_dir_; - - std::unique_ptr local_state_; }; // We need this because otherwise we'll get crash on uninitialized @@ -88,16 +86,13 @@ class BraveSyncClientTest : public testing::Test { // CreateAdBlockSubscriptionDownloadClient() => // g_brave_browser_process->ad_block_service() void BraveSyncClientTest::SetupAdblockServiceForBraveBrowserProcess() { - local_state_ = std::make_unique( - TestingBrowserProcess::GetGlobal()); - base::FilePath user_data_dir; DCHECK(base::PathService::Get(chrome::DIR_USER_DATA, &user_data_dir)); auto adblock_service = std::make_unique( - local_state_->Get(), "en", nullptr, + TestingBrowserProcess::GetGlobal()->GetTestingLocalState(), "en", nullptr, base::SingleThreadTaskRunner::GetCurrentDefault(), std::make_unique( - local_state_->Get(), + TestingBrowserProcess::GetGlobal()->GetTestingLocalState(), base::SingleThreadTaskRunner::GetCurrentDefault(), base::BindOnce(&FakeAdBlockSubscriptionDownloadManagerGetter), user_data_dir)); diff --git a/browser/ui/commands/accelerator_service_unittest.cc b/browser/ui/commands/accelerator_service_unittest.cc index 5679a8770cc..a1ad185bd50 100644 --- a/browser/ui/commands/accelerator_service_unittest.cc +++ b/browser/ui/commands/accelerator_service_unittest.cc @@ -22,9 +22,9 @@ #include "build/build_config.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/browser_process.h" -#include "chrome/test/base/scoped_testing_local_state.h" #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_profile.h" +#include "components/prefs/testing_pref_service.h" #include "content/public/test/browser_task_environment.h" #include "testing/gtest/include/gtest/gtest.h" @@ -430,21 +430,21 @@ TEST_F(AcceleratorServiceUnitTest, PolicyFiltering) { class AcceleratorServiceUnitTestWithLocalState : public testing::Test { public: - AcceleratorServiceUnitTestWithLocalState() - : testing_local_state_(TestingBrowserProcess::GetGlobal()) { + AcceleratorServiceUnitTestWithLocalState() { features_.InitAndEnableFeature(commands::features::kBraveCommands); } ~AcceleratorServiceUnitTestWithLocalState() override = default; TestingProfile& profile() { return profile_; } - PrefService* local_state() { return testing_local_state_.Get(); } + PrefService* local_state() { + return TestingBrowserProcess::GetGlobal()->GetTestingLocalState(); + } private: content::BrowserTaskEnvironment task_environment_; TestingProfile profile_; base::test::ScopedFeatureList features_; - ScopedTestingLocalState testing_local_state_; }; TEST_F(AcceleratorServiceUnitTestWithLocalState, PolicyFiltering) { diff --git a/browser/ui/toolbar/brave_bookmark_sub_menu_model_unittest.cc b/browser/ui/toolbar/brave_bookmark_sub_menu_model_unittest.cc index fe2139332a5..5015990fd2e 100644 --- a/browser/ui/toolbar/brave_bookmark_sub_menu_model_unittest.cc +++ b/browser/ui/toolbar/brave_bookmark_sub_menu_model_unittest.cc @@ -19,7 +19,6 @@ #include "chrome/browser/prefs/browser_prefs.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" -#include "chrome/test/base/scoped_testing_local_state.h" #include "chrome/test/base/test_browser_window.h" #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_profile.h" @@ -92,8 +91,6 @@ class BraveBookmarkSubMenuModelUnitTest : public testing::Test { protected: content::BrowserTaskEnvironment task_environment_; - ScopedTestingLocalState scoped_testing_local_state_{ - TestingBrowserProcess::GetGlobal()}; TestSimpleMenuDelegate delegate_; std::unique_ptr browser_; std::unique_ptr test_window_; diff --git a/browser/ui/toolbar/brave_vpn_menu_model_unittest.cc b/browser/ui/toolbar/brave_vpn_menu_model_unittest.cc index 440c08a6159..637d21f6b51 100644 --- a/browser/ui/toolbar/brave_vpn_menu_model_unittest.cc +++ b/browser/ui/toolbar/brave_vpn_menu_model_unittest.cc @@ -14,9 +14,9 @@ #include "brave/components/brave_vpn/common/pref_names.h" #include "brave/grit/brave_generated_resources.h" #include "chrome/browser/browser_process.h" -#include "chrome/test/base/scoped_testing_local_state.h" #include "chrome/test/base/testing_browser_process.h" #include "components/prefs/pref_service.h" +#include "components/prefs/testing_pref_service.h" #include "components/sync_preferences/testing_pref_service_syncable.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/l10n/l10n_util.h" @@ -30,16 +30,15 @@ class BraveVPNMenuModelUnitTest : public testing::Test { PrefService* prefs() { return &prefs_; } void SetUp() override { - local_state_ = std::make_unique( - TestingBrowserProcess::GetGlobal()); brave_vpn::RegisterProfilePrefs(prefs_.registry()); } - TestingPrefServiceSimple* local_state() { return local_state_->Get(); } + TestingPrefServiceSimple* local_state() { + return TestingBrowserProcess::GetGlobal()->GetTestingLocalState(); + } private: sync_preferences::TestingPrefServiceSyncable prefs_; - std::unique_ptr local_state_; }; #if BUILDFLAG(IS_WIN) diff --git a/browser/ui/views/toolbar/brave_vpn_button_unittest.cc b/browser/ui/views/toolbar/brave_vpn_button_unittest.cc index 96fc0d59c5a..a4ee2ffc2c6 100644 --- a/browser/ui/views/toolbar/brave_vpn_button_unittest.cc +++ b/browser/ui/views/toolbar/brave_vpn_button_unittest.cc @@ -20,10 +20,10 @@ #include "chrome/browser/prefs/browser_prefs.h" #include "chrome/browser/themes/theme_service_factory.h" #include "chrome/browser/ui/views/chrome_layout_provider.h" -#include "chrome/test/base/scoped_testing_local_state.h" #include "chrome/test/base/test_browser_window.h" #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_profile.h" +#include "components/prefs/testing_pref_service.h" #include "components/sync_preferences/testing_pref_service_syncable.h" #include "content/public/test/browser_task_environment.h" #include "services/network/public/cpp/weak_wrapper_shared_url_loader_factory.h" @@ -34,8 +34,7 @@ namespace brave_vpn { class BraveVpnButtonUnitTest : public testing::Test { public: - BraveVpnButtonUnitTest() - : testing_local_state_(TestingBrowserProcess::GetGlobal()) {} + BraveVpnButtonUnitTest() = default; BraveVpnButtonUnitTest(const BraveVpnButtonUnitTest&) = delete; BraveVpnButtonUnitTest& operator=(const BraveVpnButtonUnitTest&) = delete; @@ -67,7 +66,8 @@ class BraveVpnButtonUnitTest : public testing::Test { base::MakeRefCounted( &url_loader_factory_); auto manager = std::make_unique( - shared_url_loader_factory_, testing_local_state_.Get(), + shared_url_loader_factory_, + TestingBrowserProcess::GetGlobal()->GetTestingLocalState(), base::NullCallback()); manager->SetConnectionAPIImplForTesting( std::make_unique(manager.get(), @@ -122,7 +122,6 @@ class BraveVpnButtonUnitTest : public testing::Test { ChromeLayoutProvider layout_provider_; network::TestURLLoaderFactory url_loader_factory_; scoped_refptr shared_url_loader_factory_; - ScopedTestingLocalState testing_local_state_; std::unique_ptr browser_; std::unique_ptr test_window_; std::unique_ptr profile_; diff --git a/browser/ui/webui/brave_education/brave_education_page_handler_unittest.cc b/browser/ui/webui/brave_education/brave_education_page_handler_unittest.cc index 9ae2f1b0c76..5a7c3dc9553 100644 --- a/browser/ui/webui/brave_education/brave_education_page_handler_unittest.cc +++ b/browser/ui/webui/brave_education/brave_education_page_handler_unittest.cc @@ -12,7 +12,6 @@ #include "brave/browser/ui/webui/brave_browser_command/brave_browser_command_handler.h" #include "brave/components/brave_education/education_urls.h" #include "brave/components/brave_vpn/common/buildflags/buildflags.h" -#include "chrome/test/base/scoped_testing_local_state.h" #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_profile.h" #include "content/public/test/browser_task_environment.h" @@ -79,7 +78,6 @@ class BraveEducationPageHandlerTest : public testing::Test { private: content::BrowserTaskEnvironment task_environment_; - ScopedTestingLocalState local_state_{TestingBrowserProcess::GetGlobal()}; mojo::Remote remote_; std::unique_ptr profile_; diff --git a/browser/ui/webui/cr_components/customize_color_scheme_mode/brave_customize_color_scheme_mode_handler_unittest.cc b/browser/ui/webui/cr_components/customize_color_scheme_mode/brave_customize_color_scheme_mode_handler_unittest.cc index e3888d6e94c..41cd8afb3d4 100644 --- a/browser/ui/webui/cr_components/customize_color_scheme_mode/brave_customize_color_scheme_mode_handler_unittest.cc +++ b/browser/ui/webui/cr_components/customize_color_scheme_mode/brave_customize_color_scheme_mode_handler_unittest.cc @@ -11,7 +11,6 @@ #include "brave/browser/themes/brave_dark_mode_utils.h" #include "chrome/browser/themes/theme_service.h" #include "chrome/browser/themes/theme_service_factory.h" -#include "chrome/test/base/scoped_testing_local_state.h" #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_profile.h" #include "components/sync_preferences/testing_pref_service_syncable.h" @@ -65,7 +64,6 @@ class BraveCustomizeColorSchemeModeHandlerUnitTest : public testing::Test { } content::BrowserTaskEnvironment task_environment_; - ScopedTestingLocalState local_state_{TestingBrowserProcess::GetGlobal()}; TestingProfile testing_profile_; testing::NiceMock mock_client_; diff --git a/browser/ui/webui/settings/brave_wallet_handler_unittest.cc b/browser/ui/webui/settings/brave_wallet_handler_unittest.cc index d9e71171b7e..e043384aee7 100644 --- a/browser/ui/webui/settings/brave_wallet_handler_unittest.cc +++ b/browser/ui/webui/settings/brave_wallet_handler_unittest.cc @@ -28,7 +28,6 @@ #include "brave/components/brave_wallet/common/common_utils.h" #include "brave/components/brave_wallet/common/test_utils.h" #include "brave/components/brave_wallet/common/value_conversion_utils.h" -#include "chrome/test/base/scoped_testing_local_state.h" #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_profile.h" #include "components/prefs/scoped_user_pref_update.h" @@ -65,8 +64,7 @@ void UpdateCustomNetworks(PrefService* prefs, class TestBraveWalletHandler : public BraveWalletHandler { public: TestBraveWalletHandler() - : local_state_(TestingBrowserProcess::GetGlobal()), - shared_url_loader_factory_( + : shared_url_loader_factory_( base::MakeRefCounted( &url_loader_factory_)) { TestingProfile::Builder builder; @@ -148,7 +146,6 @@ class TestBraveWalletHandler : public BraveWalletHandler { } private: - ScopedTestingLocalState local_state_; content::BrowserTaskEnvironment browser_task_environment_; std::unique_ptr profile_; std::unique_ptr web_contents_; diff --git a/browser/web_discovery/web_discovery_unittest.cc b/browser/web_discovery/web_discovery_unittest.cc index 6120ea17269..d78ba275988 100644 --- a/browser/web_discovery/web_discovery_unittest.cc +++ b/browser/web_discovery/web_discovery_unittest.cc @@ -14,7 +14,6 @@ #include "chrome/browser/prefs/browser_prefs.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/search_engines/template_url_service_test_util.h" -#include "chrome/test/base/scoped_testing_local_state.h" #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_profile.h" #include "components/prefs/pref_service.h" @@ -94,8 +93,6 @@ class WebDiscoveryCTATest : public testing::Test { base::SimpleTestClock test_clock_; content::BrowserTaskEnvironment task_environment_; - ScopedTestingLocalState scoped_testing_local_state_{ - TestingBrowserProcess::GetGlobal()}; content::RenderViewHostTestEnabler render_view_host_test_enabler_; std::unique_ptr test_util_; std::unique_ptr web_contents_; diff --git a/browser/widevine/widevine_permission_android_unittest.cc b/browser/widevine/widevine_permission_android_unittest.cc index 72f5ee32b38..0310329baa8 100644 --- a/browser/widevine/widevine_permission_android_unittest.cc +++ b/browser/widevine/widevine_permission_android_unittest.cc @@ -11,7 +11,6 @@ #include "brave/components/permissions/permission_widevine_utils.h" #include "chrome/browser/download/download_permission_request.h" #include "chrome/test/base/chrome_render_view_host_test_harness.h" -#include "chrome/test/base/scoped_testing_local_state.h" #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_profile_manager.h" #include "components/permissions/permission_prompt.h" diff --git a/chromium_src/chrome/browser/external_protocol/external_protocol_handler_unittest.cc b/chromium_src/chrome/browser/external_protocol/external_protocol_handler_unittest.cc index d569b4a514e..01a39d738ba 100644 --- a/chromium_src/chrome/browser/external_protocol/external_protocol_handler_unittest.cc +++ b/chromium_src/chrome/browser/external_protocol/external_protocol_handler_unittest.cc @@ -7,7 +7,6 @@ #include -#include "chrome/test/base/scoped_testing_local_state.h" #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_profile.h" #include "content/public/test/browser_task_environment.h" @@ -18,8 +17,6 @@ class ExternalProtocolHandlerTest : public testing::Test { void SetUp() override { profile_ = std::make_unique(); } content::BrowserTaskEnvironment task_environment_; - ScopedTestingLocalState scoped_testing_local_state_{ - TestingBrowserProcess::GetGlobal()}; std::unique_ptr profile_; }; diff --git a/components/brave_shields/core/test/DEPS b/components/brave_shields/core/test/DEPS index 5f0a4fad092..b09e32f8d6d 100644 --- a/components/brave_shields/core/test/DEPS +++ b/components/brave_shields/core/test/DEPS @@ -18,8 +18,7 @@ specific_include_rules = { "!chrome/browser/content_settings/cookie_settings_factory.h", "!chrome/browser/content_settings/host_content_settings_map_factory.h", "!chrome/browser/profiles/profile.h", - "!chrome/test/base/scoped_testing_local_state.h", "!chrome/test/base/testing_browser_process.h", "!chrome/test/base/testing_profile.h", ], -} \ No newline at end of file +} diff --git a/components/brave_shields/core/test/brave_shields_utils_unittest.cc b/components/brave_shields/core/test/brave_shields_utils_unittest.cc index c871580b67b..d8dbf454c1c 100644 --- a/components/brave_shields/core/test/brave_shields_utils_unittest.cc +++ b/components/brave_shields/core/test/brave_shields_utils_unittest.cc @@ -19,7 +19,6 @@ #include "chrome/browser/content_settings/cookie_settings_factory.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/test/base/scoped_testing_local_state.h" #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_profile.h" #include "components/content_settings/core/browser/cookie_settings.h" @@ -44,7 +43,7 @@ using brave_shields::features::kBraveDomainBlock; class BraveShieldsUtilTest : public testing::Test { public: - BraveShieldsUtilTest() : local_state_(TestingBrowserProcess::GetGlobal()) {} + BraveShieldsUtilTest() = default; BraveShieldsUtilTest(const BraveShieldsUtilTest&) = delete; BraveShieldsUtilTest& operator=(const BraveShieldsUtilTest&) = delete; ~BraveShieldsUtilTest() override = default; @@ -83,7 +82,6 @@ class BraveShieldsUtilTest : public testing::Test { base::ScopedTempDir temp_dir_; content::BrowserTaskEnvironment task_environment_; std::unique_ptr profile_; - ScopedTestingLocalState local_state_; }; class BraveShieldsUtilDomainBlockFeatureTest : public BraveShieldsUtilTest {