diff options
Diffstat (limited to 'chromium/content/browser/background_fetch')
8 files changed, 17 insertions, 16 deletions
diff --git a/chromium/content/browser/background_fetch/background_fetch_delegate_proxy.cc b/chromium/content/browser/background_fetch/background_fetch_delegate_proxy.cc index 7bd4d455ac4..7fdbb99fbc7 100644 --- a/chromium/content/browser/background_fetch/background_fetch_delegate_proxy.cc +++ b/chromium/content/browser/background_fetch/background_fetch_delegate_proxy.cc @@ -7,7 +7,6 @@ #include <utility> #include "base/bind.h" -#include "base/task/post_task.h" #include "components/download/public/common/download_item.h" #include "components/download/public/common/download_url_parameters.h" #include "content/browser/background_fetch/background_fetch_job_controller.h" @@ -299,8 +298,8 @@ void BackgroundFetchDelegateProxy::Core::GetUploadData( base::BindOnce( [](BackgroundFetchDelegate::GetUploadDataCallback callback, blink::mojom::SerializedBlobPtr blob) { - base::PostTask( - FROM_HERE, {BrowserThread::UI}, + GetUIThreadTaskRunner({})->PostTask( + FROM_HERE, base::BindOnce(std::move(callback), std::move(blob))); }, std::move(callback)); diff --git a/chromium/content/browser/background_fetch/background_fetch_job_controller.cc b/chromium/content/browser/background_fetch/background_fetch_job_controller.cc index d21c6f2d19f..7eaded480aa 100644 --- a/chromium/content/browser/background_fetch/background_fetch_job_controller.cc +++ b/chromium/content/browser/background_fetch/background_fetch_job_controller.cc @@ -377,6 +377,7 @@ void BackgroundFetchJobController::DidGetUploadData( Abort(BackgroundFetchFailureReason::SERVICE_WORKER_UNAVAILABLE, base::DoNothing()); std::move(callback).Run(nullptr); + return; } DCHECK(blob); diff --git a/chromium/content/browser/background_fetch/background_fetch_request_info.cc b/chromium/content/browser/background_fetch/background_fetch_request_info.cc index dd89cd43378..d1f54c23e05 100644 --- a/chromium/content/browser/background_fetch/background_fetch_request_info.cc +++ b/chromium/content/browser/background_fetch/background_fetch_request_info.cc @@ -8,7 +8,6 @@ #include "base/guid.h" #include "base/strings/string_util.h" -#include "base/task/post_task.h" #include "base/threading/sequenced_task_runner_handle.h" #include "components/download/public/common/download_item.h" #include "content/browser/blob_storage/chrome_blob_storage_context.h" @@ -188,8 +187,8 @@ void BackgroundFetchRequestInfo::CreateResponseBlobDataHandle( if (ServiceWorkerContext::IsServiceWorkerOnUIEnabled()) { // base::Unretained is safe because |io_blob_data_| is deleted on the IO // thread in a task that must run after this task. - base::PostTask( - FROM_HERE, {BrowserThread::IO}, + GetIOThreadTaskRunner({})->PostTask( + FROM_HERE, base::BindOnce(&BlobDataOnIO::CreateBlobDataHandle, base::Unretained(io_blob_data_.get()), std::move(blob_storage_context), std::move(handle), diff --git a/chromium/content/browser/background_fetch/background_fetch_test_data_manager.cc b/chromium/content/browser/background_fetch/background_fetch_test_data_manager.cc index d86550b8632..b1154dfb0df 100644 --- a/chromium/content/browser/background_fetch/background_fetch_test_data_manager.cc +++ b/chromium/content/browser/background_fetch/background_fetch_test_data_manager.cc @@ -30,7 +30,10 @@ class MockBGFQuotaManagerProxy : public storage::MockQuotaManagerProxy { base::ThreadTaskRunnerHandle::Get().get()) {} // Ignore quota client, it is irrelevant for these tests. - void RegisterClient(scoped_refptr<storage::QuotaClient> client) override {} + void RegisterClient( + scoped_refptr<storage::QuotaClient> client, + storage::QuotaClientType client_type, + const std::vector<blink::mojom::StorageType>& storage_types) override {} void GetUsageAndQuota(base::SequencedTaskRunner* original_task_runner, const url::Origin& origin, diff --git a/chromium/content/browser/background_fetch/storage/database_task.h b/chromium/content/browser/background_fetch/storage/database_task.h index b9aa5616611..fb5e32acaaa 100644 --- a/chromium/content/browser/background_fetch/storage/database_task.h +++ b/chromium/content/browser/background_fetch/storage/database_task.h @@ -9,7 +9,6 @@ #include <set> #include <string> -#include "base/logging.h" #include "base/macros.h" #include "base/memory/scoped_refptr.h" #include "content/browser/background_fetch/background_fetch.pb.h" diff --git a/chromium/content/browser/background_fetch/storage/get_developer_ids_task.cc b/chromium/content/browser/background_fetch/storage/get_developer_ids_task.cc index 20445122ed8..57114a79379 100644 --- a/chromium/content/browser/background_fetch/storage/get_developer_ids_task.cc +++ b/chromium/content/browser/background_fetch/storage/get_developer_ids_task.cc @@ -33,8 +33,8 @@ void GetDeveloperIdsTask::Start() { } void GetDeveloperIdsTask::DidGetUniqueIds( - const base::flat_map<std::string, std::string>& data_map, - blink::ServiceWorkerStatusCode status) { + blink::ServiceWorkerStatusCode status, + const base::flat_map<std::string, std::string>& data_map) { switch (ToDatabaseStatus(status)) { case DatabaseStatus::kNotFound: FinishWithError(blink::mojom::BackgroundFetchError::NONE); diff --git a/chromium/content/browser/background_fetch/storage/get_developer_ids_task.h b/chromium/content/browser/background_fetch/storage/get_developer_ids_task.h index eb5710c4302..abdcda4b819 100644 --- a/chromium/content/browser/background_fetch/storage/get_developer_ids_task.h +++ b/chromium/content/browser/background_fetch/storage/get_developer_ids_task.h @@ -34,8 +34,9 @@ class GetDeveloperIdsTask : public DatabaseTask { void Start() override; private: - void DidGetUniqueIds(const base::flat_map<std::string, std::string>& data_map, - blink::ServiceWorkerStatusCode status); + void DidGetUniqueIds( + blink::ServiceWorkerStatusCode status, + const base::flat_map<std::string, std::string>& data_map); void FinishWithError(blink::mojom::BackgroundFetchError error) override; diff --git a/chromium/content/browser/background_fetch/storage/mark_request_complete_task.cc b/chromium/content/browser/background_fetch/storage/mark_request_complete_task.cc index 87cf3c73e3e..c8dcd197365 100644 --- a/chromium/content/browser/background_fetch/storage/mark_request_complete_task.cc +++ b/chromium/content/browser/background_fetch/storage/mark_request_complete_task.cc @@ -7,7 +7,6 @@ #include "base/barrier_closure.h" #include "base/bind.h" #include "base/guid.h" -#include "base/task/post_task.h" #include "content/browser/background_fetch/background_fetch_cross_origin_filter.h" #include "content/browser/background_fetch/background_fetch_data_manager.h" #include "content/browser/background_fetch/storage/database_helpers.h" @@ -19,6 +18,7 @@ #include "content/common/background_fetch/background_fetch_types.h" #include "content/common/fetch/fetch_api_request_proto.h" #include "content/public/browser/browser_task_traits.h" +#include "content/public/browser/browser_thread.h" #include "services/network/public/cpp/cors/cors.h" #include "storage/browser/blob/blob_impl.h" #include "third_party/blink/public/common/cache_storage/cache_storage_utils.h" @@ -117,9 +117,8 @@ void MarkRequestCompleteTask::StoreResponse(base::OnceClosure done_closure) { request_info_->GetResponseHeaders().end()); if (ServiceWorkerContext::IsServiceWorkerOnUIEnabled()) { - base::PostTaskAndReplyWithResult( - FROM_HERE, {BrowserThread::IO}, - base::BindOnce(&MakeBlob, request_info_), + GetIOThreadTaskRunner({})->PostTaskAndReplyWithResult( + FROM_HERE, base::BindOnce(&MakeBlob, request_info_), base::BindOnce(&MarkRequestCompleteTask::DidMakeBlob, weak_factory_.GetWeakPtr(), std::move(done_closure))); } else { |