From 021e3834188ae7150db8f6247a5e3c2f1eb5fa1a Mon Sep 17 00:00:00 2001 From: Samuel Attard Date: Mon, 18 Dec 2017 12:35:51 +1100 Subject: [PATCH] GetBlockingPool has been removed --- atom/browser/atom_browser_context.cc | 7 ++++--- atom/browser/net/url_request_async_asar_job.cc | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/atom/browser/atom_browser_context.cc b/atom/browser/atom_browser_context.cc index bd69d8bc78..e3fdcd7ddc 100644 --- a/atom/browser/atom_browser_context.cc +++ b/atom/browser/atom_browser_context.cc @@ -27,8 +27,8 @@ #include "base/path_service.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" +#include "base/task_scheduler/post_task.h" #include "base/threading/sequenced_worker_pool.h" -#include "base/threading/worker_pool.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/pref_names.h" #include "components/prefs/pref_registry_simple.h" @@ -136,8 +136,9 @@ AtomBrowserContext::CreateURLRequestJobFactory( url::kDataScheme, base::WrapUnique(new net::DataProtocolHandler)); job_factory->SetProtocolHandler( url::kFileScheme, base::WrapUnique(new asar::AsarProtocolHandler( - BrowserThread::GetBlockingPool()->GetTaskRunnerWithShutdownBehavior( - base::SequencedWorkerPool::SKIP_ON_SHUTDOWN)))); + base::CreateSequencedTaskRunnerWithTraits( + {base::MayBlock(), + base::TaskShutdownBehavior::SKIP_ON_SHUTDOWN})))); job_factory->SetProtocolHandler( url::kHttpScheme, base::WrapUnique(new HttpProtocolHandler(url::kHttpScheme))); diff --git a/atom/browser/net/url_request_async_asar_job.cc b/atom/browser/net/url_request_async_asar_job.cc index 86aa7c5506..b9c6b96571 100644 --- a/atom/browser/net/url_request_async_asar_job.cc +++ b/atom/browser/net/url_request_async_asar_job.cc @@ -7,6 +7,7 @@ #include #include "atom/common/atom_constants.h" +#include "base/task_scheduler/post_task.h" #include "base/threading/sequenced_worker_pool.h" namespace atom { @@ -31,9 +32,8 @@ void URLRequestAsyncAsarJob::StartAsync(std::unique_ptr options) { net::URLRequestStatus::FAILED, net::ERR_NOT_IMPLEMENTED)); } else { asar::URLRequestAsarJob::Initialize( - content::BrowserThread::GetBlockingPool()-> - GetTaskRunnerWithShutdownBehavior( - base::SequencedWorkerPool::SKIP_ON_SHUTDOWN), + base::CreateSequencedTaskRunnerWithTraits( + {base::MayBlock(), base::TaskShutdownBehavior::SKIP_ON_SHUTDOWN}), base::FilePath(file_path)); asar::URLRequestAsarJob::Start(); }