Commit 50449bc4 authored by Yi Gu's avatar Yi Gu Committed by Chromium LUCI CQ

[CodeHealth] Convert c/b//extensions from base::Bind and base::Callback to Once/Repeating

Bug: 1152282
Change-Id: I9feb70e2ff921a1dc6d3c0a7b6ac41885ee9758d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2595599Reviewed-by: default avatarFilip Gorski <fgorski@chromium.org>
Commit-Queue: Yi Gu <yigu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#837776}
parent 4ce391eb
......@@ -72,8 +72,9 @@ bool ChromeExtensionTestNotificationObserver::
ScopedObserver<ExtensionActionAPI, ExtensionActionAPI::Observer> observer(
this);
observer.Add(ExtensionActionAPI::Get(GetBrowserContext()));
WaitForCondition(
base::Bind(&HasPageActionVisibilityReachedTarget, browser_, count), NULL);
WaitForCondition(base::BindRepeating(&HasPageActionVisibilityReachedTarget,
browser_, count),
nullptr);
return true;
}
......@@ -88,7 +89,8 @@ bool ChromeExtensionTestNotificationObserver::WaitForExtensionViewsToLoad() {
notification_set.Add(content::NOTIFICATION_LOAD_STOP);
notification_set.AddExtensionFrameUnregistration(manager);
WaitForCondition(
base::Bind(&HaveAllExtensionRenderFrameHostsFinishedLoading, manager),
base::BindRepeating(&HaveAllExtensionRenderFrameHostsFinishedLoading,
manager),
&notification_set);
return true;
}
......@@ -97,9 +99,9 @@ bool ChromeExtensionTestNotificationObserver::WaitForExtensionIdle(
const std::string& extension_id) {
NotificationSet notification_set;
notification_set.Add(content::NOTIFICATION_RENDERER_PROCESS_TERMINATED);
WaitForCondition(
base::Bind(&util::IsExtensionIdle, extension_id, GetBrowserContext()),
&notification_set);
WaitForCondition(base::BindRepeating(&util::IsExtensionIdle, extension_id,
GetBrowserContext()),
&notification_set);
return true;
}
......@@ -107,7 +109,7 @@ bool ChromeExtensionTestNotificationObserver::WaitForExtensionNotIdle(
const std::string& extension_id) {
NotificationSet notification_set;
notification_set.Add(content::NOTIFICATION_LOAD_STOP);
WaitForCondition(base::Bind(
WaitForCondition(base::BindRepeating(
[](const std::string& extension_id,
content::BrowserContext* context) -> bool {
return !util::IsExtensionIdle(extension_id, context);
......
......@@ -919,11 +919,8 @@ void CrxInstaller::CompleteInstall() {
ExtensionAssetsManager* assets_manager =
ExtensionAssetsManager::GetInstance();
assets_manager->InstallExtension(
extension(),
unpacked_extension_root_,
install_directory_,
profile(),
base::Bind(&CrxInstaller::ReloadExtensionAfterInstall, this));
extension(), unpacked_extension_root_, install_directory_, profile(),
base::BindOnce(&CrxInstaller::ReloadExtensionAfterInstall, this));
}
void CrxInstaller::ReloadExtensionAfterInstall(
......
......@@ -42,34 +42,34 @@ namespace extensions {
namespace {
void VerifyPromptIconCallback(
const base::Closure& quit_closure,
base::OnceClosure quit_closure,
const SkBitmap& expected_bitmap,
ExtensionInstallPromptShowParams* params,
ExtensionInstallPrompt::DoneCallback done_callback,
std::unique_ptr<ExtensionInstallPrompt::Prompt> prompt) {
EXPECT_TRUE(gfx::BitmapsAreEqual(prompt->icon().AsBitmap(), expected_bitmap));
quit_closure.Run();
std::move(quit_closure).Run();
}
void VerifyPromptPermissionsCallback(
const base::Closure& quit_closure,
base::OnceClosure quit_closure,
size_t regular_permissions_count,
ExtensionInstallPromptShowParams* params,
ExtensionInstallPrompt::DoneCallback done_callback,
std::unique_ptr<ExtensionInstallPrompt::Prompt> install_prompt) {
ASSERT_TRUE(install_prompt.get());
EXPECT_EQ(regular_permissions_count, install_prompt->GetPermissionCount());
quit_closure.Run();
std::move(quit_closure).Run();
}
void VerifyPromptWithholdingUICallback(
const base::Closure& quit_closure,
base::Closure quit_closure,
const bool should_display,
ExtensionInstallPromptShowParams* params,
ExtensionInstallPrompt::DoneCallback done_callback,
std::unique_ptr<ExtensionInstallPrompt::Prompt> prompt) {
EXPECT_EQ(should_display, prompt->ShouldDisplayWithholdingUI());
quit_closure.Run();
std::move(quit_closure).Run();
}
void SetImage(gfx::Image* image_out,
......
......@@ -289,7 +289,7 @@ void ExtensionServiceTestWithInstall::UpdateExtension(
extensions::CrxInstaller* installer = nullptr;
content::WindowedNotificationObserver observer(
extensions::NOTIFICATION_CRX_INSTALLER_DONE,
base::Bind(&IsCrxInstallerDone, &installer));
base::BindRepeating(&IsCrxInstallerDone, &installer));
CRXFileInfo crx_info(path, GetTestVerifierFormat());
crx_info.extension_id = id;
service()->UpdateExtension(crx_info, true, &installer);
......
......@@ -528,8 +528,8 @@ void ExtensionWebUI::ValidateChromeURLOverrides(Profile* profile) {
extensions::ExtensionRegistry::Get(profile)
->GenerateInstalledExtensionsSet();
ForEachOverrideList(profile,
base::Bind(&ValidateOverridesList, all_extensions.get()));
ForEachOverrideList(profile, base::BindRepeating(&ValidateOverridesList,
all_extensions.get()));
}
// static
......
......@@ -75,7 +75,7 @@ class WebstoreInstallerBrowserTest
kNonAppDomain) {}
~WebstoreInstallerBrowserTest() override {}
void SetDoneClosure(base::Closure done_closure) {
void SetDoneClosure(base::OnceClosure done_closure) {
done_closure_ = std::move(done_closure);
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment