Commit ef56534f authored by Jeremy Roman's avatar Jeremy Roman Committed by Chromium LUCI CQ

[CodeHealth] Use base::OnceClosure in FontAccessChooserController.

While here, use QuitClosure as a more concise way of calling
RunLoop::Quit.

No functional change intended.

Bug: 1007635
Change-Id: I25de4378122baa59fdab936b1602656533063106
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2600025
Commit-Queue: Olivier Yiptong <oyiptong@chromium.org>
Auto-Submit: Jeremy Roman <jbroman@chromium.org>
Reviewed-by: default avatarOlivier Yiptong <oyiptong@chromium.org>
Cr-Commit-Position: refs/heads/master@{#838940}
parent 026a3d21
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
#ifndef CHROME_BROWSER_UI_FONT_ACCESS_FONT_ACCESS_CHOOSER_CONTROLLER_H_ #ifndef CHROME_BROWSER_UI_FONT_ACCESS_FONT_ACCESS_CHOOSER_CONTROLLER_H_
#define CHROME_BROWSER_UI_FONT_ACCESS_FONT_ACCESS_CHOOSER_CONTROLLER_H_ #define CHROME_BROWSER_UI_FONT_ACCESS_FONT_ACCESS_CHOOSER_CONTROLLER_H_
#include "base/callback.h"
#include "chrome/browser/chooser_controller/chooser_controller.h" #include "chrome/browser/chooser_controller/chooser_controller.h"
#include "content/public/browser/font_access_chooser.h" #include "content/public/browser/font_access_chooser.h"
#include "content/public/browser/render_frame_host.h" #include "content/public/browser/render_frame_host.h"
...@@ -46,15 +47,15 @@ class FontAccessChooserController : public ChooserController { ...@@ -46,15 +47,15 @@ class FontAccessChooserController : public ChooserController {
void Close() override; void Close() override;
void OpenHelpCenterUrl() const override; void OpenHelpCenterUrl() const override;
void SetReadyCallbackForTesting(base::Callback<void()> callback) { void SetReadyCallbackForTesting(base::OnceClosure callback) {
ready_callback_for_testing_ = callback; ready_callback_for_testing_ = std::move(callback);
} }
private: private:
void DidFindAllFonts(blink::mojom::FontEnumerationStatus status, void DidFindAllFonts(blink::mojom::FontEnumerationStatus status,
std::vector<blink::mojom::FontMetadata> fonts); std::vector<blink::mojom::FontMetadata> fonts);
content::FontAccessChooser::Callback callback_; content::FontAccessChooser::Callback callback_;
base::Callback<void()> ready_callback_for_testing_; base::OnceClosure ready_callback_for_testing_;
std::map<std::string, blink::mojom::FontMetadata> font_metadata_map_; std::map<std::string, blink::mojom::FontMetadata> font_metadata_map_;
// An ordered list of font names that determines the order of items in the // An ordered list of font names that determines the order of items in the
......
...@@ -41,8 +41,7 @@ TEST_F(FontAccessChooserControllerTest, MultiSelectTest) { ...@@ -41,8 +41,7 @@ TEST_F(FontAccessChooserControllerTest, MultiSelectTest) {
})); }));
base::RunLoop readiness_loop; base::RunLoop readiness_loop;
controller.SetReadyCallbackForTesting( controller.SetReadyCallbackForTesting(readiness_loop.QuitClosure());
base::BindLambdaForTesting([&]() { readiness_loop.Quit(); }));
readiness_loop.Run(); readiness_loop.Run();
controller.set_view(mock_font_chooser_view_.get()); controller.set_view(mock_font_chooser_view_.get());
...@@ -65,8 +64,7 @@ TEST_F(FontAccessChooserControllerTest, CancelTest) { ...@@ -65,8 +64,7 @@ TEST_F(FontAccessChooserControllerTest, CancelTest) {
})); }));
base::RunLoop readiness_loop; base::RunLoop readiness_loop;
controller.SetReadyCallbackForTesting( controller.SetReadyCallbackForTesting(readiness_loop.QuitClosure());
base::BindLambdaForTesting([&]() { readiness_loop.Quit(); }));
readiness_loop.Run(); readiness_loop.Run();
controller.set_view(mock_font_chooser_view_.get()); controller.set_view(mock_font_chooser_view_.get());
...@@ -87,8 +85,7 @@ TEST_F(FontAccessChooserControllerTest, CloseTest) { ...@@ -87,8 +85,7 @@ TEST_F(FontAccessChooserControllerTest, CloseTest) {
})); }));
base::RunLoop readiness_loop; base::RunLoop readiness_loop;
controller.SetReadyCallbackForTesting( controller.SetReadyCallbackForTesting(readiness_loop.QuitClosure());
base::BindLambdaForTesting([&]() { readiness_loop.Quit(); }));
readiness_loop.Run(); readiness_loop.Run();
controller.set_view(mock_font_chooser_view_.get()); controller.set_view(mock_font_chooser_view_.get());
...@@ -112,8 +109,7 @@ TEST_F(FontAccessChooserControllerTest, DestructorTest) { ...@@ -112,8 +109,7 @@ TEST_F(FontAccessChooserControllerTest, DestructorTest) {
})); }));
base::RunLoop readiness_loop; base::RunLoop readiness_loop;
controller->SetReadyCallbackForTesting( controller->SetReadyCallbackForTesting(readiness_loop.QuitClosure());
base::BindLambdaForTesting([&]() { readiness_loop.Quit(); }));
readiness_loop.Run(); readiness_loop.Run();
controller.reset(); controller.reset();
......
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