Commit 0a01915d authored by Andrew Shulaev's avatar Andrew Shulaev Committed by Commit Bot

Replace base::Closure with base::{Once,Repeating}Closure

Couple of usages seem to use the callback multiple times, thus base::RepeatingClosure is used in these places.

Context: https://docs.google.com/document/d/1J4N3V5UmzZL9BZGNrn95E4xJu4cz3ynbg21zXR-J_qA/edit#

Bug: 1007635
Change-Id: I3bc08d2a1b9149eeaaa0386f05334b04697be40c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2440581
Commit-Queue: Jochen Eisinger <jochen@chromium.org>
Reviewed-by: default avatarBen Wells <benwells@chromium.org>
Reviewed-by: default avatarJochen Eisinger <jochen@chromium.org>
Auto-Submit: Andrew Shulaev <ddrone@google.com>
Cr-Commit-Position: refs/heads/master@{#813096}
parent 4a39c7ca
...@@ -328,7 +328,6 @@ _NOT_CONVERTED_TO_MODERN_BIND_AND_CALLBACK = '|'.join(( ...@@ -328,7 +328,6 @@ _NOT_CONVERTED_TO_MODERN_BIND_AND_CALLBACK = '|'.join((
'^chrome/browser/download/', '^chrome/browser/download/',
'^chrome/browser/extensions/', '^chrome/browser/extensions/',
'^chrome/browser/history/', '^chrome/browser/history/',
'^chrome/browser/installable/installable_manager_browsertest.cc',
'^chrome/browser/lifetime/', '^chrome/browser/lifetime/',
'^chrome/browser/media_galleries/', '^chrome/browser/media_galleries/',
'^chrome/browser/media/', '^chrome/browser/media/',
......
...@@ -95,15 +95,16 @@ InstallableParams GetPrimaryIconPreferMaskableAndSplashIconParams() { ...@@ -95,15 +95,16 @@ InstallableParams GetPrimaryIconPreferMaskableAndSplashIconParams() {
class LazyWorkerInstallableManager : public InstallableManager { class LazyWorkerInstallableManager : public InstallableManager {
public: public:
LazyWorkerInstallableManager(content::WebContents* web_contents, LazyWorkerInstallableManager(content::WebContents* web_contents,
base::Closure quit_closure) base::OnceClosure quit_closure)
: InstallableManager(web_contents), quit_closure_(quit_closure) {} : InstallableManager(web_contents),
~LazyWorkerInstallableManager() override {} quit_closure_(std::move(quit_closure)) {}
~LazyWorkerInstallableManager() override = default;
protected: protected:
void OnWaitingForServiceWorker() override { quit_closure_.Run(); } void OnWaitingForServiceWorker() override { std::move(quit_closure_).Run(); }
private: private:
base::Closure quit_closure_; base::OnceClosure quit_closure_;
}; };
// Used only for testing pages where the manifest URL is changed. This class // Used only for testing pages where the manifest URL is changed. This class
...@@ -114,7 +115,7 @@ class ResetDataInstallableManager : public InstallableManager { ...@@ -114,7 +115,7 @@ class ResetDataInstallableManager : public InstallableManager {
: InstallableManager(web_contents) {} : InstallableManager(web_contents) {}
~ResetDataInstallableManager() override {} ~ResetDataInstallableManager() override {}
void SetQuitClosure(base::Closure quit_closure) { void SetQuitClosure(base::RepeatingClosure quit_closure) {
quit_closure_ = quit_closure; quit_closure_ = quit_closure;
} }
...@@ -125,12 +126,12 @@ class ResetDataInstallableManager : public InstallableManager { ...@@ -125,12 +126,12 @@ class ResetDataInstallableManager : public InstallableManager {
} }
private: private:
base::Closure quit_closure_; base::RepeatingClosure quit_closure_;
}; };
class CallbackTester { class CallbackTester {
public: public:
explicit CallbackTester(base::Closure quit_closure) explicit CallbackTester(base::RepeatingClosure quit_closure)
: quit_closure_(quit_closure) {} : quit_closure_(quit_closure) {}
void OnDidFinishInstallableCheck(const InstallableData& data) { void OnDidFinishInstallableCheck(const InstallableData& data) {
...@@ -162,7 +163,7 @@ class CallbackTester { ...@@ -162,7 +163,7 @@ class CallbackTester {
bool has_worker() const { return has_worker_; } bool has_worker() const { return has_worker_; }
private: private:
base::Closure quit_closure_; base::RepeatingClosure quit_closure_;
std::vector<InstallableStatusCode> errors_; std::vector<InstallableStatusCode> errors_;
GURL manifest_url_; GURL manifest_url_;
blink::Manifest manifest_; blink::Manifest manifest_;
...@@ -179,8 +180,10 @@ class NestedCallbackTester { ...@@ -179,8 +180,10 @@ class NestedCallbackTester {
public: public:
NestedCallbackTester(InstallableManager* manager, NestedCallbackTester(InstallableManager* manager,
const InstallableParams& params, const InstallableParams& params,
base::Closure quit_closure) base::OnceClosure quit_closure)
: manager_(manager), params_(params), quit_closure_(quit_closure) {} : manager_(manager),
params_(params),
quit_closure_(std::move(quit_closure)) {}
void Run() { void Run() {
manager_->GetData( manager_->GetData(
...@@ -217,13 +220,13 @@ class NestedCallbackTester { ...@@ -217,13 +220,13 @@ class NestedCallbackTester {
EXPECT_EQ(manifest_.short_name, data.manifest->short_name); EXPECT_EQ(manifest_.short_name, data.manifest->short_name);
EXPECT_EQ(manifest_.display_override, data.manifest->display_override); EXPECT_EQ(manifest_.display_override, data.manifest->display_override);
quit_closure_.Run(); std::move(quit_closure_).Run();
} }
private: private:
InstallableManager* manager_; InstallableManager* manager_;
InstallableParams params_; InstallableParams params_;
base::Closure quit_closure_; base::OnceClosure quit_closure_;
std::vector<InstallableStatusCode> errors_; std::vector<InstallableStatusCode> errors_;
GURL manifest_url_; GURL manifest_url_;
blink::Manifest manifest_; blink::Manifest manifest_;
......
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