| Index: content/browser/service_worker/service_worker_url_request_job_unittest.cc
|
| diff --git a/content/browser/service_worker/service_worker_url_request_job_unittest.cc b/content/browser/service_worker/service_worker_url_request_job_unittest.cc
|
| index 58e105862eb6b330e7ec7a7eeeb99e3421b2e80b..4f184e3a5094dd840cb67d46d51141971b76be74 100644
|
| --- a/content/browser/service_worker/service_worker_url_request_job_unittest.cc
|
| +++ b/content/browser/service_worker/service_worker_url_request_job_unittest.cc
|
| @@ -406,7 +406,7 @@ class ProviderDeleteHelper : public EmbeddedWorkerTestHelper {
|
| int fetch_event_id,
|
| const ServiceWorkerFetchRequest& request,
|
| mojom::FetchEventPreloadHandlePtr preload_handle,
|
| - const FetchCallback& callback) override {
|
| + FetchCallback callback) override {
|
| context()->RemoveProviderHost(mock_render_process_id(), kProviderID);
|
| SimulateSend(new ServiceWorkerHostMsg_FetchEventResponse(
|
| embedded_worker_id, fetch_event_id,
|
| @@ -421,7 +421,7 @@ class ProviderDeleteHelper : public EmbeddedWorkerTestHelper {
|
| base::MakeUnique<
|
| ServiceWorkerHeaderList>() /* cors_exposed_header_names */),
|
| base::Time::Now()));
|
| - callback.Run(SERVICE_WORKER_OK, base::Time::Now());
|
| + std::move(callback).Run(SERVICE_WORKER_OK, base::Time::Now());
|
| }
|
|
|
| private:
|
| @@ -492,7 +492,7 @@ class BlobResponder : public EmbeddedWorkerTestHelper {
|
| int fetch_event_id,
|
| const ServiceWorkerFetchRequest& request,
|
| mojom::FetchEventPreloadHandlePtr preload_handle,
|
| - const FetchCallback& callback) override {
|
| + FetchCallback callback) override {
|
| SimulateSend(new ServiceWorkerHostMsg_FetchEventResponse(
|
| embedded_worker_id, fetch_event_id,
|
| SERVICE_WORKER_FETCH_EVENT_RESULT_RESPONSE,
|
| @@ -506,7 +506,7 @@ class BlobResponder : public EmbeddedWorkerTestHelper {
|
| base::MakeUnique<
|
| ServiceWorkerHeaderList>() /* cors_exposed_header_names */),
|
| base::Time::Now()));
|
| - callback.Run(SERVICE_WORKER_OK, base::Time::Now());
|
| + std::move(callback).Run(SERVICE_WORKER_OK, base::Time::Now());
|
| }
|
|
|
| std::string blob_uuid_;
|
| @@ -578,7 +578,7 @@ class StreamResponder : public EmbeddedWorkerTestHelper {
|
| int fetch_event_id,
|
| const ServiceWorkerFetchRequest& request,
|
| mojom::FetchEventPreloadHandlePtr preload_handle,
|
| - const FetchCallback& callback) override {
|
| + FetchCallback callback) override {
|
| SimulateSend(new ServiceWorkerHostMsg_FetchEventResponse(
|
| embedded_worker_id, fetch_event_id,
|
| SERVICE_WORKER_FETCH_EVENT_RESULT_RESPONSE,
|
| @@ -591,7 +591,7 @@ class StreamResponder : public EmbeddedWorkerTestHelper {
|
| base::MakeUnique<
|
| ServiceWorkerHeaderList>() /* cors_exposed_header_names */),
|
| base::Time::Now()));
|
| - callback.Run(SERVICE_WORKER_OK, base::Time::Now());
|
| + std::move(callback).Run(SERVICE_WORKER_OK, base::Time::Now());
|
| }
|
|
|
| const GURL stream_url_;
|
| @@ -892,9 +892,9 @@ class FailFetchHelper : public EmbeddedWorkerTestHelper {
|
| int fetch_event_id,
|
| const ServiceWorkerFetchRequest& request,
|
| mojom::FetchEventPreloadHandlePtr preload_handle,
|
| - const FetchCallback& callback) override {
|
| + FetchCallback callback) override {
|
| SimulateWorkerStopped(embedded_worker_id);
|
| - callback.Run(SERVICE_WORKER_ERROR_ABORT, base::Time::Now());
|
| + std::move(callback).Run(SERVICE_WORKER_ERROR_ABORT, base::Time::Now());
|
| }
|
|
|
| private:
|
| @@ -969,7 +969,7 @@ class EarlyResponseHelper : public EmbeddedWorkerTestHelper {
|
| ~EarlyResponseHelper() override {}
|
|
|
| void FinishWaitUntil() {
|
| - callback_.Run(SERVICE_WORKER_OK, base::Time::Now());
|
| + std::move(callback_).Run(SERVICE_WORKER_OK, base::Time::Now());
|
| }
|
|
|
| protected:
|
| @@ -977,8 +977,8 @@ class EarlyResponseHelper : public EmbeddedWorkerTestHelper {
|
| int fetch_event_id,
|
| const ServiceWorkerFetchRequest& request,
|
| mojom::FetchEventPreloadHandlePtr preload_handle,
|
| - const FetchCallback& callback) override {
|
| - callback_ = callback;
|
| + FetchCallback callback) override {
|
| + callback_ = std::move(callback);
|
| SimulateSend(new ServiceWorkerHostMsg_FetchEventResponse(
|
| embedded_worker_id, fetch_event_id,
|
| SERVICE_WORKER_FETCH_EVENT_RESULT_RESPONSE,
|
| @@ -1048,7 +1048,7 @@ class DelayedResponseHelper : public EmbeddedWorkerTestHelper {
|
| base::MakeUnique<
|
| ServiceWorkerHeaderList>() /* cors_exposed_header_names */),
|
| base::Time::Now()));
|
| - callback_.Run(SERVICE_WORKER_OK, base::Time::Now());
|
| + std::move(callback_).Run(SERVICE_WORKER_OK, base::Time::Now());
|
| }
|
|
|
| protected:
|
| @@ -1056,10 +1056,10 @@ class DelayedResponseHelper : public EmbeddedWorkerTestHelper {
|
| int fetch_event_id,
|
| const ServiceWorkerFetchRequest& request,
|
| mojom::FetchEventPreloadHandlePtr preload_handle,
|
| - const FetchCallback& callback) override {
|
| + FetchCallback callback) override {
|
| embedded_worker_id_ = embedded_worker_id;
|
| fetch_event_id_ = fetch_event_id;
|
| - callback_ = callback;
|
| + callback_ = std::move(callback);
|
| }
|
|
|
| private:
|
|
|