| Index: chrome/browser/supervised_user/experimental/supervised_user_blacklist.cc
|
| diff --git a/chrome/browser/supervised_user/experimental/supervised_user_blacklist.cc b/chrome/browser/supervised_user/experimental/supervised_user_blacklist.cc
|
| index a5163cc796f638a9196c3253c2936a471f4f8d84..b8cf356845c0dd1c3c002be1a7b684877588134b 100644
|
| --- a/chrome/browser/supervised_user/experimental/supervised_user_blacklist.cc
|
| +++ b/chrome/browser/supervised_user/experimental/supervised_user_blacklist.cc
|
| @@ -10,18 +10,13 @@
|
|
|
| #include "base/files/file_path.h"
|
| #include "base/files/memory_mapped_file.h"
|
| -#include "base/threading/sequenced_worker_pool.h"
|
| -#include "content/public/browser/browser_thread.h"
|
| +#include "base/task_scheduler/post_task.h"
|
| #include "url/gurl.h"
|
|
|
| -using content::BrowserThread;
|
| -
|
| namespace {
|
|
|
| std::unique_ptr<std::vector<SupervisedUserBlacklist::Hash>>
|
| ReadFromBinaryFileOnFileThread(const base::FilePath& path) {
|
| - DCHECK(BrowserThread::GetBlockingPool()->RunsTasksOnCurrentThread());
|
| -
|
| std::unique_ptr<std::vector<SupervisedUserBlacklist::Hash>> host_hashes(
|
| new std::vector<SupervisedUserBlacklist::Hash>);
|
|
|
| @@ -75,14 +70,16 @@ size_t SupervisedUserBlacklist::GetEntryCount() const {
|
|
|
| void SupervisedUserBlacklist::ReadFromFile(const base::FilePath& path,
|
| const base::Closure& done_callback) {
|
| - base::PostTaskAndReplyWithResult(
|
| - BrowserThread::GetBlockingPool()->GetTaskRunnerWithShutdownBehavior(
|
| - base::SequencedWorkerPool::CONTINUE_ON_SHUTDOWN).get(),
|
| + base::PostTaskWithTraitsAndReplyWithResult(
|
| FROM_HERE,
|
| - base::Bind(&ReadFromBinaryFileOnFileThread, path),
|
| - base::Bind(&SupervisedUserBlacklist::OnReadFromFileCompleted,
|
| - weak_ptr_factory_.GetWeakPtr(),
|
| - done_callback));
|
| + base::TaskTraits()
|
| + .MayBlock()
|
| + .WithPriority(base::TaskPriority::BACKGROUND)
|
| + .WithShutdownBehavior(
|
| + base::TaskShutdownBehavior::CONTINUE_ON_SHUTDOWN),
|
| + base::BindOnce(&ReadFromBinaryFileOnFileThread, path),
|
| + base::BindOnce(&SupervisedUserBlacklist::OnReadFromFileCompleted,
|
| + weak_ptr_factory_.GetWeakPtr(), done_callback));
|
| }
|
|
|
| void SupervisedUserBlacklist::OnReadFromFileCompleted(
|
|
|