From 10c9ed746e5dce78926b6789ad0ac37a601eb57c Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Fri, 14 May 2021 16:31:40 +0200 Subject: [PATCH] Move away from using base::{Bind,Callback,Closure}() base::{Bind,Callback,Closure}() have been deprecatedfor a while now, are finally gone on Chromium 92, so it would be good to migrate all current instances in the code (and stop introducing new ones) to the Once/Repeating variants instead to easy further rebases. This patch changes ALL instances of those old definitions and move to using the Once variants whenever possible (as they are preferred) and Repeating variants in every other case. Last, this patch also makes some changes in brave_rewards_api.{h,cc} to use weak pointers instead of base::Unretained() when binding callbacks, for extra safety (and consistency with existing code). [1] https://chromium-review.googlesource.com/c/chromium/src/+/2867526 Resolves https://github.com/brave/brave-browser/issues/15855 --- .../binance/android/binance_native_worker.cc | 24 +-- browser/brave_browser_process_impl.cc | 11 +- .../android/brave_rewards_native_worker.cc | 43 +++--- browser/brave_stats/brave_stats_updater.cc | 4 +- .../brave_stats_updater_browsertest.cc | 2 +- .../brave_devtools_ui_bindings_browsertest.cc | 12 +- browser/extensions/api/brave_rewards_api.cc | 55 +++---- browser/extensions/api/brave_rewards_api.h | 4 - browser/extensions/brave_component_loader.cc | 12 +- browser/mac/sparkle_glue.mm | 2 +- .../brave_httpse_network_delegate_helper.cc | 4 +- browser/net/brave_request_handler.cc | 43 +++--- browser/net/brave_request_handler.h | 2 - browser/net/url_context.h | 14 +- browser/p3a/p3a_core_metrics.cc | 11 +- .../brave_profile_manager_browsertest.cc | 2 +- .../search_engine_provider_service.cc | 4 +- ...ocation_navigation_throttle_browsertest.cc | 5 +- .../tor/tor_profile_manager_browsertest.cc | 2 +- .../brave_actions/brave_actions_container.cc | 12 +- .../ui/views/toolbar/brave_toolbar_view.cc | 8 +- .../toolbar/brave_toolbar_view_browsertest.cc | 2 +- browser/ui/webui/brave_rewards_page_ui.cc | 57 ++++--- browser/ui/webui/brave_tip_ui.cc | 23 +-- .../brave_new_tab_message_handler.cc | 139 ++++++++++-------- .../settings/brave_appearance_handler.cc | 4 +- .../brave_default_extensions_handler.cc | 19 ++- .../webui/settings/brave_privacy_handler.cc | 4 +- .../crl_set_component_installer.cc | 2 +- .../file_type_policies_component_installer.cc | 2 +- .../widevine_cdm_component_installer.cc | 2 +- .../render_view_context_menu.cc | 2 +- .../ui/webui/app_launcher_login_handler.cc | 2 +- .../browser/autofill_experiments_unittest.cc | 2 +- .../ranker_model_loader_impl_unittest.cc | 8 +- .../brave_ads/browser/ads_service_impl.cc | 19 ++- .../browser/ads_service_impl_unittest.cc | 26 ++-- .../browser/background_helper_win.cc | 5 +- .../browser/brave_referrals_service.cc | 7 +- .../brave_rewards/browser/rewards_service.h | 52 ++++--- .../browser/rewards_service_impl.cc | 131 ++++++++--------- .../browser/rewards_service_impl.h | 65 ++++---- .../browser/test/rewards_flag_browsertest.cc | 14 +- .../browser/https_everywhere_service.cc | 6 +- .../browser/brave_wallet_service.cc | 4 +- .../decentralized_dns_service.cc | 8 +- .../browser/greaselion_download_service.cc | 17 ++- components/ipfs/ipfs_p3a.cc | 5 +- components/ipfs/ipfs_service.cc | 6 +- components/p3a/brave_p3a_scheduler.cc | 4 +- components/p3a/brave_p3a_scheduler.h | 7 +- components/p3a/brave_p3a_service.cc | 4 +- .../speedreader/speedreader_component.cc | 4 +- .../driver/brave_sync_profile_sync_service.cc | 4 +- .../public/cpp/system_request_handler.h | 2 +- test/base/run_all_unittests.cc | 9 +- .../ledger/internal/ledger_database_impl.cc | 4 +- 57 files changed, 467 insertions(+), 480 deletions(-) diff --git a/browser/binance/android/binance_native_worker.cc b/browser/binance/android/binance_native_worker.cc index 86dad9cbab5a..3d861de1f71b 100644 --- a/browser/binance/android/binance_native_worker.cc +++ b/browser/binance/android/binance_native_worker.cc @@ -104,7 +104,7 @@ BinanceNativeWorker::GetOAuthClientUrl(JNIEnv* env) { void BinanceNativeWorker::GetAccessToken(JNIEnv* env) { if (binance_service_) { - binance_service_->GetAccessToken(base::Bind( + binance_service_->GetAccessToken(base::BindOnce( &BinanceNativeWorker::OnGetAccessToken, weak_factory_.GetWeakPtr())); } } @@ -139,8 +139,8 @@ void BinanceNativeWorker::OnGetAccessToken(bool success) { void BinanceNativeWorker::GetAccountBalances(JNIEnv* env) { if (binance_service_) { binance_service_->GetAccountBalances( - base::Bind(&BinanceNativeWorker::OnGetAccountBalances, - weak_factory_.GetWeakPtr())); + base::BindOnce(&BinanceNativeWorker::OnGetAccountBalances, + weak_factory_.GetWeakPtr())); } } @@ -164,8 +164,8 @@ void BinanceNativeWorker::GetConvertQuote( base::android::ConvertJavaStringToUTF8(env, from), base::android::ConvertJavaStringToUTF8(env, to), base::android::ConvertJavaStringToUTF8(env, amount), - base::Bind(&BinanceNativeWorker::OnGetConvertQuote, - weak_factory_.GetWeakPtr())); + base::BindOnce(&BinanceNativeWorker::OnGetConvertQuote, + weak_factory_.GetWeakPtr())); } } @@ -184,7 +184,7 @@ void BinanceNativeWorker::OnGetConvertQuote(const std::string& quote_id, void BinanceNativeWorker::GetCoinNetworks(JNIEnv* env) { if (binance_service_) { - binance_service_->GetCoinNetworks(base::Bind( + binance_service_->GetCoinNetworks(base::BindOnce( &BinanceNativeWorker::OnGetCoinNetworks, weak_factory_.GetWeakPtr())); } } @@ -206,8 +206,8 @@ void BinanceNativeWorker::GetDepositInfo( binance_service_->GetDepositInfo( base::android::ConvertJavaStringToUTF8(env, symbol), base::android::ConvertJavaStringToUTF8(env, ticker_network), - base::Bind(&BinanceNativeWorker::OnGetDepositInfo, - weak_factory_.GetWeakPtr())); + base::BindOnce(&BinanceNativeWorker::OnGetDepositInfo, + weak_factory_.GetWeakPtr())); } } @@ -227,8 +227,8 @@ void BinanceNativeWorker::ConfirmConvert( if (binance_service_) { binance_service_->ConfirmConvert( base::android::ConvertJavaStringToUTF8(env, quote_id), - base::Bind(&BinanceNativeWorker::OnConfirmConvert, - weak_factory_.GetWeakPtr())); + base::BindOnce(&BinanceNativeWorker::OnConfirmConvert, + weak_factory_.GetWeakPtr())); } } @@ -242,7 +242,7 @@ void BinanceNativeWorker::OnConfirmConvert(bool success, void BinanceNativeWorker::GetConvertAssets(JNIEnv* env) { if (binance_service_) { - binance_service_->GetConvertAssets(base::Bind( + binance_service_->GetConvertAssets(base::BindOnce( &BinanceNativeWorker::OnGetConvertAssets, weak_factory_.GetWeakPtr())); } } @@ -259,7 +259,7 @@ void BinanceNativeWorker::OnGetConvertAssets( void BinanceNativeWorker::RevokeToken(JNIEnv* env) { if (binance_service_) { - binance_service_->RevokeToken(base::Bind( + binance_service_->RevokeToken(base::BindOnce( &BinanceNativeWorker::OnRevokeToken, weak_factory_.GetWeakPtr())); } } diff --git a/browser/brave_browser_process_impl.cc b/browser/brave_browser_process_impl.cc index 5212d9e200f4..64259019c89d 100644 --- a/browser/brave_browser_process_impl.cc +++ b/browser/brave_browser_process_impl.cc @@ -98,7 +98,8 @@ namespace { // Initializes callback for SystemRequestHandler void InitSystemRequestHandlerCallback() { network::SystemRequestHandler::OnBeforeSystemRequestCallback - before_system_request_callback = base::Bind(brave::OnBeforeSystemRequest); + before_system_request_callback = + base::BindRepeating(brave::OnBeforeSystemRequest); network::SystemRequestHandler::GetInstance() ->RegisterOnBeforeSystemRequestCallback(before_system_request_callback); } @@ -146,14 +147,14 @@ void BraveBrowserProcessImpl::Init() { UpdateBraveDarkMode(); pref_change_registrar_.Add( kBraveDarkMode, - base::Bind(&BraveBrowserProcessImpl::OnBraveDarkModeChanged, - base::Unretained(this))); + base::BindRepeating(&BraveBrowserProcessImpl::OnBraveDarkModeChanged, + base::Unretained(this))); #if BUILDFLAG(ENABLE_TOR) pref_change_registrar_.Add( tor::prefs::kTorDisabled, - base::Bind(&BraveBrowserProcessImpl::OnTorEnabledChanged, - base::Unretained(this))); + base::BindRepeating(&BraveBrowserProcessImpl::OnTorEnabledChanged, + base::Unretained(this))); #endif InitSystemRequestHandlerCallback(); diff --git a/browser/brave_rewards/android/brave_rewards_native_worker.cc b/browser/brave_rewards/android/brave_rewards_native_worker.cc index 0ccd64b36268..00c682b2aee3 100644 --- a/browser/brave_rewards/android/brave_rewards_native_worker.cc +++ b/browser/brave_rewards/android/brave_rewards_native_worker.cc @@ -218,10 +218,8 @@ void BraveRewardsNativeWorker::OnGetRewardsParameters( } if (rewards_service) { - rewards_service->FetchBalance( - base::Bind( - &BraveRewardsNativeWorker::OnBalance, - weak_factory_.GetWeakPtr())); + rewards_service->FetchBalance(base::BindOnce( + &BraveRewardsNativeWorker::OnBalance, weak_factory_.GetWeakPtr())); } } @@ -265,9 +263,8 @@ void BraveRewardsNativeWorker::FetchGrants(JNIEnv* env) { void BraveRewardsNativeWorker::StartProcess(JNIEnv* env) { if (brave_rewards_service_) { - brave_rewards_service_->StartProcess(base::Bind( - &BraveRewardsNativeWorker::OnStartProcess, - weak_factory_.GetWeakPtr())); + brave_rewards_service_->StartProcess(base::BindOnce( + &BraveRewardsNativeWorker::OnStartProcess, weak_factory_.GetWeakPtr())); } } @@ -389,17 +386,17 @@ base::android::ScopedJavaLocalRef void BraveRewardsNativeWorker::GetPendingContributionsTotal(JNIEnv* env) { if (brave_rewards_service_) { - brave_rewards_service_->GetPendingContributionsTotal(base::Bind( - &BraveRewardsNativeWorker::OnGetPendingContributionsTotal, - weak_factory_.GetWeakPtr())); + brave_rewards_service_->GetPendingContributionsTotal(base::BindOnce( + &BraveRewardsNativeWorker::OnGetPendingContributionsTotal, + weak_factory_.GetWeakPtr())); } } void BraveRewardsNativeWorker::GetRecurringDonations(JNIEnv* env) { if (brave_rewards_service_) { - brave_rewards_service_->GetRecurringTips(base::Bind( - &BraveRewardsNativeWorker::OnGetRecurringTips, - weak_factory_.GetWeakPtr())); + brave_rewards_service_->GetRecurringTips( + base::BindOnce(&BraveRewardsNativeWorker::OnGetRecurringTips, + weak_factory_.GetWeakPtr())); } } @@ -426,8 +423,8 @@ bool BraveRewardsNativeWorker::IsCurrentPublisherInRecurrentDonations( void BraveRewardsNativeWorker::GetAutoContributeProperties(JNIEnv* env) { if (brave_rewards_service_) { brave_rewards_service_->GetAutoContributeProperties( - base::Bind(&BraveRewardsNativeWorker::OnGetAutoContributeProperties, - weak_factory_.GetWeakPtr())); + base::BindOnce(&BraveRewardsNativeWorker::OnGetAutoContributeProperties, + weak_factory_.GetWeakPtr())); } } @@ -452,17 +449,17 @@ bool BraveRewardsNativeWorker::IsAutoContributeEnabled(JNIEnv* env) { void BraveRewardsNativeWorker::GetReconcileStamp(JNIEnv* env) { if (brave_rewards_service_) { - brave_rewards_service_->GetReconcileStamp(base::Bind( - &BraveRewardsNativeWorker::OnGetGetReconcileStamp, - weak_factory_.GetWeakPtr())); + brave_rewards_service_->GetReconcileStamp( + base::BindOnce(&BraveRewardsNativeWorker::OnGetGetReconcileStamp, + weak_factory_.GetWeakPtr())); } } void BraveRewardsNativeWorker::ResetTheWholeState(JNIEnv* env) { if (brave_rewards_service_) { - brave_rewards_service_->CompleteReset(base::Bind( - &BraveRewardsNativeWorker::OnResetTheWholeState, - weak_factory_.GetWeakPtr())); + brave_rewards_service_->CompleteReset( + base::BindOnce(&BraveRewardsNativeWorker::OnResetTheWholeState, + weak_factory_.GetWeakPtr())); } else { JNIEnv* env = base::android::AttachCurrentThread(); @@ -680,8 +677,8 @@ void BraveRewardsNativeWorker::ProcessRewardsPageUrl(JNIEnv* env, std::string cpath = base::android::ConvertJavaStringToUTF8(env, path); std::string cquery = base::android::ConvertJavaStringToUTF8(env, query); auto callback = - base::Bind(&BraveRewardsNativeWorker::OnProcessRewardsPageUrl, - weak_factory_.GetWeakPtr()); + base::BindOnce(&BraveRewardsNativeWorker::OnProcessRewardsPageUrl, + weak_factory_.GetWeakPtr()); brave_rewards_service_->ProcessRewardsPageUrl(cpath, cquery, callback); } } diff --git a/browser/brave_stats/brave_stats_updater.cc b/browser/brave_stats/brave_stats_updater.cc index 761a3aa78d58..90a5bd2ccb1e 100644 --- a/browser/brave_stats/brave_stats_updater.cc +++ b/browser/brave_stats/brave_stats_updater.cc @@ -329,8 +329,8 @@ void BraveStatsUpdater::QueueServerPing() { pref_change_registrar_->Init(pref_service_); pref_change_registrar_->Add( kReferralInitialization, - base::Bind(&BraveStatsUpdater::OnReferralInitialization, - base::Unretained(this))); + base::BindRepeating(&BraveStatsUpdater::OnReferralInitialization, + base::Unretained(this))); } if (ads_enabled) { DetectUncertainFuture(); diff --git a/browser/brave_stats/brave_stats_updater_browsertest.cc b/browser/brave_stats/brave_stats_updater_browsertest.cc index a3b9703a0f9e..2bab740377ab 100644 --- a/browser/brave_stats/brave_stats_updater_browsertest.cc +++ b/browser/brave_stats/brave_stats_updater_browsertest.cc @@ -71,7 +71,7 @@ class BraveStatsUpdaterBrowserTest : public InProcessBrowserTest { void SetUpCommandLine(base::CommandLine* command_line) override { embedded_test_server()->RegisterRequestHandler( - base::Bind(&HandleRequestForStats)); + base::BindRepeating(&HandleRequestForStats)); ASSERT_TRUE(embedded_test_server()->Start()); command_line->AppendSwitchASCII( brave_stats::switches::kBraveStatsUpdaterServer, diff --git a/browser/devtools/brave_devtools_ui_bindings_browsertest.cc b/browser/devtools/brave_devtools_ui_bindings_browsertest.cc index 2a4be4eb7039..cc6f90330ba8 100644 --- a/browser/devtools/brave_devtools_ui_bindings_browsertest.cc +++ b/browser/devtools/brave_devtools_ui_bindings_browsertest.cc @@ -37,8 +37,8 @@ IN_PROC_BROWSER_TEST_F(BraveDevToolsUIBindingsBrowserTest, ThemeTest) { auto* devtools_ui_bindings = new BraveDevToolsUIBindings(web_contents); DCHECK(devtools_ui_bindings); devtools_ui_bindings->GetPreferences( - base::Bind(&BraveDevToolsUIBindingsBrowserTest::GetPreferenceCallback, - base::Unretained(this))); + base::BindOnce(&BraveDevToolsUIBindingsBrowserTest::GetPreferenceCallback, + base::Unretained(this))); // Check current devtools' theme is same as native theme when user doesn't // change devtools' theme explicitely. EXPECT_EQ(ui_theme_, "\"dark\""); @@ -46,15 +46,15 @@ IN_PROC_BROWSER_TEST_F(BraveDevToolsUIBindingsBrowserTest, ThemeTest) { dark_mode::SetBraveDarkModeType( dark_mode::BraveDarkModeType::BRAVE_DARK_MODE_TYPE_LIGHT); devtools_ui_bindings->GetPreferences( - base::Bind(&BraveDevToolsUIBindingsBrowserTest::GetPreferenceCallback, - base::Unretained(this))); + base::BindOnce(&BraveDevToolsUIBindingsBrowserTest::GetPreferenceCallback, + base::Unretained(this))); // In devtools, default is used as light. EXPECT_EQ(ui_theme_, "\"default\""); // When user sets devtools' theme explicitely, respect user's setting. devtools_ui_bindings->SetPreference("uiTheme", "\"dark\""); devtools_ui_bindings->GetPreferences( - base::Bind(&BraveDevToolsUIBindingsBrowserTest::GetPreferenceCallback, - base::Unretained(this))); + base::BindOnce(&BraveDevToolsUIBindingsBrowserTest::GetPreferenceCallback, + base::Unretained(this))); EXPECT_EQ(ui_theme_, "\"dark\""); } diff --git a/browser/extensions/api/brave_rewards_api.cc b/browser/extensions/api/brave_rewards_api.cc index 8c2832182bdf..a221d64c9281 100644 --- a/browser/extensions/api/brave_rewards_api.cc +++ b/browser/extensions/api/brave_rewards_api.cc @@ -122,9 +122,8 @@ BraveRewardsGetPublisherInfoFunction::Run() { rewards_service->GetPublisherInfo( params->publisher_key, - base::Bind( - &BraveRewardsGetPublisherInfoFunction::OnGetPublisherInfo, - this)); + base::BindOnce(&BraveRewardsGetPublisherInfoFunction::OnGetPublisherInfo, + this)); return RespondLater(); } @@ -170,7 +169,7 @@ BraveRewardsGetPublisherPanelInfoFunction::Run() { rewards_service->GetPublisherPanelInfo( params->publisher_key, - base::Bind( + base::BindOnce( &BraveRewardsGetPublisherPanelInfoFunction::OnGetPublisherPanelInfo, this)); @@ -225,11 +224,9 @@ BraveRewardsSavePublisherInfoFunction::Run() { publisher_info->favicon_url = params->fav_icon_url; rewards_service->SavePublisherInfo( - params->window_id, - std::move(publisher_info), - base::Bind( - &BraveRewardsSavePublisherInfoFunction::OnSavePublisherInfo, - this)); + params->window_id, std::move(publisher_info), + base::BindOnce( + &BraveRewardsSavePublisherInfoFunction::OnSavePublisherInfo, this)); return RespondLater(); } @@ -277,10 +274,6 @@ ExtensionFunction::ResponseAction BraveRewardsTipSiteFunction::Run() { return RespondNow(NoArguments()); } -BraveRewardsTipUserFunction::BraveRewardsTipUserFunction() - : weak_factory_(this) { -} - BraveRewardsTipUserFunction::~BraveRewardsTipUserFunction() { } @@ -331,8 +324,8 @@ void BraveRewardsTipUserFunction::OnProcessStarted( } rewards_service->GetPublisherInfo( publisher_key, - base::Bind(&BraveRewardsTipUserFunction::OnTipUserGetPublisherInfo, - this)); + base::BindOnce(&BraveRewardsTipUserFunction::OnTipUserGetPublisherInfo, + this)); } void BraveRewardsTipUserFunction::OnTipUserGetPublisherInfo( @@ -368,11 +361,9 @@ void BraveRewardsTipUserFunction::OnTipUserGetPublisherInfo( } rewards_service->SavePublisherInfo( - 0, - std::move(publisher_info), - base::Bind(&BraveRewardsTipUserFunction:: - OnTipUserSavePublisherInfo, - weak_factory_.GetWeakPtr())); + 0, std::move(publisher_info), + base::BindOnce(&BraveRewardsTipUserFunction::OnTipUserSavePublisherInfo, + this)); } void BraveRewardsTipUserFunction::OnTipUserSavePublisherInfo( @@ -650,9 +641,9 @@ BraveRewardsGetPendingContributionsTotalFunction::Run() { return RespondNow(OneArgument(base::Value(0.0))); } - rewards_service->GetPendingContributionsTotal(base::Bind( - &BraveRewardsGetPendingContributionsTotalFunction::OnGetPendingTotal, - this)); + rewards_service->GetPendingContributionsTotal(base::BindOnce( + &BraveRewardsGetPendingContributionsTotalFunction::OnGetPendingTotal, + this)); return RespondLater(); } @@ -747,11 +738,9 @@ BraveRewardsSaveRecurringTipFunction::Run() { } rewards_service_->SaveRecurringTip( - params->publisher_key, - params->new_amount, - base::Bind( - &BraveRewardsSaveRecurringTipFunction::OnSaveRecurringTip, - this)); + params->publisher_key, params->new_amount, + base::BindOnce(&BraveRewardsSaveRecurringTipFunction::OnSaveRecurringTip, + this)); return RespondLater(); } @@ -798,9 +787,8 @@ BraveRewardsGetRecurringTipsFunction::Run() { return RespondNow(Error("Rewards service is not initialized")); } - rewards_service->GetRecurringTips(base::Bind( - &BraveRewardsGetRecurringTipsFunction::OnGetRecurringTips, - this)); + rewards_service->GetRecurringTips(base::BindOnce( + &BraveRewardsGetRecurringTipsFunction::OnGetRecurringTips, this)); return RespondLater(); } @@ -1187,9 +1175,8 @@ BraveRewardsGetAnonWalletStatusFunction::Run() { return RespondNow(Error("Rewards service is not initialized")); } - rewards_service->GetAnonWalletStatus(base::Bind( - &BraveRewardsGetAnonWalletStatusFunction::OnGetAnonWalletStatus, - this)); + rewards_service->GetAnonWalletStatus(base::BindOnce( + &BraveRewardsGetAnonWalletStatusFunction::OnGetAnonWalletStatus, this)); return RespondLater(); } diff --git a/browser/extensions/api/brave_rewards_api.h b/browser/extensions/api/brave_rewards_api.h index 5b47180181b1..66ecfe5b076c 100644 --- a/browser/extensions/api/brave_rewards_api.h +++ b/browser/extensions/api/brave_rewards_api.h @@ -10,7 +10,6 @@ #include #include -#include "base/memory/weak_ptr.h" #include "brave/vendor/bat-native-ledger/include/bat/ledger/mojom_structs.h" #include "extensions/browser/extension_function.h" @@ -93,7 +92,6 @@ class BraveRewardsTipSiteFunction : public ExtensionFunction { class BraveRewardsTipUserFunction : public ExtensionFunction { public: - BraveRewardsTipUserFunction(); DECLARE_EXTENSION_FUNCTION("braveRewards.tipUser", UNKNOWN) protected: @@ -108,8 +106,6 @@ class BraveRewardsTipUserFunction : public ExtensionFunction { ledger::type::PublisherInfoPtr info); void OnTipUserSavePublisherInfo(const ledger::type::Result result); void ShowTipDialog(); - - base::WeakPtrFactory weak_factory_; }; class BraveRewardsGetPublisherDataFunction : public ExtensionFunction { diff --git a/browser/extensions/brave_component_loader.cc b/browser/extensions/brave_component_loader.cc index b53b2a152d8f..4de6a40a1a7c 100644 --- a/browser/extensions/brave_component_loader.cc +++ b/browser/extensions/brave_component_loader.cc @@ -52,8 +52,8 @@ BraveComponentLoader::BraveComponentLoader(ExtensionSystem* extension_system, pref_change_registrar_.Init(profile_prefs_); pref_change_registrar_.Add( brave_rewards::prefs::kAutoContributeEnabled, - base::Bind(&BraveComponentLoader::CheckRewardsStatus, - base::Unretained(this))); + base::BindRepeating(&BraveComponentLoader::CheckRewardsStatus, + base::Unretained(this))); #endif } @@ -102,10 +102,10 @@ void BraveComponentLoader::AddExtension(const std::string& extension_id, const std::string& public_key) { brave::RegisterComponent( g_browser_process->component_updater(), name, public_key, - base::Bind(&BraveComponentLoader::OnComponentRegistered, - base::Unretained(this), extension_id), - base::Bind(&BraveComponentLoader::OnComponentReady, - base::Unretained(this), extension_id, true)); + base::BindOnce(&BraveComponentLoader::OnComponentRegistered, + base::Unretained(this), extension_id), + base::BindRepeating(&BraveComponentLoader::OnComponentReady, + base::Unretained(this), extension_id, true)); } void BraveComponentLoader::AddHangoutServicesExtension() { diff --git a/browser/mac/sparkle_glue.mm b/browser/mac/sparkle_glue.mm index 207976e14ceb..478e0ad65145 100644 --- a/browser/mac/sparkle_glue.mm +++ b/browser/mac/sparkle_glue.mm @@ -50,7 +50,7 @@ static void PostPerform(id target, SEL sel, id arg) { FROM_HERE, {base::MayBlock(), base::TaskPriority::BEST_EFFORT, base::TaskShutdownBehavior::CONTINUE_ON_SHUTDOWN}, - base::Bind(&PerformBridge::Run, op.get())); + base::BindOnce(&PerformBridge::Run, std::move(op))); } // Convenience for the no-argument case. diff --git a/browser/net/brave_httpse_network_delegate_helper.cc b/browser/net/brave_httpse_network_delegate_helper.cc index c560bfe62c06..2a5a7b7ed6f8 100644 --- a/browser/net/brave_httpse_network_delegate_helper.cc +++ b/browser/net/brave_httpse_network_delegate_helper.cc @@ -79,8 +79,8 @@ int OnBeforeURLRequest_HttpsePreFileWork( g_brave_browser_process->https_everywhere_service() ->GetTaskRunner() ->PostTaskAndReply( - FROM_HERE, base::Bind(OnBeforeURLRequest_HttpseFileWork, ctx), - base::Bind( + FROM_HERE, base::BindOnce(OnBeforeURLRequest_HttpseFileWork, ctx), + base::BindOnce( base::IgnoreResult(&OnBeforeURLRequest_HttpsePostFileWork), next_callback, ctx)); return net::ERR_IO_PENDING; diff --git a/browser/net/brave_request_handler.cc b/browser/net/brave_request_handler.cc index 2ebc8d0e03d3..8d397b2cf57a 100644 --- a/browser/net/brave_request_handler.cc +++ b/browser/net/brave_request_handler.cc @@ -78,26 +78,27 @@ BraveRequestHandler::~BraveRequestHandler() = default; void BraveRequestHandler::SetupCallbacks() { brave::OnBeforeURLRequestCallback callback = - base::Bind(brave::OnBeforeURLRequest_SiteHacksWork); + base::BindRepeating(brave::OnBeforeURLRequest_SiteHacksWork); before_url_request_callbacks_.push_back(callback); - callback = base::Bind(brave::OnBeforeURLRequest_AdBlockTPPreWork); + callback = base::BindRepeating(brave::OnBeforeURLRequest_AdBlockTPPreWork); before_url_request_callbacks_.push_back(callback); - callback = base::Bind(brave::OnBeforeURLRequest_HttpsePreFileWork); + callback = base::BindRepeating(brave::OnBeforeURLRequest_HttpsePreFileWork); before_url_request_callbacks_.push_back(callback); - callback = base::Bind(brave::OnBeforeURLRequest_CommonStaticRedirectWork); + callback = + base::BindRepeating(brave::OnBeforeURLRequest_CommonStaticRedirectWork); before_url_request_callbacks_.push_back(callback); #if BUILDFLAG(DECENTRALIZED_DNS_ENABLED) && BUILDFLAG(BRAVE_WALLET_ENABLED) - callback = base::Bind( + callback = base::BindRepeating( decentralized_dns::OnBeforeURLRequest_DecentralizedDnsPreRedirectWork); before_url_request_callbacks_.push_back(callback); #endif #if BUILDFLAG(BRAVE_REWARDS_ENABLED) - callback = base::Bind(brave_rewards::OnBeforeURLRequest); + callback = base::BindRepeating(brave_rewards::OnBeforeURLRequest); before_url_request_callbacks_.push_back(callback); #endif @@ -112,35 +113,35 @@ void BraveRequestHandler::SetupCallbacks() { callback = base::BindRepeating(ipfs::OnBeforeURLRequest_IPFSRedirectWork); before_url_request_callbacks_.push_back(callback); brave::OnHeadersReceivedCallback ipfs_headers_received_callback = - base::Bind(ipfs::OnHeadersReceived_IPFSRedirectWork); + base::BindRepeating(ipfs::OnHeadersReceived_IPFSRedirectWork); headers_received_callbacks_.push_back(ipfs_headers_received_callback); } #endif brave::OnBeforeStartTransactionCallback start_transaction_callback = - base::Bind(brave::OnBeforeStartTransaction_SiteHacksWork); + base::BindRepeating(brave::OnBeforeStartTransaction_SiteHacksWork); before_start_transaction_callbacks_.push_back(start_transaction_callback); - start_transaction_callback = - base::Bind(brave::OnBeforeStartTransaction_GlobalPrivacyControlWork); + start_transaction_callback = base::BindRepeating( + brave::OnBeforeStartTransaction_GlobalPrivacyControlWork); before_start_transaction_callbacks_.push_back(start_transaction_callback); #if BUILDFLAG(ENABLE_BRAVE_REFERRALS) start_transaction_callback = - base::Bind(brave::OnBeforeStartTransaction_ReferralsWork); + base::BindRepeating(brave::OnBeforeStartTransaction_ReferralsWork); before_start_transaction_callbacks_.push_back(start_transaction_callback); #endif #if BUILDFLAG(ENABLE_BRAVE_WEBTORRENT) brave::OnHeadersReceivedCallback headers_received_callback = - base::Bind(webtorrent::OnHeadersReceived_TorrentRedirectWork); + base::BindRepeating(webtorrent::OnHeadersReceived_TorrentRedirectWork); headers_received_callbacks_.push_back(headers_received_callback); #endif if (base::FeatureList::IsEnabled( ::brave_shields::features::kBraveAdblockCspRules)) { brave::OnHeadersReceivedCallback headers_received_callback2 = - base::Bind(brave::OnHeadersReceived_AdBlockCspWork); + base::BindRepeating(brave::OnHeadersReceived_AdBlockCspWork); headers_received_callbacks_.push_back(headers_received_callback2); } } @@ -153,8 +154,8 @@ void BraveRequestHandler::InitPrefChangeRegistrar() { pref_change_registrar_->Init(prefs); pref_change_registrar_->Add( kReferralHeaders, - base::Bind(&BraveRequestHandler::OnReferralHeadersChanged, - base::Unretained(this))); + base::BindRepeating(&BraveRequestHandler::OnReferralHeadersChanged, + base::Unretained(this))); // Retrieve current referral headers, if any. OnReferralHeadersChanged(); #endif @@ -268,8 +269,8 @@ void BraveRequestHandler::RunNextCallback( brave::OnBeforeURLRequestCallback callback = before_url_request_callbacks_[ctx->next_url_request_index++]; brave::ResponseCallback next_callback = - base::Bind(&BraveRequestHandler::RunNextCallback, - weak_factory_.GetWeakPtr(), ctx); + base::BindRepeating(&BraveRequestHandler::RunNextCallback, + weak_factory_.GetWeakPtr(), ctx); rv = callback.Run(next_callback, ctx); if (rv == net::ERR_IO_PENDING) { return; @@ -284,8 +285,8 @@ void BraveRequestHandler::RunNextCallback( brave::OnBeforeStartTransactionCallback callback = before_start_transaction_callbacks_[ctx->next_url_request_index++]; brave::ResponseCallback next_callback = - base::Bind(&BraveRequestHandler::RunNextCallback, - weak_factory_.GetWeakPtr(), ctx); + base::BindRepeating(&BraveRequestHandler::RunNextCallback, + weak_factory_.GetWeakPtr(), ctx); rv = callback.Run(ctx->headers, next_callback, ctx); if (rv == net::ERR_IO_PENDING) { return; @@ -299,8 +300,8 @@ void BraveRequestHandler::RunNextCallback( brave::OnHeadersReceivedCallback callback = headers_received_callbacks_[ctx->next_url_request_index++]; brave::ResponseCallback next_callback = - base::Bind(&BraveRequestHandler::RunNextCallback, - weak_factory_.GetWeakPtr(), ctx); + base::BindRepeating(&BraveRequestHandler::RunNextCallback, + weak_factory_.GetWeakPtr(), ctx); rv = callback.Run(ctx->original_response_headers, ctx->override_response_headers, ctx->allowed_unsafe_redirect_url, next_callback, ctx); diff --git a/browser/net/brave_request_handler.h b/browser/net/brave_request_handler.h index 3a7548dfb26d..b79a4a22c984 100644 --- a/browser/net/brave_request_handler.h +++ b/browser/net/brave_request_handler.h @@ -21,8 +21,6 @@ class PrefChangeRegistrar; // API). class BraveRequestHandler { public: - using ResponseCallback = base::Callback; - BraveRequestHandler(); ~BraveRequestHandler(); diff --git a/browser/net/url_context.h b/browser/net/url_context.h index af4bf8a9bce8..07c8d4817cca 100644 --- a/browser/net/url_context.h +++ b/browser/net/url_context.h @@ -29,7 +29,7 @@ struct ResourceRequest; namespace brave { struct BraveRequestInfo; -using ResponseCallback = base::Callback; +using ResponseCallback = base::RepeatingCallback; } // namespace brave namespace brave_rewards { @@ -133,13 +133,13 @@ struct BraveRequestInfo { // ResponseListener using OnBeforeURLRequestCallback = - base::Callback ctx)>; + base::RepeatingCallback ctx)>; using OnBeforeStartTransactionCallback = - base::Callback ctx)>; -using OnHeadersReceivedCallback = base::Callback ctx)>; +using OnHeadersReceivedCallback = base::RepeatingCallback* override_response_headers, GURL* allowed_unsafe_redirect_url, diff --git a/browser/p3a/p3a_core_metrics.cc b/browser/p3a/p3a_core_metrics.cc index 295e3551bef2..b9d733d5c8d8 100644 --- a/browser/p3a/p3a_core_metrics.cc +++ b/browser/p3a/p3a_core_metrics.cc @@ -58,9 +58,10 @@ constexpr char kDailyUptimesListPrefName[] = "daily_uptimes"; BraveUptimeTracker::BraveUptimeTracker(PrefService* local_state) : state_(local_state, kDailyUptimesListPrefName) { - timer_.Start( - FROM_HERE, base::TimeDelta::FromMinutes(kUsageTimeQueryIntervalMinutes), - base::Bind(&BraveUptimeTracker::RecordUsage, base::Unretained(this))); + timer_.Start(FROM_HERE, + base::TimeDelta::FromMinutes(kUsageTimeQueryIntervalMinutes), + base::BindRepeating(&BraveUptimeTracker::RecordUsage, + base::Unretained(this))); } void BraveUptimeTracker::RecordUsage() { @@ -110,8 +111,8 @@ BraveWindowTracker::BraveWindowTracker(PrefService* local_state) BrowserList::AddObserver(this); timer_.Start(FROM_HERE, base::TimeDelta::FromMinutes(kWindowUsageP3AIntervalMinutes), - base::Bind(&BraveWindowTracker::UpdateP3AValues, - base::Unretained(this))); + base::BindRepeating(&BraveWindowTracker::UpdateP3AValues, + base::Unretained(this))); UpdateP3AValues(); } diff --git a/browser/profiles/brave_profile_manager_browsertest.cc b/browser/profiles/brave_profile_manager_browsertest.cc index 90555518c0b2..d59e69861131 100644 --- a/browser/profiles/brave_profile_manager_browsertest.cc +++ b/browser/profiles/brave_profile_manager_browsertest.cc @@ -104,7 +104,7 @@ IN_PROC_BROWSER_TEST_F(BraveProfileManagerTest, base::RunLoop run_loop; profile_manager->CreateProfileAsync( profile_data[i].profile_path, - base::Bind(&OnUnblockOnProfileCreation, &run_loop)); + base::BindRepeating(&OnUnblockOnProfileCreation, &run_loop)); run_loop.Run(); ProfileAttributesEntry* entry = storage.GetProfileAttributesWithPath(profile_data[i].profile_path); diff --git a/browser/search_engines/search_engine_provider_service.cc b/browser/search_engines/search_engine_provider_service.cc index 2ca1f291a5df..c455bf847e30 100644 --- a/browser/search_engines/search_engine_provider_service.cc +++ b/browser/search_engines/search_engine_provider_service.cc @@ -36,8 +36,8 @@ SearchEngineProviderService::SearchEngineProviderService( use_alternative_search_engine_provider_.Init( kUseAlternativeSearchEngineProvider, otr_profile_->GetOriginalProfile()->GetPrefs(), - base::Bind(&SearchEngineProviderService::OnPreferenceChanged, - base::Unretained(this))); + base::BindRepeating(&SearchEngineProviderService::OnPreferenceChanged, + base::Unretained(this))); std::vector alt_search_providers = { diff --git a/browser/tor/onion_location_navigation_throttle_browsertest.cc b/browser/tor/onion_location_navigation_throttle_browsertest.cc index b0854c0eb3a0..f7a2e0b6ca61 100644 --- a/browser/tor/onion_location_navigation_throttle_browsertest.cc +++ b/browser/tor/onion_location_navigation_throttle_browsertest.cc @@ -64,12 +64,13 @@ class OnionLocationNavigationThrottleBrowserTest : public InProcessBrowserTest { net::test_server::EmbeddedTestServer::TYPE_HTTPS)); test_https_server_->SetSSLConfig(net::EmbeddedTestServer::CERT_OK); test_https_server_->RegisterRequestHandler( - base::Bind(&HandleOnionLocation)); + base::BindRepeating(&HandleOnionLocation)); ASSERT_TRUE(test_https_server_->Start()); test_http_server_.reset(new net::EmbeddedTestServer( net::test_server::EmbeddedTestServer::TYPE_HTTP)); - test_http_server_->RegisterRequestHandler(base::Bind(&HandleOnionLocation)); + test_http_server_->RegisterRequestHandler( + base::BindRepeating(&HandleOnionLocation)); ASSERT_TRUE(test_http_server_->Start()); } diff --git a/browser/tor/tor_profile_manager_browsertest.cc b/browser/tor/tor_profile_manager_browsertest.cc index b802684721b7..d8c0a09d6bd7 100644 --- a/browser/tor/tor_profile_manager_browsertest.cc +++ b/browser/tor/tor_profile_manager_browsertest.cc @@ -63,7 +63,7 @@ Profile* SwitchToTorProfile(Profile* parent_profile, base::RunLoop run_loop; TorProfileManager::SwitchToTorProfile( parent_profile, - base::Bind(&OnUnblockOnProfileCreation, &run_loop, factory)); + base::BindRepeating(&OnUnblockOnProfileCreation, &run_loop, factory)); run_loop.Run(); BrowserList* browser_list = BrowserList::GetInstance(); diff --git a/browser/ui/views/brave_actions/brave_actions_container.cc b/browser/ui/views/brave_actions/brave_actions_container.cc index 4948939a02eb..02c4fb2d0aae 100644 --- a/browser/ui/views/brave_actions/brave_actions_container.cc +++ b/browser/ui/views/brave_actions/brave_actions_container.cc @@ -125,8 +125,8 @@ BraveActionsContainer::BraveActionsContainer(Browser* browser, Profile* profile) weak_ptr_factory_(this) { // Handle when the extension system is ready extension_system_->ready().Post( - FROM_HERE, base::Bind(&BraveActionsContainer::OnExtensionSystemReady, - weak_ptr_factory_.GetWeakPtr())); + FROM_HERE, base::BindOnce(&BraveActionsContainer::OnExtensionSystemReady, + weak_ptr_factory_.GetWeakPtr())); } BraveActionsContainer::~BraveActionsContainer() { @@ -164,10 +164,10 @@ void BraveActionsContainer::Init() { // React to Brave Rewards preferences changes. hide_brave_rewards_button_.Init( - brave_rewards::prefs::kHideButton, - browser_->profile()->GetPrefs(), - base::Bind(&BraveActionsContainer::OnBraveRewardsPreferencesChanged, - base::Unretained(this))); + brave_rewards::prefs::kHideButton, browser_->profile()->GetPrefs(), + base::BindRepeating( + &BraveActionsContainer::OnBraveRewardsPreferencesChanged, + base::Unretained(this))); } bool BraveActionsContainer::IsContainerAction(const std::string& id) const { diff --git a/browser/ui/views/toolbar/brave_toolbar_view.cc b/browser/ui/views/toolbar/brave_toolbar_view.cc index 70a0ee1fa567..e61bda7c1c13 100644 --- a/browser/ui/views/toolbar/brave_toolbar_view.cc +++ b/browser/ui/views/toolbar/brave_toolbar_view.cc @@ -135,13 +135,13 @@ void BraveToolbarView::Init() { // track changes in bookmarks enabled setting edit_bookmarks_enabled_.Init( bookmarks::prefs::kEditBookmarksEnabled, profile->GetPrefs(), - base::Bind(&BraveToolbarView::OnEditBookmarksEnabledChanged, - base::Unretained(this))); + base::BindRepeating(&BraveToolbarView::OnEditBookmarksEnabledChanged, + base::Unretained(this))); // track changes in wide locationbar setting location_bar_is_wide_.Init( kLocationBarIsWide, profile->GetPrefs(), - base::Bind(&BraveToolbarView::OnLocationBarIsWideChanged, - base::Unretained(this))); + base::BindRepeating(&BraveToolbarView::OnLocationBarIsWideChanged, + base::Unretained(this))); const auto callback = [](Browser* browser, int command, const ui::Event& event) { diff --git a/browser/ui/views/toolbar/brave_toolbar_view_browsertest.cc b/browser/ui/views/toolbar/brave_toolbar_view_browsertest.cc index 08a8a542ad79..5d0880ae7c4f 100644 --- a/browser/ui/views/toolbar/brave_toolbar_view_browsertest.cc +++ b/browser/ui/views/toolbar/brave_toolbar_view_browsertest.cc @@ -100,7 +100,7 @@ IN_PROC_BROWSER_TEST_F(BraveToolbarViewTest, base::FilePath new_path = profile_manager->GenerateNextProfileDirectoryPath(); base::RunLoop run_loop; profile_manager->CreateProfileAsync( - new_path, base::Bind(&OnUnblockOnProfileCreation, &run_loop)); + new_path, base::BindRepeating(&OnUnblockOnProfileCreation, &run_loop)); run_loop.Run(); ASSERT_EQ(2u, storage.GetNumberOfProfiles()); Profile* new_profile = profile_manager->GetProfileByPath(new_path); diff --git a/browser/ui/webui/brave_rewards_page_ui.cc b/browser/ui/webui/brave_rewards_page_ui.cc index 790ab3f30170..7968f7335aa2 100644 --- a/browser/ui/webui/brave_rewards_page_ui.cc +++ b/browser/ui/webui/brave_rewards_page_ui.cc @@ -569,8 +569,8 @@ void RewardsDOMHandler::GetAutoContributeProperties( AllowJavascript(); rewards_service_->GetAutoContributeProperties( - base::Bind(&RewardsDOMHandler::OnGetAutoContributeProperties, - weak_factory_.GetWeakPtr())); + base::BindOnce(&RewardsDOMHandler::OnGetAutoContributeProperties, + weak_factory_.GetWeakPtr())); } void RewardsDOMHandler::OnGetAutoContributeProperties( @@ -655,10 +655,8 @@ void RewardsDOMHandler::ClaimPromotion(const base::ListValue* args) { #if !defined(OS_ANDROID) rewards_service_->ClaimPromotion( - promotion_id, - base::Bind(&RewardsDOMHandler::OnClaimPromotion, - weak_factory_.GetWeakPtr(), - promotion_id)); + promotion_id, base::BindOnce(&RewardsDOMHandler::OnClaimPromotion, + weak_factory_.GetWeakPtr(), promotion_id)); #else // No need for a callback. The UI receives "brave_rewards.promotionFinish". brave_rewards::AttestPromotionCallback callback = base::DoNothing(); @@ -757,9 +755,8 @@ void RewardsDOMHandler::OnGetReconcileStamp(uint64_t reconcile_stamp) { void RewardsDOMHandler::GetReconcileStamp(const base::ListValue* args) { if (rewards_service_) { AllowJavascript(); - rewards_service_->GetReconcileStamp(base::Bind( - &RewardsDOMHandler::OnGetReconcileStamp, - weak_factory_.GetWeakPtr())); + rewards_service_->GetReconcileStamp(base::BindOnce( + &RewardsDOMHandler::OnGetReconcileStamp, weak_factory_.GetWeakPtr())); } } @@ -778,18 +775,15 @@ void RewardsDOMHandler::OnAutoContributePropsReady( filter->min_visits = properties->contribution_min_visits; rewards_service_->GetActivityInfoList( - 0, - 0, - std::move(filter), - base::Bind(&RewardsDOMHandler::OnPublisherList, - weak_factory_.GetWeakPtr())); + 0, 0, std::move(filter), + base::BindOnce(&RewardsDOMHandler::OnPublisherList, + weak_factory_.GetWeakPtr())); } void RewardsDOMHandler::GetExcludedSites(const base::ListValue* args) { AllowJavascript(); - rewards_service_->GetExcludedList( - base::Bind(&RewardsDOMHandler::OnExcludedSiteList, - weak_factory_.GetWeakPtr())); + rewards_service_->GetExcludedList(base::BindOnce( + &RewardsDOMHandler::OnExcludedSiteList, weak_factory_.GetWeakPtr())); } void RewardsDOMHandler::OnExcludedSitesChanged( @@ -971,8 +965,8 @@ void RewardsDOMHandler::GetAutoContributionAmount(const base::ListValue* args) { if (rewards_service_) { AllowJavascript(); rewards_service_->GetAutoContributionAmount( - base::Bind(&RewardsDOMHandler::OnGetContributionAmount, - weak_factory_.GetWeakPtr())); + base::BindOnce(&RewardsDOMHandler::OnGetContributionAmount, + weak_factory_.GetWeakPtr())); } } @@ -1079,8 +1073,8 @@ void RewardsDOMHandler::GetContributionList(const base::ListValue *args) { AllowJavascript(); rewards_service_->GetAutoContributeProperties( - base::Bind(&RewardsDOMHandler::OnAutoContributePropsReady, - weak_factory_.GetWeakPtr())); + base::BindOnce(&RewardsDOMHandler::OnAutoContributePropsReady, + weak_factory_.GetWeakPtr())); } void RewardsDOMHandler::GetAdsData(const base::ListValue *args) { @@ -1364,9 +1358,9 @@ void RewardsDOMHandler::GetPendingContributionsTotal( const base::ListValue* args) { if (rewards_service_) { AllowJavascript(); - rewards_service_->GetPendingContributionsTotal(base::Bind( - &RewardsDOMHandler::OnGetPendingContributionsTotal, - weak_factory_.GetWeakPtr())); + rewards_service_->GetPendingContributionsTotal( + base::BindOnce(&RewardsDOMHandler::OnGetPendingContributionsTotal, + weak_factory_.GetWeakPtr())); } } @@ -1396,7 +1390,7 @@ void RewardsDOMHandler::OnPublisherListNormalized( void RewardsDOMHandler::GetStatement( const base::ListValue* args) { AllowJavascript(); - ads_service_->GetAccountStatement(base::Bind( + ads_service_->GetAccountStatement(base::BindOnce( &RewardsDOMHandler::OnGetStatement, weak_factory_.GetWeakPtr())); } @@ -1440,7 +1434,7 @@ void RewardsDOMHandler::OnStatementChanged( } void RewardsDOMHandler::OnAdRewardsChanged() { - ads_service_->GetAccountStatement(base::Bind( + ads_service_->GetAccountStatement(base::BindOnce( &RewardsDOMHandler::OnGetStatement, weak_factory_.GetWeakPtr())); } @@ -1483,9 +1477,9 @@ void RewardsDOMHandler::GetPendingContributions( const base::ListValue* args) { if (rewards_service_) { AllowJavascript(); - rewards_service_->GetPendingContributions(base::Bind( - &RewardsDOMHandler::OnGetPendingContributions, - weak_factory_.GetWeakPtr())); + rewards_service_->GetPendingContributions( + base::BindOnce(&RewardsDOMHandler::OnGetPendingContributions, + weak_factory_.GetWeakPtr())); } } @@ -1948,9 +1942,8 @@ void RewardsDOMHandler::GetWalletPassphrase(const base::ListValue* args) { } AllowJavascript(); - rewards_service_->GetWalletPassphrase( - base::Bind(&RewardsDOMHandler::OnGetWalletPassphrase, - weak_factory_.GetWeakPtr())); + rewards_service_->GetWalletPassphrase(base::BindOnce( + &RewardsDOMHandler::OnGetWalletPassphrase, weak_factory_.GetWeakPtr())); } void RewardsDOMHandler::OnGetWalletPassphrase(const std::string& passphrase) { diff --git a/browser/ui/webui/brave_tip_ui.cc b/browser/ui/webui/brave_tip_ui.cc index aa5512408712..8fd2f217a7bd 100644 --- a/browser/ui/webui/brave_tip_ui.cc +++ b/browser/ui/webui/brave_tip_ui.cc @@ -298,9 +298,10 @@ void TipMessageHandler::GetPublisherBanner(const base::ListValue* args) { return; } - rewards_service_->GetPublisherBanner(publisher_key, base::Bind( - &TipMessageHandler::GetPublisherBannerCallback, - weak_factory_.GetWeakPtr())); + rewards_service_->GetPublisherBanner( + publisher_key, + base::BindOnce(&TipMessageHandler::GetPublisherBannerCallback, + weak_factory_.GetWeakPtr())); } void TipMessageHandler::GetRewardsParameters(const base::ListValue* args) { @@ -308,9 +309,9 @@ void TipMessageHandler::GetRewardsParameters(const base::ListValue* args) { return; } - rewards_service_->GetRewardsParameters(base::Bind( - &TipMessageHandler::GetRewardsParametersCallback, - weak_factory_.GetWeakPtr())); + rewards_service_->GetRewardsParameters( + base::BindOnce(&TipMessageHandler::GetRewardsParametersCallback, + weak_factory_.GetWeakPtr())); } void TipMessageHandler::GetOnboardingStatus(const base::ListValue* args) { @@ -354,9 +355,9 @@ void TipMessageHandler::GetReconcileStamp(const base::ListValue* args) { return; } - rewards_service_->GetReconcileStamp(base::Bind( - &TipMessageHandler::GetReconcileStampCallback, - weak_factory_.GetWeakPtr())); + rewards_service_->GetReconcileStamp( + base::BindOnce(&TipMessageHandler::GetReconcileStampCallback, + weak_factory_.GetWeakPtr())); } void TipMessageHandler::GetAutoContributeAmount(const base::ListValue* args) { @@ -365,8 +366,8 @@ void TipMessageHandler::GetAutoContributeAmount(const base::ListValue* args) { } rewards_service_->GetAutoContributionAmount( - base::Bind(&TipMessageHandler::GetAutoContributeAmountCallback, - weak_factory_.GetWeakPtr())); + base::BindOnce(&TipMessageHandler::GetAutoContributeAmountCallback, + weak_factory_.GetWeakPtr())); } void TipMessageHandler::SetAutoContributeAmount(const base::ListValue* args) { diff --git a/browser/ui/webui/new_tab_page/brave_new_tab_message_handler.cc b/browser/ui/webui/new_tab_page/brave_new_tab_message_handler.cc index 3ec181692858..37f30003c634 100644 --- a/browser/ui/webui/new_tab_page/brave_new_tab_message_handler.cc +++ b/browser/ui/webui/new_tab_page/brave_new_tab_message_handler.cc @@ -297,30 +297,39 @@ void BraveNewTabMessageHandler::OnJavascriptAllowed() { PrefService* prefs = profile_->GetPrefs(); pref_change_registrar_.Init(prefs); // Stats - pref_change_registrar_.Add(kAdsBlocked, - base::Bind(&BraveNewTabMessageHandler::OnStatsChanged, - base::Unretained(this))); - pref_change_registrar_.Add(kTrackersBlocked, - base::Bind(&BraveNewTabMessageHandler::OnStatsChanged, - base::Unretained(this))); - pref_change_registrar_.Add(kJavascriptBlocked, - base::Bind(&BraveNewTabMessageHandler::OnStatsChanged, - base::Unretained(this))); - pref_change_registrar_.Add(kHttpsUpgrades, - base::Bind(&BraveNewTabMessageHandler::OnStatsChanged, - base::Unretained(this))); - pref_change_registrar_.Add(kFingerprintingBlocked, - base::Bind(&BraveNewTabMessageHandler::OnStatsChanged, - base::Unretained(this))); + pref_change_registrar_.Add( + kAdsBlocked, + base::BindRepeating(&BraveNewTabMessageHandler::OnStatsChanged, + base::Unretained(this))); + pref_change_registrar_.Add( + kTrackersBlocked, + base::BindRepeating(&BraveNewTabMessageHandler::OnStatsChanged, + base::Unretained(this))); + pref_change_registrar_.Add( + kJavascriptBlocked, + base::BindRepeating(&BraveNewTabMessageHandler::OnStatsChanged, + base::Unretained(this))); + pref_change_registrar_.Add( + kHttpsUpgrades, + base::BindRepeating(&BraveNewTabMessageHandler::OnStatsChanged, + base::Unretained(this))); + pref_change_registrar_.Add( + kFingerprintingBlocked, + base::BindRepeating(&BraveNewTabMessageHandler::OnStatsChanged, + base::Unretained(this))); if (IsPrivateNewTab(profile_)) { // Private New Tab Page preferences - pref_change_registrar_.Add(kUseAlternativeSearchEngineProvider, - base::Bind(&BraveNewTabMessageHandler::OnPrivatePropertiesChanged, - base::Unretained(this))); - pref_change_registrar_.Add(kAlternativeSearchEngineProviderInTor, - base::Bind(&BraveNewTabMessageHandler::OnPrivatePropertiesChanged, - base::Unretained(this))); + pref_change_registrar_.Add( + kUseAlternativeSearchEngineProvider, + base::BindRepeating( + &BraveNewTabMessageHandler::OnPrivatePropertiesChanged, + base::Unretained(this))); + pref_change_registrar_.Add( + kAlternativeSearchEngineProviderInTor, + base::BindRepeating( + &BraveNewTabMessageHandler::OnPrivatePropertiesChanged, + base::Unretained(this))); } // News pref_change_registrar_.Add( @@ -328,49 +337,61 @@ void BraveNewTabMessageHandler::OnJavascriptAllowed() { base::Bind(&BraveNewTabMessageHandler::OnPreferencesChanged, base::Unretained(this))); // New Tab Page preferences - pref_change_registrar_.Add(kNewTabPageShowBackgroundImage, - base::Bind(&BraveNewTabMessageHandler::OnPreferencesChanged, - base::Unretained(this))); - pref_change_registrar_.Add(kNewTabPageShowSponsoredImagesBackgroundImage, - base::Bind(&BraveNewTabMessageHandler::OnPreferencesChanged, - base::Unretained(this))); - pref_change_registrar_.Add(kNewTabPageShowClock, - base::Bind(&BraveNewTabMessageHandler::OnPreferencesChanged, - base::Unretained(this))); - pref_change_registrar_.Add(kNewTabPageClockFormat, - base::Bind(&BraveNewTabMessageHandler::OnPreferencesChanged, - base::Unretained(this))); - pref_change_registrar_.Add(kNewTabPageShowStats, - base::Bind(&BraveNewTabMessageHandler::OnPreferencesChanged, - base::Unretained(this))); - pref_change_registrar_.Add(kNewTabPageShowToday, - base::Bind(&BraveNewTabMessageHandler::OnPreferencesChanged, - base::Unretained(this))); - pref_change_registrar_.Add(kNewTabPageShowRewards, - base::Bind(&BraveNewTabMessageHandler::OnPreferencesChanged, - base::Unretained(this))); - pref_change_registrar_.Add(kBrandedWallpaperNotificationDismissed, - base::Bind(&BraveNewTabMessageHandler::OnPreferencesChanged, - base::Unretained(this))); - pref_change_registrar_.Add(kNewTabPageShowBinance, - base::Bind(&BraveNewTabMessageHandler::OnPreferencesChanged, - base::Unretained(this))); - pref_change_registrar_.Add(kNewTabPageShowTogether, - base::Bind(&BraveNewTabMessageHandler::OnPreferencesChanged, - base::Unretained(this))); - pref_change_registrar_.Add(kNewTabPageShowGemini, - base::Bind(&BraveNewTabMessageHandler::OnPreferencesChanged, - base::Unretained(this))); + pref_change_registrar_.Add( + kNewTabPageShowBackgroundImage, + base::BindRepeating(&BraveNewTabMessageHandler::OnPreferencesChanged, + base::Unretained(this))); + pref_change_registrar_.Add( + kNewTabPageShowSponsoredImagesBackgroundImage, + base::BindRepeating(&BraveNewTabMessageHandler::OnPreferencesChanged, + base::Unretained(this))); + pref_change_registrar_.Add( + kNewTabPageShowClock, + base::BindRepeating(&BraveNewTabMessageHandler::OnPreferencesChanged, + base::Unretained(this))); + pref_change_registrar_.Add( + kNewTabPageClockFormat, + base::BindRepeating(&BraveNewTabMessageHandler::OnPreferencesChanged, + base::Unretained(this))); + pref_change_registrar_.Add( + kNewTabPageShowStats, + base::BindRepeating(&BraveNewTabMessageHandler::OnPreferencesChanged, + base::Unretained(this))); + pref_change_registrar_.Add( + kNewTabPageShowToday, + base::BindRepeating(&BraveNewTabMessageHandler::OnPreferencesChanged, + base::Unretained(this))); + pref_change_registrar_.Add( + kNewTabPageShowRewards, + base::BindRepeating(&BraveNewTabMessageHandler::OnPreferencesChanged, + base::Unretained(this))); + pref_change_registrar_.Add( + kBrandedWallpaperNotificationDismissed, + base::BindRepeating(&BraveNewTabMessageHandler::OnPreferencesChanged, + base::Unretained(this))); + pref_change_registrar_.Add( + kNewTabPageShowBinance, + base::BindRepeating(&BraveNewTabMessageHandler::OnPreferencesChanged, + base::Unretained(this))); + pref_change_registrar_.Add( + kNewTabPageShowTogether, + base::BindRepeating(&BraveNewTabMessageHandler::OnPreferencesChanged, + base::Unretained(this))); + pref_change_registrar_.Add( + kNewTabPageShowGemini, + base::BindRepeating(&BraveNewTabMessageHandler::OnPreferencesChanged, + base::Unretained(this))); #if BUILDFLAG(CRYPTO_DOT_COM_ENABLED) - pref_change_registrar_.Add(kCryptoDotComNewTabPageShowCryptoDotCom, - base::Bind(&BraveNewTabMessageHandler::OnPreferencesChanged, - base::Unretained(this))); + pref_change_registrar_.Add( + kCryptoDotComNewTabPageShowCryptoDotCom, + base::BindRepeating(&BraveNewTabMessageHandler::OnPreferencesChanged, + base::Unretained(this))); #endif #if BUILDFLAG(ENABLE_FTX) pref_change_registrar_.Add( kFTXNewTabPageShowFTX, - base::Bind(&BraveNewTabMessageHandler::OnPreferencesChanged, - base::Unretained(this))); + base::BindRepeating(&BraveNewTabMessageHandler::OnPreferencesChanged, + base::Unretained(this))); #endif #if BUILDFLAG(ENABLE_TOR) diff --git a/browser/ui/webui/settings/brave_appearance_handler.cc b/browser/ui/webui/settings/brave_appearance_handler.cc index bdc75333afe6..b7c6cb4aeb9a 100644 --- a/browser/ui/webui/settings/brave_appearance_handler.cc +++ b/browser/ui/webui/settings/brave_appearance_handler.cc @@ -26,8 +26,8 @@ BraveAppearanceHandler::BraveAppearanceHandler() { local_state_change_registrar_.Init(g_browser_process->local_state()); local_state_change_registrar_.Add( kBraveDarkMode, - base::Bind(&BraveAppearanceHandler::OnBraveDarkModeChanged, - base::Unretained(this))); + base::BindRepeating(&BraveAppearanceHandler::OnBraveDarkModeChanged, + base::Unretained(this))); } BraveAppearanceHandler::~BraveAppearanceHandler() = default; diff --git a/browser/ui/webui/settings/brave_default_extensions_handler.cc b/browser/ui/webui/settings/brave_default_extensions_handler.cc index 9e4f747af760..e9fc4289f0e3 100644 --- a/browser/ui/webui/settings/brave_default_extensions_handler.cc +++ b/browser/ui/webui/settings/brave_default_extensions_handler.cc @@ -172,25 +172,28 @@ void BraveDefaultExtensionsHandler::InitializePrefCallbacks() { pref_change_registrar_.Init(prefs); pref_change_registrar_.Add( kBraveEnabledMediaRouter, - base::Bind(&BraveDefaultExtensionsHandler::OnMediaRouterEnabledChanged, - base::Unretained(this))); + base::BindRepeating( + &BraveDefaultExtensionsHandler::OnMediaRouterEnabledChanged, + base::Unretained(this))); pref_change_registrar_.Add( prefs::kEnableMediaRouter, - base::Bind(&BraveDefaultExtensionsHandler::OnMediaRouterEnabledChanged, - base::Unretained(this))); + base::BindRepeating( + &BraveDefaultExtensionsHandler::OnMediaRouterEnabledChanged, + base::Unretained(this))); local_state_change_registrar_.Init(g_browser_process->local_state()); #if BUILDFLAG(ENABLE_TOR) local_state_change_registrar_.Add( tor::prefs::kTorDisabled, - base::Bind(&BraveDefaultExtensionsHandler::OnTorEnabledChanged, - base::Unretained(this))); + base::BindRepeating(&BraveDefaultExtensionsHandler::OnTorEnabledChanged, + base::Unretained(this))); #endif #if BUILDFLAG(ENABLE_WIDEVINE) local_state_change_registrar_.Add( kWidevineOptedIn, - base::Bind(&BraveDefaultExtensionsHandler::OnWidevineEnabledChanged, - base::Unretained(this))); + base::BindRepeating( + &BraveDefaultExtensionsHandler::OnWidevineEnabledChanged, + base::Unretained(this))); #endif } diff --git a/browser/ui/webui/settings/brave_privacy_handler.cc b/browser/ui/webui/settings/brave_privacy_handler.cc index eebfb0424040..d3b46e67f229 100644 --- a/browser/ui/webui/settings/brave_privacy_handler.cc +++ b/browser/ui/webui/settings/brave_privacy_handler.cc @@ -31,8 +31,8 @@ BravePrivacyHandler::BravePrivacyHandler() { #if BUILDFLAG(BRAVE_P3A_ENABLED) local_state_change_registrar_.Add( brave::kP3AEnabled, - base::Bind(&BravePrivacyHandler::OnP3AEnabledChanged, - base::Unretained(this))); + base::BindRepeating(&BravePrivacyHandler::OnP3AEnabledChanged, + base::Unretained(this))); #endif } diff --git a/chromium_src/chrome/browser/component_updater/crl_set_component_installer.cc b/chromium_src/chrome/browser/component_updater/crl_set_component_installer.cc index 3da823fe90b7..c586e58c182a 100644 --- a/chromium_src/chrome/browser/component_updater/crl_set_component_installer.cc +++ b/chromium_src/chrome/browser/component_updater/crl_set_component_installer.cc @@ -27,7 +27,7 @@ void RegisterCRLSetComponent(ComponentUpdateService* cus) { auto installer = base::MakeRefCounted( std::make_unique()); installer->Register(g_browser_process->component_updater(), - base::Bind(&OnCRLSetRegistered)); + base::BindOnce(&OnCRLSetRegistered)); } } // namespace component_updater diff --git a/chromium_src/chrome/browser/component_updater/file_type_policies_component_installer.cc b/chromium_src/chrome/browser/component_updater/file_type_policies_component_installer.cc index ac18ca0c34d3..528c018c7473 100644 --- a/chromium_src/chrome/browser/component_updater/file_type_policies_component_installer.cc +++ b/chromium_src/chrome/browser/component_updater/file_type_policies_component_installer.cc @@ -22,7 +22,7 @@ void OnFileTypePoliciesRegistered() { void RegisterFileTypePoliciesComponent(ComponentUpdateService* cus) { auto installer = base::MakeRefCounted( std::make_unique()); - installer->Register(cus, base::Bind(&OnFileTypePoliciesRegistered)); + installer->Register(cus, base::BindOnce(&OnFileTypePoliciesRegistered)); } } // namespace component_updater diff --git a/chromium_src/chrome/browser/component_updater/widevine_cdm_component_installer.cc b/chromium_src/chrome/browser/component_updater/widevine_cdm_component_installer.cc index 10aeda33973a..30f3c90c80b2 100644 --- a/chromium_src/chrome/browser/component_updater/widevine_cdm_component_installer.cc +++ b/chromium_src/chrome/browser/component_updater/widevine_cdm_component_installer.cc @@ -26,7 +26,7 @@ void RegisterAndInstallWidevine(ComponentUpdateService* cus) { // an on demand update. auto installer = base::MakeRefCounted( std::make_unique()); - installer->Register(cus, base::Bind(&OnWidevineRegistered)); + installer->Register(cus, base::BindOnce(&OnWidevineRegistered)); } } // namespace diff --git a/chromium_src/chrome/browser/renderer_context_menu/render_view_context_menu.cc b/chromium_src/chrome/browser/renderer_context_menu/render_view_context_menu.cc index 18b9827d6cc1..d2f1154fa166 100644 --- a/chromium_src/chrome/browser/renderer_context_menu/render_view_context_menu.cc +++ b/chromium_src/chrome/browser/renderer_context_menu/render_view_context_menu.cc @@ -170,7 +170,7 @@ void BraveRenderViewContextMenu::ExecuteCommand(int id, int event_flags) { case IDC_CONTENT_CONTEXT_OPENLINKTOR: TorProfileManager::SwitchToTorProfile( GetProfile(), - base::Bind( + base::BindRepeating( OnProfileCreated, params_.link_url, content::Referrer( GURL(), network::mojom::ReferrerPolicy::kStrictOrigin))); diff --git a/chromium_src/chrome/browser/ui/webui/app_launcher_login_handler.cc b/chromium_src/chrome/browser/ui/webui/app_launcher_login_handler.cc index 138399ddbfff..2e64e335857b 100644 --- a/chromium_src/chrome/browser/ui/webui/app_launcher_login_handler.cc +++ b/chromium_src/chrome/browser/ui/webui/app_launcher_login_handler.cc @@ -24,5 +24,5 @@ void AppLauncherLoginHandler::RegisterMessages() { AppLauncherLoginHandler::RegisterMessages_ChromiumImpl(); profile_info_watcher_ = std::make_unique( - Profile::FromWebUI(web_ui()), base::Bind(DummyCallback)); + Profile::FromWebUI(web_ui()), base::BindRepeating(DummyCallback)); } diff --git a/chromium_src/components/autofill/core/browser/autofill_experiments_unittest.cc b/chromium_src/components/autofill/core/browser/autofill_experiments_unittest.cc index 4fea6a33c229..a9fa0dfeef8c 100644 --- a/chromium_src/components/autofill/core/browser/autofill_experiments_unittest.cc +++ b/chromium_src/components/autofill/core/browser/autofill_experiments_unittest.cc @@ -25,7 +25,7 @@ class AutofillExperimentsTest : public testing::Test { void SetUp() override { pref_service_.registry()->RegisterBooleanPref( prefs::kAutofillWalletImportEnabled, true); - log_manager_ = LogManager::Create(nullptr, base::Closure()); + log_manager_ = LogManager::Create(nullptr, base::RepeatingClosure()); } bool IsCreditCardUploadEnabled(const AutofillSyncSigninState sync_state) { diff --git a/components/assist_ranker/ranker_model_loader_impl_unittest.cc b/components/assist_ranker/ranker_model_loader_impl_unittest.cc index 97ea93e87daa..1d037f46bbff 100644 --- a/components/assist_ranker/ranker_model_loader_impl_unittest.cc +++ b/components/assist_ranker/ranker_model_loader_impl_unittest.cc @@ -90,10 +90,10 @@ void RankerModelLoaderImplTest::SetUp() { bool RankerModelLoaderImplTest::DoLoaderTest(const base::FilePath& model_path, const GURL& model_url) { auto loader = std::make_unique( - base::Bind(&RankerModelLoaderImplTest::ValidateModel, - base::Unretained(this)), - base::Bind(&RankerModelLoaderImplTest::OnModelAvailable, - base::Unretained(this)), + base::BindRepeating(&RankerModelLoaderImplTest::ValidateModel, + base::Unretained(this)), + base::BindRepeating(&RankerModelLoaderImplTest::OnModelAvailable, + base::Unretained(this)), test_shared_loader_factory_, model_path, model_url, "RankerModelLoaderImplTest"); loader->NotifyOfRankerActivity(); diff --git a/components/brave_ads/browser/ads_service_impl.cc b/components/brave_ads/browser/ads_service_impl.cc index eca326df916e..b25b57182e5a 100644 --- a/components/brave_ads/browser/ads_service_impl.cc +++ b/components/brave_ads/browser/ads_service_impl.cc @@ -642,16 +642,18 @@ void AdsServiceImpl::Initialize() { profile_pref_change_registrar_.Init(profile_->GetPrefs()); profile_pref_change_registrar_.Add( - ads::prefs::kEnabled, - base::Bind(&AdsServiceImpl::OnPrefsChanged, base::Unretained(this))); + ads::prefs::kEnabled, base::BindRepeating(&AdsServiceImpl::OnPrefsChanged, + base::Unretained(this))); profile_pref_change_registrar_.Add( ads::prefs::kIdleTimeThreshold, - base::Bind(&AdsServiceImpl::OnPrefsChanged, base::Unretained(this))); + base::BindRepeating(&AdsServiceImpl::OnPrefsChanged, + base::Unretained(this))); profile_pref_change_registrar_.Add( brave_rewards::prefs::kWalletBrave, - base::Bind(&AdsServiceImpl::OnPrefsChanged, base::Unretained(this))); + base::BindRepeating(&AdsServiceImpl::OnPrefsChanged, + base::Unretained(this))); MaybeStart(false); } @@ -716,7 +718,7 @@ bool AdsServiceImpl::StartService() { .Pass()); bat_ads_service_.set_disconnect_handler( - base::Bind(&AdsServiceImpl::MaybeStart, AsWeakPtr(), true)); + base::BindOnce(&AdsServiceImpl::MaybeStart, AsWeakPtr(), true)); } SetEnvironment(); @@ -1070,11 +1072,8 @@ void AdsServiceImpl::OpenNewTabWithUrl(const std::string& url) { const content::OpenURLParams params(gurl, content::Referrer(), WindowOpenDisposition::NEW_FOREGROUND_TAB, ui::PAGE_TRANSITION_LINK, true); - - base::Callback callback = - base::Bind([](content::WebContents*) {}); - - ServiceTabLauncher::GetInstance()->LaunchTab(profile_, params, callback); + ServiceTabLauncher::GetInstance()->LaunchTab( + profile_, params, base::BindOnce([](content::WebContents*) {})); #else Browser* browser = chrome::FindTabbedBrowser(profile_, false); if (!browser) { diff --git a/components/brave_ads/browser/ads_service_impl_unittest.cc b/components/brave_ads/browser/ads_service_impl_unittest.cc index 6b5c3119e8a2..2b7f4b91ffbd 100644 --- a/components/brave_ads/browser/ads_service_impl_unittest.cc +++ b/components/brave_ads/browser/ads_service_impl_unittest.cc @@ -40,9 +40,9 @@ class MockRewardsService : public RewardsService { void(const uint32_t, const uint32_t, ledger::type::ActivityInfoFilterPtr, - const brave_rewards::GetPublisherInfoListCallback&)); + brave_rewards::GetPublisherInfoListCallback)); MOCK_METHOD1(GetExcludedList, - void(const brave_rewards::GetPublisherInfoListCallback&)); + void(brave_rewards::GetPublisherInfoListCallback)); MOCK_METHOD0(FetchPromotions, void()); MOCK_METHOD2(ClaimPromotion, void(const std::string&, brave_rewards::ClaimPromotionCallback)); @@ -70,19 +70,18 @@ class MockRewardsService : public RewardsService { const GURL&, const std::string&)); MOCK_METHOD1(GetReconcileStamp, - void(const brave_rewards::GetReconcileStampCallback&)); + void(brave_rewards::GetReconcileStampCallback)); MOCK_METHOD1(GetPublisherMinVisitTime, - void(const brave_rewards::GetPublisherMinVisitTimeCallback&)); + void(brave_rewards::GetPublisherMinVisitTimeCallback)); MOCK_CONST_METHOD1(SetPublisherMinVisitTime, void(int)); MOCK_METHOD1(GetPublisherMinVisits, - void(const brave_rewards::GetPublisherMinVisitsCallback&)); + void(brave_rewards::GetPublisherMinVisitsCallback)); MOCK_CONST_METHOD1(SetPublisherMinVisits, void(int)); - MOCK_METHOD1( - GetPublisherAllowNonVerified, - void(const brave_rewards::GetPublisherAllowNonVerifiedCallback&)); + MOCK_METHOD1(GetPublisherAllowNonVerified, + void(brave_rewards::GetPublisherAllowNonVerifiedCallback)); MOCK_CONST_METHOD1(SetPublisherAllowNonVerified, void(bool)); MOCK_METHOD1(GetPublisherAllowVideos, - void(const brave_rewards::GetPublisherAllowVideosCallback&)); + void(brave_rewards::GetPublisherAllowVideosCallback)); MOCK_CONST_METHOD1(SetPublisherAllowVideos, void(bool)); MOCK_CONST_METHOD1(SetAutoContributionAmount, void(double)); MOCK_METHOD1(GetAutoContributeEnabled, @@ -97,7 +96,7 @@ class MockRewardsService : public RewardsService { const std::string&, const std::string&)); MOCK_METHOD1(GetAutoContributionAmount, - void(const brave_rewards::GetAutoContributionAmountCallback&)); + void(brave_rewards::GetAutoContributionAmountCallback)); MOCK_METHOD2(GetPublisherBanner, void(const std::string&, brave_rewards::GetPublisherBannerCallback)); @@ -116,10 +115,9 @@ class MockRewardsService : public RewardsService { MOCK_METHOD0(CheckImported, bool()); MOCK_METHOD0(SetBackupCompleted, void()); MOCK_METHOD1(GetAutoContributeProperties, - void(const brave_rewards::GetAutoContributePropertiesCallback&)); - MOCK_METHOD1( - GetPendingContributionsTotal, - void(const brave_rewards::GetPendingContributionsTotalCallback&)); + void(brave_rewards::GetAutoContributePropertiesCallback)); + MOCK_METHOD1(GetPendingContributionsTotal, + void(brave_rewards::GetPendingContributionsTotalCallback)); MOCK_METHOD1(GetRewardsInternalsInfo, void(brave_rewards::GetRewardsInternalsInfoCallback)); MOCK_METHOD3(SaveRecurringTip, diff --git a/components/brave_ads/browser/background_helper_win.cc b/components/brave_ads/browser/background_helper_win.cc index 4dd7b1a19686..a4df4b5267a6 100644 --- a/components/brave_ads/browser/background_helper_win.cc +++ b/components/brave_ads/browser/background_helper_win.cc @@ -14,8 +14,9 @@ namespace brave_ads { BackgroundHelperWin::BackgroundHelperWin() { - singleton_hwnd_observer_.reset(new gfx::SingletonHwndObserver( - base::Bind(&BackgroundHelperWin::OnWndProc, base::Unretained(this)))); + singleton_hwnd_observer_.reset( + new gfx::SingletonHwndObserver(base::BindRepeating( + &BackgroundHelperWin::OnWndProc, base::Unretained(this)))); } BackgroundHelperWin::~BackgroundHelperWin() {} diff --git a/components/brave_referrals/browser/brave_referrals_service.cc b/components/brave_referrals/browser/brave_referrals_service.cc index 9985ebb92092..e9e89a008b31 100644 --- a/components/brave_referrals/browser/brave_referrals_service.cc +++ b/components/brave_referrals/browser/brave_referrals_service.cc @@ -354,10 +354,9 @@ void BraveReferralsService::OnReferralInitLoadComplete( ui::PAGE_TRANSITION_AUTO_TOPLEVEL, false); open_url_params.extra_headers = FormatExtraHeaders(headers, gurl); #if defined(OS_ANDROID) - base::Callback callback = - base::Bind([](content::WebContents*) {}); ServiceTabLauncher::GetInstance()->LaunchTab( - last_used_profile, open_url_params, callback); + last_used_profile, open_url_params, + base::BindOnce([](content::WebContents*) {})); #else chrome::ScopedTabbedBrowserDisplayer browser_displayer(last_used_profile); browser_displayer.browser()->OpenURL(open_url_params); @@ -365,7 +364,7 @@ void BraveReferralsService::OnReferralInitLoadComplete( } task_runner_->PostTask( - FROM_HERE, base::Bind(&DeletePromoCodeFile, GetPromoCodeFileName())); + FROM_HERE, base::BindOnce(&DeletePromoCodeFile, GetPromoCodeFileName())); } void BraveReferralsService::OnReferralFinalizationCheckLoadComplete( diff --git a/components/brave_rewards/browser/rewards_service.h b/components/brave_rewards/browser/rewards_service.h index 6796aa9dc6ab..7ff292ca03a7 100644 --- a/components/brave_rewards/browser/rewards_service.h +++ b/components/brave_rewards/browser/rewards_service.h @@ -39,17 +39,17 @@ class RewardsServiceObserver; class RewardsServicePrivateObserver; using GetPublisherInfoListCallback = - base::Callback; -using GetAutoContributionAmountCallback = base::Callback; -using GetAutoContributePropertiesCallback = base::Callback; -using GetPublisherMinVisitTimeCallback = base::Callback; -using GetPublisherMinVisitsCallback = base::Callback; -using GetPublisherAllowNonVerifiedCallback = base::Callback; -using GetPublisherAllowVideosCallback = base::Callback; + base::OnceCallback; +using GetAutoContributionAmountCallback = base::OnceCallback; +using GetAutoContributePropertiesCallback = + base::OnceCallback; +using GetPublisherMinVisitTimeCallback = base::OnceCallback; +using GetPublisherMinVisitsCallback = base::OnceCallback; +using GetPublisherAllowNonVerifiedCallback = base::OnceCallback; +using GetPublisherAllowVideosCallback = base::OnceCallback; using GetAutoContributeEnabledCallback = base::OnceCallback; -using GetReconcileStampCallback = base::Callback; -using GetPendingContributionsTotalCallback = base::Callback; +using GetReconcileStampCallback = base::OnceCallback; +using GetPendingContributionsTotalCallback = base::OnceCallback; using GetRewardsInternalsInfoCallback = base::OnceCallback; using SaveRecurringTipCallback = base::OnceCallback; @@ -130,7 +130,8 @@ using GetEventLogsCallback = using GetBraveWalletCallback = base::OnceCallback; -using GetWalletPassphraseCallback = base::Callback; +using GetWalletPassphraseCallback = + base::OnceCallback; class RewardsService : public KeyedService { public: @@ -141,13 +142,11 @@ class RewardsService : public KeyedService { virtual void CreateWallet(CreateWalletCallback callback) = 0; virtual void GetRewardsParameters(GetRewardsParametersCallback callback) = 0; - virtual void GetActivityInfoList( - const uint32_t start, - const uint32_t limit, - ledger::type::ActivityInfoFilterPtr filter, - const GetPublisherInfoListCallback& callback) = 0; - virtual void GetExcludedList( - const GetPublisherInfoListCallback& callback) = 0; + virtual void GetActivityInfoList(const uint32_t start, + const uint32_t limit, + ledger::type::ActivityInfoFilterPtr filter, + GetPublisherInfoListCallback callback) = 0; + virtual void GetExcludedList(GetPublisherInfoListCallback callback) = 0; virtual void FetchPromotions() = 0; // Used by desktop virtual void ClaimPromotion( @@ -179,19 +178,18 @@ class RewardsService : public KeyedService { const GURL& referrer, const std::string& post_data) = 0; - virtual void GetReconcileStamp( - const GetReconcileStampCallback& callback) = 0; + virtual void GetReconcileStamp(GetReconcileStampCallback callback) = 0; virtual void GetPublisherMinVisitTime( - const GetPublisherMinVisitTimeCallback& callback) = 0; + GetPublisherMinVisitTimeCallback callback) = 0; virtual void SetPublisherMinVisitTime(int duration_in_seconds) const = 0; virtual void GetPublisherMinVisits( - const GetPublisherMinVisitsCallback& callback) = 0; + GetPublisherMinVisitsCallback callback) = 0; virtual void SetPublisherMinVisits(int visits) const = 0; virtual void GetPublisherAllowNonVerified( - const GetPublisherAllowNonVerifiedCallback& callback) = 0; + GetPublisherAllowNonVerifiedCallback callback) = 0; virtual void SetPublisherAllowNonVerified(bool allow) const = 0; virtual void GetPublisherAllowVideos( - const GetPublisherAllowVideosCallback& callback) = 0; + GetPublisherAllowVideosCallback callback) = 0; virtual void SetPublisherAllowVideos(bool allow) const = 0; virtual void SetAutoContributionAmount(double amount) const = 0; virtual void GetAutoContributeEnabled( @@ -214,7 +212,7 @@ class RewardsService : public KeyedService { const std::string& favicon_url, const std::string& publisher_blob) = 0; virtual void GetAutoContributionAmount( - const GetAutoContributionAmountCallback& callback) = 0; + GetAutoContributionAmountCallback callback) = 0; virtual void GetPublisherBanner(const std::string& publisher_id, GetPublisherBannerCallback callback) = 0; virtual void OnTip( @@ -238,9 +236,9 @@ class RewardsService : public KeyedService { virtual RewardsNotificationService* GetNotificationService() const = 0; virtual void SetBackupCompleted() = 0; virtual void GetAutoContributeProperties( - const GetAutoContributePropertiesCallback& callback) = 0; + GetAutoContributePropertiesCallback callback) = 0; virtual void GetPendingContributionsTotal( - const GetPendingContributionsTotalCallback& callback) = 0; + GetPendingContributionsTotalCallback callback) = 0; virtual void GetRewardsInternalsInfo( GetRewardsInternalsInfoCallback callback) = 0; virtual void AddPrivateObserver( diff --git a/components/brave_rewards/browser/rewards_service_impl.cc b/components/brave_rewards/browser/rewards_service_impl.cc index 5df92604df66..c20da02d5fbd 100644 --- a/components/brave_rewards/browser/rewards_service_impl.cc +++ b/components/brave_rewards/browser/rewards_service_impl.cc @@ -382,31 +382,29 @@ void RewardsServiceImpl::Init( void RewardsServiceImpl::InitPrefChangeRegistrar() { profile_pref_change_registrar_.Init(profile_->GetPrefs()); profile_pref_change_registrar_.Add( - prefs::kHideButton, base::Bind(&RewardsServiceImpl::OnPreferenceChanged, - base::Unretained(this))); + prefs::kHideButton, + base::BindRepeating(&RewardsServiceImpl::OnPreferenceChanged, + base::Unretained(this))); profile_pref_change_registrar_.Add( prefs::kInlineTipTwitterEnabled, - base::Bind( - &RewardsServiceImpl::OnPreferenceChanged, - base::Unretained(this))); + base::BindRepeating(&RewardsServiceImpl::OnPreferenceChanged, + base::Unretained(this))); profile_pref_change_registrar_.Add( prefs::kInlineTipRedditEnabled, - base::Bind( - &RewardsServiceImpl::OnPreferenceChanged, - base::Unretained(this))); + base::BindRepeating(&RewardsServiceImpl::OnPreferenceChanged, + base::Unretained(this))); profile_pref_change_registrar_.Add( prefs::kInlineTipGithubEnabled, - base::Bind( - &RewardsServiceImpl::OnPreferenceChanged, - base::Unretained(this))); + base::BindRepeating(&RewardsServiceImpl::OnPreferenceChanged, + base::Unretained(this))); profile_pref_change_registrar_.Add( prefs::kAutoContributeEnabled, - base::Bind( - &RewardsServiceImpl::OnPreferenceChanged, - base::Unretained(this))); + base::BindRepeating(&RewardsServiceImpl::OnPreferenceChanged, + base::Unretained(this))); profile_pref_change_registrar_.Add( - ads::prefs::kEnabled, base::Bind(&RewardsServiceImpl::OnPreferenceChanged, - base::Unretained(this))); + ads::prefs::kEnabled, + base::BindRepeating(&RewardsServiceImpl::OnPreferenceChanged, + base::Unretained(this))); } void RewardsServiceImpl::OnPreferenceChanged(const std::string& key) { @@ -464,7 +462,7 @@ void RewardsServiceImpl::StartLedgerProcessIfNecessary() { .Pass()); bat_ledger_service_.set_disconnect_handler( - base::Bind(&RewardsServiceImpl::ConnectionClosed, AsWeakPtr())); + base::BindOnce(&RewardsServiceImpl::ConnectionClosed, AsWeakPtr())); } ledger::type::Environment environment = ledger::type::Environment::STAGING; @@ -616,36 +614,32 @@ void RewardsServiceImpl::GetActivityInfoList( uint32_t start, uint32_t limit, ledger::type::ActivityInfoFilterPtr filter, - const GetPublisherInfoListCallback& callback) { + GetPublisherInfoListCallback callback) { if (!Connected()) { return; } bat_ledger_->GetActivityInfoList( - start, - limit, - std::move(filter), - base::BindOnce(&RewardsServiceImpl::OnGetPublisherInfoList, - AsWeakPtr(), - callback)); + start, limit, std::move(filter), + base::BindOnce(&RewardsServiceImpl::OnGetPublisherInfoList, AsWeakPtr(), + std::move(callback))); } void RewardsServiceImpl::GetExcludedList( - const GetPublisherInfoListCallback& callback) { + GetPublisherInfoListCallback callback) { if (!Connected()) { return; } - bat_ledger_->GetExcludedList(base::BindOnce( - &RewardsServiceImpl::OnGetPublisherInfoList, - AsWeakPtr(), - callback)); + bat_ledger_->GetExcludedList( + base::BindOnce(&RewardsServiceImpl::OnGetPublisherInfoList, AsWeakPtr(), + std::move(callback))); } void RewardsServiceImpl::OnGetPublisherInfoList( - const GetPublisherInfoListCallback& callback, + GetPublisherInfoListCallback callback, ledger::type::PublisherInfoList list) { - callback.Run(std::move(list)); + std::move(callback).Run(std::move(list)); } void RewardsServiceImpl::OnLoad(SessionID tab_id, const GURL& url) { @@ -863,14 +857,14 @@ void RewardsServiceImpl::OnGetBraveWalletForP3A( } void RewardsServiceImpl::OnGetAutoContributeProperties( - const GetAutoContributePropertiesCallback& callback, + GetAutoContributePropertiesCallback callback, ledger::type::AutoContributePropertiesPtr properties) { if (!properties) { - callback.Run(nullptr); + std::move(callback).Run(nullptr); return; } - callback.Run(std::move(properties)); + std::move(callback).Run(std::move(properties)); } void RewardsServiceImpl::OnGetRewardsInternalsInfo( @@ -880,15 +874,14 @@ void RewardsServiceImpl::OnGetRewardsInternalsInfo( } void RewardsServiceImpl::GetAutoContributeProperties( - const GetAutoContributePropertiesCallback& callback) { + GetAutoContributePropertiesCallback callback) { if (!Connected()) { return; } - bat_ledger_->GetAutoContributeProperties(base::BindOnce( - &RewardsServiceImpl::OnGetAutoContributeProperties, - AsWeakPtr(), - callback)); + bat_ledger_->GetAutoContributeProperties( + base::BindOnce(&RewardsServiceImpl::OnGetAutoContributeProperties, + AsWeakPtr(), std::move(callback))); } void RewardsServiceImpl::OnReconcileComplete( @@ -1345,13 +1338,12 @@ void RewardsServiceImpl::OnAttestPromotion( std::move(callback).Run(result, std::move(promotion)); } -void RewardsServiceImpl::GetReconcileStamp( - const GetReconcileStampCallback& callback) { +void RewardsServiceImpl::GetReconcileStamp(GetReconcileStampCallback callback) { if (!Connected()) { return; } - bat_ledger_->GetReconcileStamp(callback); + bat_ledger_->GetReconcileStamp(std::move(callback)); } void RewardsServiceImpl::EnableGreaseLion() { @@ -1584,12 +1576,12 @@ uint64_t RewardsServiceImpl::GetUint64Option(const std::string& name) const { } void RewardsServiceImpl::GetPublisherMinVisitTime( - const GetPublisherMinVisitTimeCallback& callback) { + GetPublisherMinVisitTimeCallback callback) { if (!Connected()) { return; } - bat_ledger_->GetPublisherMinVisitTime(callback); + bat_ledger_->GetPublisherMinVisitTime(std::move(callback)); } void RewardsServiceImpl::SetPublisherMinVisitTime( @@ -1602,12 +1594,12 @@ void RewardsServiceImpl::SetPublisherMinVisitTime( } void RewardsServiceImpl::GetPublisherMinVisits( - const GetPublisherMinVisitsCallback& callback) { + GetPublisherMinVisitsCallback callback) { if (!Connected()) { return; } - bat_ledger_->GetPublisherMinVisits(callback); + bat_ledger_->GetPublisherMinVisits(std::move(callback)); } void RewardsServiceImpl::SetPublisherMinVisits(int visits) const { @@ -1619,12 +1611,12 @@ void RewardsServiceImpl::SetPublisherMinVisits(int visits) const { } void RewardsServiceImpl::GetPublisherAllowNonVerified( - const GetPublisherAllowNonVerifiedCallback& callback) { + GetPublisherAllowNonVerifiedCallback callback) { if (!Connected()) { return; } - bat_ledger_->GetPublisherAllowNonVerified(callback); + bat_ledger_->GetPublisherAllowNonVerified(std::move(callback)); } void RewardsServiceImpl::SetPublisherAllowNonVerified(bool allow) const { @@ -1636,12 +1628,12 @@ void RewardsServiceImpl::SetPublisherAllowNonVerified(bool allow) const { } void RewardsServiceImpl::GetPublisherAllowVideos( - const GetPublisherAllowVideosCallback& callback) { + GetPublisherAllowVideosCallback callback) { if (!Connected()) { return; } - bat_ledger_->GetPublisherAllowVideos(callback); + bat_ledger_->GetPublisherAllowVideos(std::move(callback)); } void RewardsServiceImpl::SetPublisherAllowVideos(bool allow) const { @@ -1829,12 +1821,12 @@ void RewardsServiceImpl::OnPanelPublisherInfo( } void RewardsServiceImpl::GetAutoContributionAmount( - const GetAutoContributionAmountCallback& callback) { + GetAutoContributionAmountCallback callback) { if (!Connected()) { return; } - bat_ledger_->GetAutoContributionAmount(callback); + bat_ledger_->GetAutoContributionAmount(std::move(callback)); } void RewardsServiceImpl::FetchFavIcon( @@ -1858,8 +1850,9 @@ void RewardsServiceImpl::FetchFavIcon( if (image_service) { current_media_fetchers_[url] = image_service->RequestImage( parsedUrl, - base::Bind(&RewardsServiceImpl::OnFetchFavIconCompleted, AsWeakPtr(), - callback, favicon_key, parsedUrl), + base::BindOnce(&RewardsServiceImpl::OnFetchFavIconCompleted, + AsWeakPtr(), std::move(callback), favicon_key, + parsedUrl), GetNetworkTrafficAnnotationTagForFaviconFetch()); } } @@ -2131,9 +2124,8 @@ void RewardsServiceImpl::RemoveRecurringTip( } bat_ledger_->RemoveRecurringTip( - publisher_key, - base::Bind(&RewardsServiceImpl::OnRecurringTip, - AsWeakPtr())); + publisher_key, + base::BindOnce(&RewardsServiceImpl::OnRecurringTip, AsWeakPtr())); } void RewardsServiceImpl::OnSetPublisherExclude( @@ -2209,9 +2201,8 @@ void RewardsServiceImpl::OnNotificationTimerFired() { bat_ledger_->GetCreationStamp( base::BindOnce(&RewardsServiceImpl::MaybeShowBackupNotification, AsWeakPtr())); - GetReconcileStamp( - base::Bind(&RewardsServiceImpl::MaybeShowAddFundsNotification, - AsWeakPtr())); + GetReconcileStamp(base::BindOnce( + &RewardsServiceImpl::MaybeShowAddFundsNotification, AsWeakPtr())); FetchPromotions(); } @@ -2550,13 +2541,12 @@ void RewardsServiceImpl::CheckInsufficientFundsForTesting() { MaybeShowNotificationAddFunds(); } -void RewardsServiceImpl::GetEnvironment( - const GetEnvironmentCallback& callback) { - bat_ledger_service_->GetEnvironment(callback); +void RewardsServiceImpl::GetEnvironment(GetEnvironmentCallback callback) { + bat_ledger_service_->GetEnvironment(std::move(callback)); } -void RewardsServiceImpl::GetDebug(const GetDebugCallback& callback) { - bat_ledger_service_->GetDebug(callback); +void RewardsServiceImpl::GetDebug(GetDebugCallback callback) { + bat_ledger_service_->GetDebug(std::move(callback)); } void RewardsServiceImpl::GetReconcileInterval( @@ -2564,9 +2554,8 @@ void RewardsServiceImpl::GetReconcileInterval( bat_ledger_service_->GetReconcileInterval(std::move(callback)); } -void RewardsServiceImpl::GetShortRetries( - const GetShortRetriesCallback& callback) { - bat_ledger_service_->GetShortRetries(callback); +void RewardsServiceImpl::GetShortRetries(GetShortRetriesCallback callback) { + bat_ledger_service_->GetShortRetries(std::move(callback)); } void RewardsServiceImpl::SetEnvironment(ledger::type::Environment environment) { @@ -2586,7 +2575,7 @@ void RewardsServiceImpl::SetShortRetries(bool short_retries) { } void RewardsServiceImpl::GetPendingContributionsTotal( - const GetPendingContributionsTotalCallback& callback) { + GetPendingContributionsTotalCallback callback) { if (!Connected()) { return; } @@ -3193,7 +3182,7 @@ void RewardsServiceImpl::PendingContributionSaved( } void RewardsServiceImpl::ForTestingSetTestResponseCallback( - GetTestResponseCallback callback) { + const GetTestResponseCallback& callback) { test_response_callback_ = callback; } @@ -3404,7 +3393,7 @@ void RewardsServiceImpl::GetWalletPassphrase( return; } - bat_ledger_->GetWalletPassphrase(callback); + bat_ledger_->GetWalletPassphrase(std::move(callback)); } void RewardsServiceImpl::SetAdsEnabled(const bool is_enabled) { diff --git a/components/brave_rewards/browser/rewards_service_impl.h b/components/brave_rewards/browser/rewards_service_impl.h index cec2e68c7bdb..bf71bfae7a89 100644 --- a/components/brave_rewards/browser/rewards_service_impl.h +++ b/components/brave_rewards/browser/rewards_service_impl.h @@ -75,16 +75,17 @@ namespace brave_rewards { class RewardsNotificationServiceImpl; class RewardsBrowserTest; -using GetEnvironmentCallback = base::Callback; -using GetDebugCallback = base::Callback; -using GetReconcileIntervalCallback = base::Callback; -using GetShortRetriesCallback = base::Callback; -using GetTestResponseCallback = - base::Callback* headers)>; +using GetEnvironmentCallback = + base::OnceCallback; +using GetDebugCallback = base::OnceCallback; +using GetReconcileIntervalCallback = base::OnceCallback; +using GetShortRetriesCallback = base::OnceCallback; +using GetTestResponseCallback = base::RepeatingCallback* headers)>; using ExternalWalletAuthorizationCallback = base::OnceCallback callback); void CheckInsufficientFundsForTesting(); - void ForTestingSetTestResponseCallback(GetTestResponseCallback callback); + void ForTestingSetTestResponseCallback( + const GetTestResponseCallback& callback); private: friend class ::RewardsFlagBrowserTest; @@ -669,7 +668,7 @@ class RewardsServiceImpl : public RewardsService, // Mojo Proxy methods void OnGetAutoContributeProperties( - const GetAutoContributePropertiesCallback& callback, + GetAutoContributePropertiesCallback callback, ledger::type::AutoContributePropertiesPtr props); void OnGetRewardsInternalsInfo(GetRewardsInternalsInfoCallback callback, ledger::type::RewardsInternalsInfoPtr info); diff --git a/components/brave_rewards/browser/test/rewards_flag_browsertest.cc b/components/brave_rewards/browser/test/rewards_flag_browsertest.cc index df814e6262b3..c1e5b636d21a 100644 --- a/components/brave_rewards/browser/test/rewards_flag_browsertest.cc +++ b/components/brave_rewards/browser/test/rewards_flag_browsertest.cc @@ -96,30 +96,30 @@ class RewardsFlagBrowserTest : public InProcessBrowserTest { void GetReconcileInterval() { ResetWaitForCallback(); rewards_service_->GetReconcileInterval( - base::Bind(&RewardsFlagBrowserTest::OnGetReconcileIntervalWrapper, - base::Unretained(this))); + base::BindOnce(&RewardsFlagBrowserTest::OnGetReconcileIntervalWrapper, + base::Unretained(this))); WaitForCallback(); } void GetShortRetries() { ResetWaitForCallback(); rewards_service_->GetShortRetries( - base::Bind(&RewardsFlagBrowserTest::OnGetShortRetriesWrapper, - base::Unretained(this))); + base::BindOnce(&RewardsFlagBrowserTest::OnGetShortRetriesWrapper, + base::Unretained(this))); WaitForCallback(); } void GetEnvironment() { ResetWaitForCallback(); rewards_service_->GetEnvironment( - base::Bind(&RewardsFlagBrowserTest::OnGetEnvironmentWrapper, - base::Unretained(this))); + base::BindOnce(&RewardsFlagBrowserTest::OnGetEnvironmentWrapper, + base::Unretained(this))); WaitForCallback(); } void GetDebug() { ResetWaitForCallback(); - rewards_service_->GetDebug(base::Bind( + rewards_service_->GetDebug(base::BindOnce( &RewardsFlagBrowserTest::OnGetDebugWrapper, base::Unretained(this))); WaitForCallback(); } diff --git a/components/brave_shields/browser/https_everywhere_service.cc b/components/brave_shields/browser/https_everywhere_service.cc index e542bc59e64a..fb5a69614709 100644 --- a/components/brave_shields/browser/https_everywhere_service.cc +++ b/components/brave_shields/browser/https_everywhere_service.cc @@ -148,10 +148,8 @@ void HTTPSEverywhereService::OnComponentReady( const base::FilePath& install_dir, const std::string& manifest) { GetTaskRunner()->PostTask( - FROM_HERE, - base::Bind(&HTTPSEverywhereService::InitDB, - AsWeakPtr(), - install_dir)); + FROM_HERE, base::BindOnce(&HTTPSEverywhereService::InitDB, AsWeakPtr(), + install_dir)); } bool HTTPSEverywhereService::GetHTTPSURL( diff --git a/components/brave_wallet/browser/brave_wallet_service.cc b/components/brave_wallet/browser/brave_wallet_service.cc index 26309930854c..5c9820d14da9 100644 --- a/components/brave_wallet/browser/brave_wallet_service.cc +++ b/components/brave_wallet/browser/brave_wallet_service.cc @@ -53,8 +53,8 @@ BraveWalletService::BraveWalletService( pref_change_registrar_->Init(user_prefs::UserPrefs::Get(context_)); pref_change_registrar_->Add( kBraveWalletWeb3Provider, - base::Bind(&BraveWalletService::OnPreferenceChanged, - base::Unretained(this))); + base::BindRepeating(&BraveWalletService::OnPreferenceChanged, + base::Unretained(this))); // In case any web3 providers have already loaded content scripts at // this point. RemoveUnusedWeb3ProviderContentScripts(); diff --git a/components/decentralized_dns/decentralized_dns_service.cc b/components/decentralized_dns/decentralized_dns_service.cc index 7d288999205e..24b8e6aa3964 100644 --- a/components/decentralized_dns/decentralized_dns_service.cc +++ b/components/decentralized_dns/decentralized_dns_service.cc @@ -25,12 +25,12 @@ DecentralizedDnsService::DecentralizedDnsService( pref_change_registrar_->Init(local_state); pref_change_registrar_->Add( kUnstoppableDomainsResolveMethod, - base::Bind(&DecentralizedDnsService::OnPreferenceChanged, - base::Unretained(this))); + base::BindRepeating(&DecentralizedDnsService::OnPreferenceChanged, + base::Unretained(this))); pref_change_registrar_->Add( kENSResolveMethod, - base::Bind(&DecentralizedDnsService::OnPreferenceChanged, - base::Unretained(this))); + base::BindRepeating(&DecentralizedDnsService::OnPreferenceChanged, + base::Unretained(this))); } DecentralizedDnsService::~DecentralizedDnsService() = default; diff --git a/components/greaselion/browser/greaselion_download_service.cc b/components/greaselion/browser/greaselion_download_service.cc index 6e3e7241da4c..f8734eafc5e2 100644 --- a/components/greaselion/browser/greaselion_download_service.cc +++ b/components/greaselion/browser/greaselion_download_service.cc @@ -210,17 +210,19 @@ GreaselionDownloadService::GreaselionDownloadService( base::TaskShutdownBehavior::CONTINUE_ON_SHUTDOWN, base::MayBlock()}); dev_mode_path_watcher_ = std::make_unique(); - using Callback = base::RepeatingCallback; + using DevModeLocalFileChangedCallback = base::RepeatingCallback; base::FilePathWatcher::Callback file_path_watcher_callback = base::BindRepeating( [](scoped_refptr main_sequence, - const Callback& callback, const base::FilePath&, bool error) { + const DevModeLocalFileChangedCallback& callback, + const base::FilePath&, bool error) { main_sequence->PostTask(FROM_HERE, base::BindOnce(callback, error)); }, base::SequencedTaskRunnerHandle::Get(), - base::Bind(&GreaselionDownloadService::OnDevModeLocalFileChanged, - weak_factory_.GetWeakPtr())); + base::BindRepeating( + &GreaselionDownloadService::OnDevModeLocalFileChanged, + weak_factory_.GetWeakPtr())); // Start the watcher on a background sequence, reporting all events back to // this sequence. base::Unretained is safe because the watcher instance @@ -233,13 +235,14 @@ GreaselionDownloadService::GreaselionDownloadService( resource_dir_, base::FilePathWatcher::Type::kRecursive, file_path_watcher_callback), base::BindOnce( - [](Callback callback, bool start_result) { + [](DevModeLocalFileChangedCallback callback, bool start_result) { if (!start_result) { callback.Run(/*error=*/true); } }, - base::Bind(&GreaselionDownloadService::OnDevModeLocalFileChanged, - weak_factory_.GetWeakPtr()))); + base::BindRepeating( + &GreaselionDownloadService::OnDevModeLocalFileChanged, + weak_factory_.GetWeakPtr()))); } #endif DETACH_FROM_SEQUENCE(sequence_checker_); diff --git a/components/ipfs/ipfs_p3a.cc b/components/ipfs/ipfs_p3a.cc index d2ec8a492673..4ff6d1e688f3 100644 --- a/components/ipfs/ipfs_p3a.cc +++ b/components/ipfs/ipfs_p3a.cc @@ -110,8 +110,9 @@ void IpfsP3A::OnIpfsLaunched(bool result, int64_t pid) { } daemon_start_time_ = base::TimeTicks::Now(); - timer_.Start(FROM_HERE, base::TimeDelta::FromMinutes(kP3ATimerInterval), - base::Bind(&IpfsP3A::RecordDaemonUsage, base::Unretained(this))); + timer_.Start( + FROM_HERE, base::TimeDelta::FromMinutes(kP3ATimerInterval), + base::BindRepeating(&IpfsP3A::RecordDaemonUsage, base::Unretained(this))); } void IpfsP3A::OnIpfsShutdown() { diff --git a/components/ipfs/ipfs_service.cc b/components/ipfs/ipfs_service.cc index cd11ac306bea..e8cf4aeb3ab2 100644 --- a/components/ipfs/ipfs_service.cc +++ b/components/ipfs/ipfs_service.cc @@ -174,8 +174,8 @@ void IpfsService::LaunchIfNotRunning(const base::FilePath& executable_path) { ipfs_service_.set_disconnect_handler( base::BindOnce(&IpfsService::OnIpfsCrashed, base::Unretained(this))); - ipfs_service_->SetCrashHandler( - base::Bind(&IpfsService::OnIpfsDaemonCrashed, base::Unretained(this))); + ipfs_service_->SetCrashHandler(base::BindOnce( + &IpfsService::OnIpfsDaemonCrashed, base::Unretained(this))); auto config = mojom::IpfsConfig::New( executable_path, GetConfigFilePath(), GetDataPath(), @@ -184,7 +184,7 @@ void IpfsService::LaunchIfNotRunning(const base::FilePath& executable_path) { ipfs_service_->Launch( std::move(config), - base::Bind(&IpfsService::OnIpfsLaunched, base::Unretained(this))); + base::BindOnce(&IpfsService::OnIpfsLaunched, base::Unretained(this))); } void IpfsService::RestartDaemon() { diff --git a/components/p3a/brave_p3a_scheduler.cc b/components/p3a/brave_p3a_scheduler.cc index f68511cd83df..c6cdc151ffc0 100644 --- a/components/p3a/brave_p3a_scheduler.cc +++ b/components/p3a/brave_p3a_scheduler.cc @@ -44,8 +44,8 @@ base::TimeDelta BackOffUploadInterval(base::TimeDelta interval) { } // namespace BraveP3AScheduler::BraveP3AScheduler( - const base::Closure& upload_callback, - const base::Callback& get_interval_callback) + const base::RepeatingClosure& upload_callback, + const base::RepeatingCallback& get_interval_callback) : metrics::MetricsScheduler(upload_callback, false /* fast_startup_for_testing */), get_interval_callback_(get_interval_callback), diff --git a/components/p3a/brave_p3a_scheduler.h b/components/p3a/brave_p3a_scheduler.h index d44363d2f575..207189caa849 100644 --- a/components/p3a/brave_p3a_scheduler.h +++ b/components/p3a/brave_p3a_scheduler.h @@ -14,15 +14,16 @@ namespace brave { class BraveP3AScheduler : public metrics::MetricsScheduler { public: explicit BraveP3AScheduler( - const base::Closure& upload_callback, - const base::Callback& get_interval_callback); + const base::RepeatingClosure& upload_callback, + const base::RepeatingCallback& + get_interval_callback); ~BraveP3AScheduler() override; void UploadFinished(bool ok); private: // Provides us with the interval between successful uploads. - base::Callback get_interval_callback_; + base::RepeatingCallback get_interval_callback_; // Initial time to wait between upload retry attempts. const base::TimeDelta initial_backoff_interval_; diff --git a/components/p3a/brave_p3a_service.cc b/components/p3a/brave_p3a_service.cc index 5f61b4b70bc2..ad5f7be274c1 100644 --- a/components/p3a/brave_p3a_service.cc +++ b/components/p3a/brave_p3a_service.cc @@ -268,10 +268,10 @@ void BraveP3AService::Init( // Init other components. uploader_.reset(new BraveP3AUploader( url_loader_factory, upload_server_url_, GURL(kP2AServerUrl), - base::Bind(&BraveP3AService::OnLogUploadComplete, this))); + base::BindRepeating(&BraveP3AService::OnLogUploadComplete, this))); upload_scheduler_.reset(new BraveP3AScheduler( - base::Bind(&BraveP3AService::StartScheduledUpload, this), + base::BindRepeating(&BraveP3AService::StartScheduledUpload, this), (randomize_upload_interval_ ? base::BindRepeating(GetRandomizedUploadInterval, average_upload_interval_) diff --git a/components/speedreader/speedreader_component.cc b/components/speedreader/speedreader_component.cc index 2a5c7e5bb95a..9994b9f8f4fb 100644 --- a/components/speedreader/speedreader_component.cc +++ b/components/speedreader/speedreader_component.cc @@ -56,8 +56,8 @@ SpeedreaderComponent::SpeedreaderComponent(Delegate* delegate) whitelist_path_watcher_ = std::make_unique(); if (!whitelist_path_watcher_->Watch( whitelist_path, base::FilePathWatcher::Type::kNonRecursive, - base::Bind(&SpeedreaderComponent::OnWhitelistFileReady, - weak_factory_.GetWeakPtr()))) { + base::BindRepeating(&SpeedreaderComponent::OnWhitelistFileReady, + weak_factory_.GetWeakPtr()))) { LOG(ERROR) << "SpeedReader could not watch filesystem for changes" << " at path " << whitelist_path.LossyDisplayName(); } diff --git a/components/sync/driver/brave_sync_profile_sync_service.cc b/components/sync/driver/brave_sync_profile_sync_service.cc index ac6fd5ba4b2f..ae720118dd19 100644 --- a/components/sync/driver/brave_sync_profile_sync_service.cc +++ b/components/sync/driver/brave_sync_profile_sync_service.cc @@ -27,8 +27,8 @@ BraveProfileSyncService::BraveProfileSyncService( brave_sync_prefs_change_registrar_.Init(sync_client_->GetPrefService()); brave_sync_prefs_change_registrar_.Add( brave_sync::Prefs::GetSeedPath(), - base::Bind(&BraveProfileSyncService::OnBraveSyncPrefsChanged, - base::Unretained(this))); + base::BindRepeating(&BraveProfileSyncService::OnBraveSyncPrefsChanged, + base::Unretained(this))); GetBraveSyncAuthManager()->DeriveSigningKeys(brave_sync_prefs_.GetSeed()); profile_service_delegate_->set_profile_sync_service(this); diff --git a/services/network/public/cpp/system_request_handler.h b/services/network/public/cpp/system_request_handler.h index 005f007de0e3..e7177d3316db 100644 --- a/services/network/public/cpp/system_request_handler.h +++ b/services/network/public/cpp/system_request_handler.h @@ -18,7 +18,7 @@ namespace network { class COMPONENT_EXPORT(NETWORK_CPP) SystemRequestHandler { public: - typedef base::Callback OnBeforeSystemRequestCallback; diff --git a/test/base/run_all_unittests.cc b/test/base/run_all_unittests.cc index 37ebe970d3ea..8baf9ead679f 100644 --- a/test/base/run_all_unittests.cc +++ b/test/base/run_all_unittests.cc @@ -1,4 +1,5 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public +/* Copyright (c) 2018 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/. */ @@ -28,7 +29,7 @@ int main(int argc, char **argv) { install_static::ScopedInstallDetails scoped_install_details; #endif - return base::LaunchUnitTests( - argc, argv, base::Bind(&content::UnitTestTestSuite::Run, - base::Unretained(&test_suite))); + return base::LaunchUnitTests(argc, argv, + base::BindOnce(&content::UnitTestTestSuite::Run, + base::Unretained(&test_suite))); } diff --git a/vendor/bat-native-ledger/src/bat/ledger/internal/ledger_database_impl.cc b/vendor/bat-native-ledger/src/bat/ledger/internal/ledger_database_impl.cc index e6f7d9509d17..24a36d3b64db 100644 --- a/vendor/bat-native-ledger/src/bat/ledger/internal/ledger_database_impl.cc +++ b/vendor/bat-native-ledger/src/bat/ledger/internal/ledger_database_impl.cc @@ -229,8 +229,8 @@ mojom::DBCommandResponse::Status LedgerDatabaseImpl::Initialize( initialized_ = true; memory_pressure_listener_.reset(new base::MemoryPressureListener( - FROM_HERE, base::Bind(&LedgerDatabaseImpl::OnMemoryPressure, - base::Unretained(this)))); + FROM_HERE, base::BindRepeating(&LedgerDatabaseImpl::OnMemoryPressure, + base::Unretained(this)))); } else { table_version = meta_table_.GetVersionNumber(); }