Commit 3db3ffe4 authored by Mario Sanchez Prada's avatar Mario Sanchez Prada Committed by Commit Bot

Convert callbacks in //content/browser/service_worker to base::OnceCallback

Migrate usage of base::Bind with one-time callbacks to base::BindOnce.

Bug: 755477
Change-Id: I926a43df96e96105083fb90f2330cdf3063d9fe2
Reviewed-on: https://chromium-review.googlesource.com/c/1485840
Commit-Queue: Kinuko Yasuda <kinuko@chromium.org>
Reviewed-by: default avatarKentaro Hara <haraken@chromium.org>
Reviewed-by: default avatarKinuko Yasuda <kinuko@chromium.org>
Cr-Commit-Position: refs/heads/master@{#635355}
parent 53f3d4d3
......@@ -55,13 +55,13 @@ std::unique_ptr<ServiceWorkerNavigationHandleCore> CreateNavigationHandleCore(
std::unique_ptr<ServiceWorkerNavigationHandleCore> navigation_handle_core;
base::PostTaskWithTraitsAndReplyWithResult(
FROM_HERE, {BrowserThread::UI},
base::Bind(
base::BindOnce(
[](ServiceWorkerContextWrapper* wrapper) {
return std::make_unique<ServiceWorkerNavigationHandleCore>(nullptr,
wrapper);
},
base::RetainedRef(context_wrapper)),
base::Bind(
base::BindOnce(
[](std::unique_ptr<ServiceWorkerNavigationHandleCore>* dest,
std::unique_ptr<ServiceWorkerNavigationHandleCore> src) {
*dest = std::move(src);
......
......@@ -176,8 +176,8 @@ class MockHttpProtocolHandler
: public net::URLRequestJobFactory::ProtocolHandler {
public:
using JobCallback =
base::RepeatingCallback<net::URLRequestJob*(net::URLRequest*,
net::NetworkDelegate*)>;
base::OnceCallback<net::URLRequestJob*(net::URLRequest*,
net::NetworkDelegate*)>;
MockHttpProtocolHandler() {}
~MockHttpProtocolHandler() override {}
......@@ -190,14 +190,14 @@ class MockHttpProtocolHandler
if (handler) {
return handler->MaybeCreateJob(request, network_delegate, nullptr);
}
return create_job_callback_.Run(request, network_delegate);
return std::move(create_job_callback_).Run(request, network_delegate);
}
void SetCreateJobCallback(JobCallback callback) {
create_job_callback_ = std::move(callback);
}
private:
JobCallback create_job_callback_;
mutable JobCallback create_job_callback_;
};
class ResponseVerifier : public base::RefCounted<ResponseVerifier> {
......@@ -355,7 +355,7 @@ class ServiceWorkerWriteToCacheJobTest : public testing::Test {
int CreateIncumbent(const std::string& response) {
mock_protocol_handler_->SetCreateJobCallback(
base::Bind(&CreateResponseJob, response));
base::BindOnce(&CreateResponseJob, response));
request_->Start();
base::RunLoop().RunUntilIdle();
EXPECT_EQ(net::URLRequestStatus::SUCCESS, request_->status().status());
......@@ -392,7 +392,7 @@ class ServiceWorkerWriteToCacheJobTest : public testing::Test {
EXPECT_TRUE(host);
SetUpScriptRequest(helper_->mock_render_process_id(), host->provider_id());
mock_protocol_handler_->SetCreateJobCallback(
base::Bind(&CreateResponseJob, response));
base::BindOnce(&CreateResponseJob, response));
request_->Start();
base::RunLoop().RunUntilIdle();
return new_version;
......@@ -444,7 +444,7 @@ TEST_F(ServiceWorkerWriteToCacheJobTest, Normal) {
return;
mock_protocol_handler_->SetCreateJobCallback(
base::Bind(&CreateNormalURLRequestJob));
base::BindOnce(&CreateNormalURLRequestJob));
request_->Start();
base::RunLoop().RunUntilIdle();
EXPECT_EQ(net::URLRequestStatus::SUCCESS, request_->status().status());
......@@ -457,7 +457,7 @@ TEST_F(ServiceWorkerWriteToCacheJobTest, InvalidMimeType) {
return;
mock_protocol_handler_->SetCreateJobCallback(
base::Bind(&CreateInvalidMimeTypeJob));
base::BindOnce(&CreateInvalidMimeTypeJob));
request_->Start();
base::RunLoop().RunUntilIdle();
EXPECT_EQ(net::URLRequestStatus::FAILED, request_->status().status());
......@@ -471,7 +471,7 @@ TEST_F(ServiceWorkerWriteToCacheJobTest, SSLCertificateError) {
return;
mock_protocol_handler_->SetCreateJobCallback(
base::Bind(&CreateSSLCertificateErrorJob));
base::BindOnce(&CreateSSLCertificateErrorJob));
request_->Start();
base::RunLoop().RunUntilIdle();
EXPECT_EQ(net::URLRequestStatus::FAILED, request_->status().status());
......@@ -498,7 +498,7 @@ TEST_F(ServiceWorkerWriteToCacheLocalhostTest,
switches::kAllowInsecureLocalhost);
mock_protocol_handler_->SetCreateJobCallback(
base::Bind(&CreateSSLCertificateErrorJob));
base::BindOnce(&CreateSSLCertificateErrorJob));
request_->Start();
base::RunLoop().RunUntilIdle();
EXPECT_EQ(net::URLRequestStatus::SUCCESS, request_->status().status());
......@@ -512,7 +512,7 @@ TEST_F(ServiceWorkerWriteToCacheLocalhostTest, SSLCertificateError) {
return;
mock_protocol_handler_->SetCreateJobCallback(
base::Bind(&CreateSSLCertificateErrorJob));
base::BindOnce(&CreateSSLCertificateErrorJob));
request_->Start();
base::RunLoop().RunUntilIdle();
EXPECT_EQ(net::URLRequestStatus::FAILED, request_->status().status());
......@@ -530,7 +530,7 @@ TEST_F(ServiceWorkerWriteToCacheLocalhostTest,
switches::kAllowInsecureLocalhost);
mock_protocol_handler_->SetCreateJobCallback(
base::Bind(&CreateCertStatusErrorJob));
base::BindOnce(&CreateCertStatusErrorJob));
request_->Start();
base::RunLoop().RunUntilIdle();
EXPECT_EQ(net::URLRequestStatus::SUCCESS, request_->status().status());
......@@ -544,7 +544,7 @@ TEST_F(ServiceWorkerWriteToCacheLocalhostTest, CertStatusError) {
return;
mock_protocol_handler_->SetCreateJobCallback(
base::Bind(&CreateCertStatusErrorJob));
base::BindOnce(&CreateCertStatusErrorJob));
request_->Start();
base::RunLoop().RunUntilIdle();
EXPECT_EQ(net::URLRequestStatus::FAILED, request_->status().status());
......@@ -558,7 +558,7 @@ TEST_F(ServiceWorkerWriteToCacheJobTest, CertStatusError) {
return;
mock_protocol_handler_->SetCreateJobCallback(
base::Bind(&CreateCertStatusErrorJob));
base::BindOnce(&CreateCertStatusErrorJob));
request_->Start();
base::RunLoop().RunUntilIdle();
EXPECT_EQ(net::URLRequestStatus::FAILED, request_->status().status());
......@@ -701,7 +701,7 @@ TEST_F(ServiceWorkerWriteToCacheJobTest, Error) {
return;
mock_protocol_handler_->SetCreateJobCallback(
base::Bind(&CreateFailedURLRequestJob));
base::BindOnce(&CreateFailedURLRequestJob));
request_->Start();
base::RunLoop().RunUntilIdle();
EXPECT_EQ(net::URLRequestStatus::FAILED, request_->status().status());
......@@ -715,7 +715,7 @@ TEST_F(ServiceWorkerWriteToCacheJobTest, FailedWriteHeadersToCache) {
return;
mock_protocol_handler_->SetCreateJobCallback(
base::Bind(&CreateNormalURLRequestJob));
base::BindOnce(&CreateNormalURLRequestJob));
DisableCache();
request_->Start();
base::RunLoop().RunUntilIdle();
......
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