Commit 8b6aef14 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: 1152279
Change-Id: Ib3ba70a5b7ebb25bed2faada69c48f300b0ff18a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2595462Reviewed-by: default avatarFilip Gorski <fgorski@chromium.org>
Commit-Queue: Yi Gu <yigu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#838245}
parent 593304b4
...@@ -84,11 +84,11 @@ using testing::_; ...@@ -84,11 +84,11 @@ using testing::_;
namespace { namespace {
void StoreDigest(std::vector<uint8_t>* digest, void StoreDigest(std::vector<uint8_t>* digest,
const base::Closure& callback, base::OnceClosure callback,
base::Value value) { base::Value value) {
ASSERT_TRUE(value.is_blob()) << "Unexpected value in StoreDigest"; ASSERT_TRUE(value.is_blob()) << "Unexpected value in StoreDigest";
digest->assign(value.GetBlob().begin(), value.GetBlob().end()); digest->assign(value.GetBlob().begin(), value.GetBlob().end());
callback.Run(); std::move(callback).Run();
} }
bool RsaSignRawData(uint16_t openssl_signature_algorithm, bool RsaSignRawData(uint16_t openssl_signature_algorithm,
......
...@@ -319,7 +319,7 @@ ExtensionFunction::ResponseAction PermissionsRequestFunction::Run() { ...@@ -319,7 +319,7 @@ ExtensionFunction::ResponseAction PermissionsRequestFunction::Run() {
install_ui_.reset(new ExtensionInstallPrompt( install_ui_.reset(new ExtensionInstallPrompt(
Profile::FromBrowserContext(browser_context()), native_window)); Profile::FromBrowserContext(browser_context()), native_window));
install_ui_->ShowDialog( install_ui_->ShowDialog(
base::Bind(&PermissionsRequestFunction::OnInstallPromptDone, base::BindOnce(&PermissionsRequestFunction::OnInstallPromptDone,
base::RetainedRef(this)), base::RetainedRef(this)),
extension(), nullptr, extension(), nullptr,
std::make_unique<ExtensionInstallPrompt::Prompt>( std::make_unique<ExtensionInstallPrompt::Prompt>(
......
...@@ -253,7 +253,8 @@ bool ChromeRuntimeAPIDelegate::CheckForUpdates( ...@@ -253,7 +253,8 @@ bool ChromeRuntimeAPIDelegate::CheckForUpdates(
extensions::ExtensionUpdater::CheckParams params; extensions::ExtensionUpdater::CheckParams params;
params.ids = {extension_id}; params.ids = {extension_id};
params.callback = base::Bind(&ChromeRuntimeAPIDelegate::UpdateCheckComplete, params.callback =
base::BindOnce(&ChromeRuntimeAPIDelegate::UpdateCheckComplete,
base::Unretained(this), extension_id); base::Unretained(this), extension_id);
updater->CheckNow(std::move(params)); updater->CheckNow(std::move(params));
} }
......
...@@ -140,7 +140,7 @@ TEST_F(UDPSocketUnitTest, TestUDPMulticastLoopbackMode) { ...@@ -140,7 +140,7 @@ TEST_F(UDPSocketUnitTest, TestUDPMulticastLoopbackMode) {
// Send a test multicast packet every second. // Send a test multicast packet every second.
// Once the target socket received the packet, the message loop will exit. // Once the target socket received the packet, the message loop will exit.
static void SendMulticastPacket(const base::Closure& quit_run_loop, static void SendMulticastPacket(base::OnceClosure quit_run_loop,
UDPSocket* src, UDPSocket* src,
int result) { int result) {
if (result == 0) { if (result == 0) {
...@@ -149,15 +149,16 @@ static void SendMulticastPacket(const base::Closure& quit_run_loop, ...@@ -149,15 +149,16 @@ static void SendMulticastPacket(const base::Closure& quit_run_loop,
src->Write(data, kTestMessageLength, base::BindOnce(&OnSendCompleted)); src->Write(data, kTestMessageLength, base::BindOnce(&OnSendCompleted));
base::ThreadTaskRunnerHandle::Get()->PostDelayedTask( base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
FROM_HERE, FROM_HERE,
base::BindOnce(&SendMulticastPacket, quit_run_loop, src, result), base::BindOnce(&SendMulticastPacket, std::move(quit_run_loop), src,
result),
base::TimeDelta::FromSeconds(1)); base::TimeDelta::FromSeconds(1));
} else { } else {
quit_run_loop.Run(); std::move(quit_run_loop).Run();
FAIL() << "Failed to connect to multicast address. Error code: " << result; FAIL() << "Failed to connect to multicast address. Error code: " << result;
} }
} }
static void OnMulticastReadCompleted(const base::Closure& quit_run_loop, static void OnMulticastReadCompleted(base::OnceClosure quit_run_loop,
bool* packet_received, bool* packet_received,
int count, int count,
scoped_refptr<net::IOBuffer> io_buffer, scoped_refptr<net::IOBuffer> io_buffer,
...@@ -167,7 +168,7 @@ static void OnMulticastReadCompleted(const base::Closure& quit_run_loop, ...@@ -167,7 +168,7 @@ static void OnMulticastReadCompleted(const base::Closure& quit_run_loop,
EXPECT_EQ(kTestMessageLength, count); EXPECT_EQ(kTestMessageLength, count);
EXPECT_EQ(0, strncmp(io_buffer->data(), kTestMessage, kTestMessageLength)); EXPECT_EQ(0, strncmp(io_buffer->data(), kTestMessage, kTestMessageLength));
*packet_received = true; *packet_received = true;
quit_run_loop.Run(); std::move(quit_run_loop).Run();
} }
TEST_F(UDPSocketUnitTest, TestUDPMulticastRecv) { TEST_F(UDPSocketUnitTest, TestUDPMulticastRecv) {
......
...@@ -194,7 +194,7 @@ class WebNavigationApiTest : public ExtensionApiTest { ...@@ -194,7 +194,7 @@ class WebNavigationApiTest : public ExtensionApiTest {
public: public:
WebNavigationApiTest() { WebNavigationApiTest() {
embedded_test_server()->RegisterRequestHandler( embedded_test_server()->RegisterRequestHandler(
base::Bind(&HandleTestRequest)); base::BindRepeating(&HandleTestRequest));
} }
~WebNavigationApiTest() override {} ~WebNavigationApiTest() override {}
......
...@@ -1081,7 +1081,7 @@ IN_PROC_BROWSER_TEST_F(ContentScriptApiTest, ContentScriptUrls) { ...@@ -1081,7 +1081,7 @@ IN_PROC_BROWSER_TEST_F(ContentScriptApiTest, ContentScriptUrls) {
[](const content::WebContentsConsoleObserver::Message& message) { [](const content::WebContentsConsoleObserver::Message& message) {
return message.message == base::ASCIIToUTF16("TestMessage"); return message.message == base::ASCIIToUTF16("TestMessage");
}; };
observer.SetFilter(base::Bind(filter)); observer.SetFilter(base::BindRepeating(filter));
ui_test_utils::NavigateToURL( ui_test_utils::NavigateToURL(
browser(), embedded_test_server()->GetURL(host, "/simple.html")); browser(), embedded_test_server()->GetURL(host, "/simple.html"));
ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); ASSERT_TRUE(catcher.GetNextResult()) << catcher.message();
......
...@@ -63,7 +63,7 @@ void VerifyPromptPermissionsCallback( ...@@ -63,7 +63,7 @@ void VerifyPromptPermissionsCallback(
} }
void VerifyPromptWithholdingUICallback( void VerifyPromptWithholdingUICallback(
base::Closure quit_closure, base::OnceClosure quit_closure,
const bool should_display, const bool should_display,
ExtensionInstallPromptShowParams* params, ExtensionInstallPromptShowParams* params,
ExtensionInstallPrompt::DoneCallback done_callback, ExtensionInstallPrompt::DoneCallback done_callback,
...@@ -73,10 +73,10 @@ void VerifyPromptWithholdingUICallback( ...@@ -73,10 +73,10 @@ void VerifyPromptWithholdingUICallback(
} }
void SetImage(gfx::Image* image_out, void SetImage(gfx::Image* image_out,
const base::Closure& quit_closure, base::OnceClosure quit_closure,
const gfx::Image& image_in) { const gfx::Image& image_in) {
*image_out = image_in; *image_out = image_in;
quit_closure.Run(); std::move(quit_closure).Run();
} }
class ExtensionInstallPromptUnitTest : public testing::Test { class ExtensionInstallPromptUnitTest : public testing::Test {
......
...@@ -13,8 +13,8 @@ ExtensionApiTestWithManagementPolicy::~ExtensionApiTestWithManagementPolicy() {} ...@@ -13,8 +13,8 @@ ExtensionApiTestWithManagementPolicy::~ExtensionApiTestWithManagementPolicy() {}
void ExtensionApiTestWithManagementPolicy::SetUpInProcessBrowserTestFixture() { void ExtensionApiTestWithManagementPolicy::SetUpInProcessBrowserTestFixture() {
extensions::ExtensionApiTest::SetUpInProcessBrowserTestFixture(); extensions::ExtensionApiTest::SetUpInProcessBrowserTestFixture();
embedded_test_server()->RegisterRequestMonitor( embedded_test_server()->RegisterRequestMonitor(base::BindRepeating(
base::Bind(&ExtensionApiTestWithManagementPolicy::MonitorRequestHandler, &ExtensionApiTestWithManagementPolicy::MonitorRequestHandler,
base::Unretained(this))); base::Unretained(this)));
ON_CALL(policy_provider_, IsInitializationComplete(testing::_)) ON_CALL(policy_provider_, IsInitializationComplete(testing::_))
.WillByDefault(testing::Return(true)); .WillByDefault(testing::Return(true));
......
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