Commit b1df5cff authored by Yoichi Osato's avatar Yoichi Osato Committed by Commit Bot

[CodeHealthRotation] Convert net/ from base::Closure to base::OnceClosure

Bug: 1007815
Change-Id: I1f05b1d64a821a64815c95e778b04e3ff08ca023
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2325334Reviewed-by: default avatarMatt Menke <mmenke@chromium.org>
Commit-Queue: Yoichi Osato <yoichio@chromium.org>
Cr-Commit-Position: refs/heads/master@{#792970}
parent bee21be8
......@@ -98,7 +98,7 @@ class MockPrefDelegate : public net::HttpServerProperties::PrefDelegate {
if (!prefs_changed_callback_.is_null())
std::move(prefs_changed_callback_).Run();
if (!extra_prefs_changed_callback_.is_null())
extra_prefs_changed_callback_.Run();
std::move(extra_prefs_changed_callback_).Run();
set_properties_callback_ = std::move(callback);
}
......@@ -122,8 +122,8 @@ class MockPrefDelegate : public net::HttpServerProperties::PrefDelegate {
// Additional callback to call when prefs are updated, used to check prefs are
// updated on destruction.
void set_extra_update_prefs_callback(const base::Closure& callback) {
extra_prefs_changed_callback_ = callback;
void set_extra_update_prefs_callback(base::OnceClosure callback) {
extra_prefs_changed_callback_ = std::move(callback);
}
// Returns the base::OnceCallback, if any, passed to the last call to
......@@ -135,7 +135,7 @@ class MockPrefDelegate : public net::HttpServerProperties::PrefDelegate {
private:
base::DictionaryValue prefs_;
base::OnceClosure prefs_changed_callback_;
base::Closure extra_prefs_changed_callback_;
base::OnceClosure extra_prefs_changed_callback_;
int num_pref_updates_ = 0;
base::OnceClosure set_properties_callback_;
......
......@@ -120,20 +120,21 @@ class MockServerErrorJobInterceptor : public URLRequestInterceptor {
class TestReportSenderNetworkDelegate : public NetworkDelegateImpl {
public:
TestReportSenderNetworkDelegate()
: url_request_destroyed_callback_(base::DoNothing()),
all_url_requests_destroyed_callback_(base::DoNothing()),
: url_request_destroyed_callback_(base::DoNothing::Repeatedly()),
all_url_requests_destroyed_callback_(base::DoNothing::Repeatedly()),
num_requests_(0) {}
void ExpectReport(const std::string& report) {
expect_reports_.insert(report);
}
void set_all_url_requests_destroyed_callback(const base::Closure& callback) {
all_url_requests_destroyed_callback_ = callback;
void set_all_url_requests_destroyed_callback(
base::RepeatingClosure callback) {
all_url_requests_destroyed_callback_ = std::move(callback);
}
void set_url_request_destroyed_callback(const base::Closure& callback) {
url_request_destroyed_callback_ = callback;
void set_url_request_destroyed_callback(base::RepeatingClosure callback) {
url_request_destroyed_callback_ = std::move(callback);
}
void set_expect_url(const GURL& expect_url) { expect_url_ = expect_url; }
......@@ -174,8 +175,8 @@ class TestReportSenderNetworkDelegate : public NetworkDelegateImpl {
}
private:
base::Closure url_request_destroyed_callback_;
base::Closure all_url_requests_destroyed_callback_;
base::RepeatingClosure url_request_destroyed_callback_;
base::RepeatingClosure all_url_requests_destroyed_callback_;
size_t num_requests_;
GURL expect_url_;
std::set<std::string> expect_reports_;
......
......@@ -341,20 +341,21 @@ class CheckLoadTimingDelegate : public TestDelegate {
class WaitForCompletionNetworkDelegate : public net::TestNetworkDelegate {
public:
WaitForCompletionNetworkDelegate(
const base::Closure& all_requests_completed_callback,
base::OnceClosure all_requests_completed_callback,
size_t num_expected_requests)
: all_requests_completed_callback_(all_requests_completed_callback),
: all_requests_completed_callback_(
std::move(all_requests_completed_callback)),
num_expected_requests_(num_expected_requests) {}
void OnCompleted(URLRequest* request, bool started, int net_error) override {
net::TestNetworkDelegate::OnCompleted(request, started, net_error);
num_expected_requests_--;
if (num_expected_requests_ == 0)
all_requests_completed_callback_.Run();
std::move(all_requests_completed_callback_).Run();
}
private:
const base::Closure all_requests_completed_callback_;
base::OnceClosure all_requests_completed_callback_;
size_t num_expected_requests_;
DISALLOW_COPY_AND_ASSIGN(WaitForCompletionNetworkDelegate);
};
......
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