Skip to content

Commit 671e91d

Browse files
mariosprmariospr
authored
Merge pull request #8811 from /issues/15855
Move away from using base::{Bind,Callback,Closure}()
2 parents dfe4da5 + 10c9ed7 commit 671e91d

File tree

57 files changed

+467
-480
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+467
-480
lines changed

‎browser/binance/android/binance_native_worker.cc

+12-12
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ BinanceNativeWorker::GetOAuthClientUrl(JNIEnv* env) {
104104

105105
void BinanceNativeWorker::GetAccessToken(JNIEnv* env) {
106106
if (binance_service_) {
107-
binance_service_->GetAccessToken(base::Bind(
107+
binance_service_->GetAccessToken(base::BindOnce(
108108
&BinanceNativeWorker::OnGetAccessToken, weak_factory_.GetWeakPtr()));
109109
}
110110
}
@@ -139,8 +139,8 @@ void BinanceNativeWorker::OnGetAccessToken(bool success) {
139139
void BinanceNativeWorker::GetAccountBalances(JNIEnv* env) {
140140
if (binance_service_) {
141141
binance_service_->GetAccountBalances(
142-
base::Bind(&BinanceNativeWorker::OnGetAccountBalances,
143-
weak_factory_.GetWeakPtr()));
142+
base::BindOnce(&BinanceNativeWorker::OnGetAccountBalances,
143+
weak_factory_.GetWeakPtr()));
144144
}
145145
}
146146

@@ -164,8 +164,8 @@ void BinanceNativeWorker::GetConvertQuote(
164164
base::android::ConvertJavaStringToUTF8(env, from),
165165
base::android::ConvertJavaStringToUTF8(env, to),
166166
base::android::ConvertJavaStringToUTF8(env, amount),
167-
base::Bind(&BinanceNativeWorker::OnGetConvertQuote,
168-
weak_factory_.GetWeakPtr()));
167+
base::BindOnce(&BinanceNativeWorker::OnGetConvertQuote,
168+
weak_factory_.GetWeakPtr()));
169169
}
170170
}
171171

@@ -184,7 +184,7 @@ void BinanceNativeWorker::OnGetConvertQuote(const std::string& quote_id,
184184

185185
void BinanceNativeWorker::GetCoinNetworks(JNIEnv* env) {
186186
if (binance_service_) {
187-
binance_service_->GetCoinNetworks(base::Bind(
187+
binance_service_->GetCoinNetworks(base::BindOnce(
188188
&BinanceNativeWorker::OnGetCoinNetworks, weak_factory_.GetWeakPtr()));
189189
}
190190
}
@@ -206,8 +206,8 @@ void BinanceNativeWorker::GetDepositInfo(
206206
binance_service_->GetDepositInfo(
207207
base::android::ConvertJavaStringToUTF8(env, symbol),
208208
base::android::ConvertJavaStringToUTF8(env, ticker_network),
209-
base::Bind(&BinanceNativeWorker::OnGetDepositInfo,
210-
weak_factory_.GetWeakPtr()));
209+
base::BindOnce(&BinanceNativeWorker::OnGetDepositInfo,
210+
weak_factory_.GetWeakPtr()));
211211
}
212212
}
213213

@@ -227,8 +227,8 @@ void BinanceNativeWorker::ConfirmConvert(
227227
if (binance_service_) {
228228
binance_service_->ConfirmConvert(
229229
base::android::ConvertJavaStringToUTF8(env, quote_id),
230-
base::Bind(&BinanceNativeWorker::OnConfirmConvert,
231-
weak_factory_.GetWeakPtr()));
230+
base::BindOnce(&BinanceNativeWorker::OnConfirmConvert,
231+
weak_factory_.GetWeakPtr()));
232232
}
233233
}
234234

@@ -242,7 +242,7 @@ void BinanceNativeWorker::OnConfirmConvert(bool success,
242242

243243
void BinanceNativeWorker::GetConvertAssets(JNIEnv* env) {
244244
if (binance_service_) {
245-
binance_service_->GetConvertAssets(base::Bind(
245+
binance_service_->GetConvertAssets(base::BindOnce(
246246
&BinanceNativeWorker::OnGetConvertAssets, weak_factory_.GetWeakPtr()));
247247
}
248248
}
@@ -259,7 +259,7 @@ void BinanceNativeWorker::OnGetConvertAssets(
259259

260260
void BinanceNativeWorker::RevokeToken(JNIEnv* env) {
261261
if (binance_service_) {
262-
binance_service_->RevokeToken(base::Bind(
262+
binance_service_->RevokeToken(base::BindOnce(
263263
&BinanceNativeWorker::OnRevokeToken, weak_factory_.GetWeakPtr()));
264264
}
265265
}

‎browser/brave_browser_process_impl.cc

+6-5
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,8 @@ namespace {
9898
// Initializes callback for SystemRequestHandler
9999
void InitSystemRequestHandlerCallback() {
100100
network::SystemRequestHandler::OnBeforeSystemRequestCallback
101-
before_system_request_callback = base::Bind(brave::OnBeforeSystemRequest);
101+
before_system_request_callback =
102+
base::BindRepeating(brave::OnBeforeSystemRequest);
102103
network::SystemRequestHandler::GetInstance()
103104
->RegisterOnBeforeSystemRequestCallback(before_system_request_callback);
104105
}
@@ -146,14 +147,14 @@ void BraveBrowserProcessImpl::Init() {
146147
UpdateBraveDarkMode();
147148
pref_change_registrar_.Add(
148149
kBraveDarkMode,
149-
base::Bind(&BraveBrowserProcessImpl::OnBraveDarkModeChanged,
150-
base::Unretained(this)));
150+
base::BindRepeating(&BraveBrowserProcessImpl::OnBraveDarkModeChanged,
151+
base::Unretained(this)));
151152

152153
#if BUILDFLAG(ENABLE_TOR)
153154
pref_change_registrar_.Add(
154155
tor::prefs::kTorDisabled,
155-
base::Bind(&BraveBrowserProcessImpl::OnTorEnabledChanged,
156-
base::Unretained(this)));
156+
base::BindRepeating(&BraveBrowserProcessImpl::OnTorEnabledChanged,
157+
base::Unretained(this)));
157158
#endif
158159

159160
InitSystemRequestHandlerCallback();

‎browser/brave_rewards/android/brave_rewards_native_worker.cc

+20-23
Original file line numberDiff line numberDiff line change
@@ -218,10 +218,8 @@ void BraveRewardsNativeWorker::OnGetRewardsParameters(
218218
}
219219

220220
if (rewards_service) {
221-
rewards_service->FetchBalance(
222-
base::Bind(
223-
&BraveRewardsNativeWorker::OnBalance,
224-
weak_factory_.GetWeakPtr()));
221+
rewards_service->FetchBalance(base::BindOnce(
222+
&BraveRewardsNativeWorker::OnBalance, weak_factory_.GetWeakPtr()));
225223
}
226224
}
227225

@@ -265,9 +263,8 @@ void BraveRewardsNativeWorker::FetchGrants(JNIEnv* env) {
265263

266264
void BraveRewardsNativeWorker::StartProcess(JNIEnv* env) {
267265
if (brave_rewards_service_) {
268-
brave_rewards_service_->StartProcess(base::Bind(
269-
&BraveRewardsNativeWorker::OnStartProcess,
270-
weak_factory_.GetWeakPtr()));
266+
brave_rewards_service_->StartProcess(base::BindOnce(
267+
&BraveRewardsNativeWorker::OnStartProcess, weak_factory_.GetWeakPtr()));
271268
}
272269
}
273270

@@ -389,17 +386,17 @@ base::android::ScopedJavaLocalRef<jobjectArray>
389386

390387
void BraveRewardsNativeWorker::GetPendingContributionsTotal(JNIEnv* env) {
391388
if (brave_rewards_service_) {
392-
brave_rewards_service_->GetPendingContributionsTotal(base::Bind(
393-
&BraveRewardsNativeWorker::OnGetPendingContributionsTotal,
394-
weak_factory_.GetWeakPtr()));
389+
brave_rewards_service_->GetPendingContributionsTotal(base::BindOnce(
390+
&BraveRewardsNativeWorker::OnGetPendingContributionsTotal,
391+
weak_factory_.GetWeakPtr()));
395392
}
396393
}
397394

398395
void BraveRewardsNativeWorker::GetRecurringDonations(JNIEnv* env) {
399396
if (brave_rewards_service_) {
400-
brave_rewards_service_->GetRecurringTips(base::Bind(
401-
&BraveRewardsNativeWorker::OnGetRecurringTips,
402-
weak_factory_.GetWeakPtr()));
397+
brave_rewards_service_->GetRecurringTips(
398+
base::BindOnce(&BraveRewardsNativeWorker::OnGetRecurringTips,
399+
weak_factory_.GetWeakPtr()));
403400
}
404401
}
405402

@@ -426,8 +423,8 @@ bool BraveRewardsNativeWorker::IsCurrentPublisherInRecurrentDonations(
426423
void BraveRewardsNativeWorker::GetAutoContributeProperties(JNIEnv* env) {
427424
if (brave_rewards_service_) {
428425
brave_rewards_service_->GetAutoContributeProperties(
429-
base::Bind(&BraveRewardsNativeWorker::OnGetAutoContributeProperties,
430-
weak_factory_.GetWeakPtr()));
426+
base::BindOnce(&BraveRewardsNativeWorker::OnGetAutoContributeProperties,
427+
weak_factory_.GetWeakPtr()));
431428
}
432429
}
433430

@@ -452,17 +449,17 @@ bool BraveRewardsNativeWorker::IsAutoContributeEnabled(JNIEnv* env) {
452449

453450
void BraveRewardsNativeWorker::GetReconcileStamp(JNIEnv* env) {
454451
if (brave_rewards_service_) {
455-
brave_rewards_service_->GetReconcileStamp(base::Bind(
456-
&BraveRewardsNativeWorker::OnGetGetReconcileStamp,
457-
weak_factory_.GetWeakPtr()));
452+
brave_rewards_service_->GetReconcileStamp(
453+
base::BindOnce(&BraveRewardsNativeWorker::OnGetGetReconcileStamp,
454+
weak_factory_.GetWeakPtr()));
458455
}
459456
}
460457

461458
void BraveRewardsNativeWorker::ResetTheWholeState(JNIEnv* env) {
462459
if (brave_rewards_service_) {
463-
brave_rewards_service_->CompleteReset(base::Bind(
464-
&BraveRewardsNativeWorker::OnResetTheWholeState,
465-
weak_factory_.GetWeakPtr()));
460+
brave_rewards_service_->CompleteReset(
461+
base::BindOnce(&BraveRewardsNativeWorker::OnResetTheWholeState,
462+
weak_factory_.GetWeakPtr()));
466463
} else {
467464
JNIEnv* env = base::android::AttachCurrentThread();
468465

@@ -680,8 +677,8 @@ void BraveRewardsNativeWorker::ProcessRewardsPageUrl(JNIEnv* env,
680677
std::string cpath = base::android::ConvertJavaStringToUTF8(env, path);
681678
std::string cquery = base::android::ConvertJavaStringToUTF8(env, query);
682679
auto callback =
683-
base::Bind(&BraveRewardsNativeWorker::OnProcessRewardsPageUrl,
684-
weak_factory_.GetWeakPtr());
680+
base::BindOnce(&BraveRewardsNativeWorker::OnProcessRewardsPageUrl,
681+
weak_factory_.GetWeakPtr());
685682
brave_rewards_service_->ProcessRewardsPageUrl(cpath, cquery, callback);
686683
}
687684
}

‎browser/brave_stats/brave_stats_updater.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -329,8 +329,8 @@ void BraveStatsUpdater::QueueServerPing() {
329329
pref_change_registrar_->Init(pref_service_);
330330
pref_change_registrar_->Add(
331331
kReferralInitialization,
332-
base::Bind(&BraveStatsUpdater::OnReferralInitialization,
333-
base::Unretained(this)));
332+
base::BindRepeating(&BraveStatsUpdater::OnReferralInitialization,
333+
base::Unretained(this)));
334334
}
335335
if (ads_enabled) {
336336
DetectUncertainFuture();

‎browser/brave_stats/brave_stats_updater_browsertest.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ class BraveStatsUpdaterBrowserTest : public InProcessBrowserTest {
7171

7272
void SetUpCommandLine(base::CommandLine* command_line) override {
7373
embedded_test_server()->RegisterRequestHandler(
74-
base::Bind(&HandleRequestForStats));
74+
base::BindRepeating(&HandleRequestForStats));
7575
ASSERT_TRUE(embedded_test_server()->Start());
7676
command_line->AppendSwitchASCII(
7777
brave_stats::switches::kBraveStatsUpdaterServer,

‎browser/devtools/brave_devtools_ui_bindings_browsertest.cc

+6-6
Original file line numberDiff line numberDiff line change
@@ -37,24 +37,24 @@ IN_PROC_BROWSER_TEST_F(BraveDevToolsUIBindingsBrowserTest, ThemeTest) {
3737
auto* devtools_ui_bindings = new BraveDevToolsUIBindings(web_contents);
3838
DCHECK(devtools_ui_bindings);
3939
devtools_ui_bindings->GetPreferences(
40-
base::Bind(&BraveDevToolsUIBindingsBrowserTest::GetPreferenceCallback,
41-
base::Unretained(this)));
40+
base::BindOnce(&BraveDevToolsUIBindingsBrowserTest::GetPreferenceCallback,
41+
base::Unretained(this)));
4242
// Check current devtools' theme is same as native theme when user doesn't
4343
// change devtools' theme explicitely.
4444
EXPECT_EQ(ui_theme_, "\"dark\"");
4545

4646
dark_mode::SetBraveDarkModeType(
4747
dark_mode::BraveDarkModeType::BRAVE_DARK_MODE_TYPE_LIGHT);
4848
devtools_ui_bindings->GetPreferences(
49-
base::Bind(&BraveDevToolsUIBindingsBrowserTest::GetPreferenceCallback,
50-
base::Unretained(this)));
49+
base::BindOnce(&BraveDevToolsUIBindingsBrowserTest::GetPreferenceCallback,
50+
base::Unretained(this)));
5151
// In devtools, default is used as light.
5252
EXPECT_EQ(ui_theme_, "\"default\"");
5353

5454
// When user sets devtools' theme explicitely, respect user's setting.
5555
devtools_ui_bindings->SetPreference("uiTheme", "\"dark\"");
5656
devtools_ui_bindings->GetPreferences(
57-
base::Bind(&BraveDevToolsUIBindingsBrowserTest::GetPreferenceCallback,
58-
base::Unretained(this)));
57+
base::BindOnce(&BraveDevToolsUIBindingsBrowserTest::GetPreferenceCallback,
58+
base::Unretained(this)));
5959
EXPECT_EQ(ui_theme_, "\"dark\"");
6060
}

‎browser/extensions/api/brave_rewards_api.cc

+21-34
Original file line numberDiff line numberDiff line change
@@ -122,9 +122,8 @@ BraveRewardsGetPublisherInfoFunction::Run() {
122122

123123
rewards_service->GetPublisherInfo(
124124
params->publisher_key,
125-
base::Bind(
126-
&BraveRewardsGetPublisherInfoFunction::OnGetPublisherInfo,
127-
this));
125+
base::BindOnce(&BraveRewardsGetPublisherInfoFunction::OnGetPublisherInfo,
126+
this));
128127

129128
return RespondLater();
130129
}
@@ -170,7 +169,7 @@ BraveRewardsGetPublisherPanelInfoFunction::Run() {
170169

171170
rewards_service->GetPublisherPanelInfo(
172171
params->publisher_key,
173-
base::Bind(
172+
base::BindOnce(
174173
&BraveRewardsGetPublisherPanelInfoFunction::OnGetPublisherPanelInfo,
175174
this));
176175

@@ -225,11 +224,9 @@ BraveRewardsSavePublisherInfoFunction::Run() {
225224
publisher_info->favicon_url = params->fav_icon_url;
226225

227226
rewards_service->SavePublisherInfo(
228-
params->window_id,
229-
std::move(publisher_info),
230-
base::Bind(
231-
&BraveRewardsSavePublisherInfoFunction::OnSavePublisherInfo,
232-
this));
227+
params->window_id, std::move(publisher_info),
228+
base::BindOnce(
229+
&BraveRewardsSavePublisherInfoFunction::OnSavePublisherInfo, this));
233230

234231
return RespondLater();
235232
}
@@ -277,10 +274,6 @@ ExtensionFunction::ResponseAction BraveRewardsTipSiteFunction::Run() {
277274
return RespondNow(NoArguments());
278275
}
279276

280-
BraveRewardsTipUserFunction::BraveRewardsTipUserFunction()
281-
: weak_factory_(this) {
282-
}
283-
284277
BraveRewardsTipUserFunction::~BraveRewardsTipUserFunction() {
285278
}
286279

@@ -331,8 +324,8 @@ void BraveRewardsTipUserFunction::OnProcessStarted(
331324
}
332325
rewards_service->GetPublisherInfo(
333326
publisher_key,
334-
base::Bind(&BraveRewardsTipUserFunction::OnTipUserGetPublisherInfo,
335-
this));
327+
base::BindOnce(&BraveRewardsTipUserFunction::OnTipUserGetPublisherInfo,
328+
this));
336329
}
337330

338331
void BraveRewardsTipUserFunction::OnTipUserGetPublisherInfo(
@@ -368,11 +361,9 @@ void BraveRewardsTipUserFunction::OnTipUserGetPublisherInfo(
368361
}
369362

370363
rewards_service->SavePublisherInfo(
371-
0,
372-
std::move(publisher_info),
373-
base::Bind(&BraveRewardsTipUserFunction::
374-
OnTipUserSavePublisherInfo,
375-
weak_factory_.GetWeakPtr()));
364+
0, std::move(publisher_info),
365+
base::BindOnce(&BraveRewardsTipUserFunction::OnTipUserSavePublisherInfo,
366+
this));
376367
}
377368

378369
void BraveRewardsTipUserFunction::OnTipUserSavePublisherInfo(
@@ -650,9 +641,9 @@ BraveRewardsGetPendingContributionsTotalFunction::Run() {
650641
return RespondNow(OneArgument(base::Value(0.0)));
651642
}
652643

653-
rewards_service->GetPendingContributionsTotal(base::Bind(
654-
&BraveRewardsGetPendingContributionsTotalFunction::OnGetPendingTotal,
655-
this));
644+
rewards_service->GetPendingContributionsTotal(base::BindOnce(
645+
&BraveRewardsGetPendingContributionsTotalFunction::OnGetPendingTotal,
646+
this));
656647
return RespondLater();
657648
}
658649

@@ -747,11 +738,9 @@ BraveRewardsSaveRecurringTipFunction::Run() {
747738
}
748739

749740
rewards_service_->SaveRecurringTip(
750-
params->publisher_key,
751-
params->new_amount,
752-
base::Bind(
753-
&BraveRewardsSaveRecurringTipFunction::OnSaveRecurringTip,
754-
this));
741+
params->publisher_key, params->new_amount,
742+
base::BindOnce(&BraveRewardsSaveRecurringTipFunction::OnSaveRecurringTip,
743+
this));
755744

756745
return RespondLater();
757746
}
@@ -798,9 +787,8 @@ BraveRewardsGetRecurringTipsFunction::Run() {
798787
return RespondNow(Error("Rewards service is not initialized"));
799788
}
800789

801-
rewards_service->GetRecurringTips(base::Bind(
802-
&BraveRewardsGetRecurringTipsFunction::OnGetRecurringTips,
803-
this));
790+
rewards_service->GetRecurringTips(base::BindOnce(
791+
&BraveRewardsGetRecurringTipsFunction::OnGetRecurringTips, this));
804792
return RespondLater();
805793
}
806794

@@ -1187,9 +1175,8 @@ BraveRewardsGetAnonWalletStatusFunction::Run() {
11871175
return RespondNow(Error("Rewards service is not initialized"));
11881176
}
11891177

1190-
rewards_service->GetAnonWalletStatus(base::Bind(
1191-
&BraveRewardsGetAnonWalletStatusFunction::OnGetAnonWalletStatus,
1192-
this));
1178+
rewards_service->GetAnonWalletStatus(base::BindOnce(
1179+
&BraveRewardsGetAnonWalletStatusFunction::OnGetAnonWalletStatus, this));
11931180
return RespondLater();
11941181
}
11951182

0 commit comments

Comments
 (0)