diff options
Diffstat (limited to 'chromium/content/browser/file_system')
5 files changed, 15 insertions, 19 deletions
diff --git a/chromium/content/browser/file_system/browser_file_system_helper.cc b/chromium/content/browser/file_system/browser_file_system_helper.cc index a07a58a62ce..8c59cc95db6 100644 --- a/chromium/content/browser/file_system/browser_file_system_helper.cc +++ b/chromium/content/browser/file_system/browser_file_system_helper.cc @@ -17,6 +17,7 @@ #include "base/strings/utf_string_conversions.h" #include "base/task/lazy_thread_pool_task_runner.h" #include "base/task/post_task.h" +#include "base/task/thread_pool.h" #include "content/browser/child_process_security_policy_impl.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/browser_task_traits.h" @@ -106,8 +107,8 @@ void GetPlatformPathOnFileThread( base::FilePath platform_path; context->operation_runner()->SyncGetPlatformPath(url, &platform_path); - base::PostTaskAndReply( - FROM_HERE, {BrowserThread::UI}, + GetUIThreadTaskRunner({})->PostTaskAndReply( + FROM_HERE, base::BindOnce(&GrantReadAccessOnUIThread, process_id, platform_path), base::BindOnce(std::move(callback), platform_path)); } @@ -134,8 +135,7 @@ scoped_refptr<storage::FileSystemContext> CreateFileSystemContext( browser_context->CanUseDiskWhenOffTheRecord() ? false : is_incognito); scoped_refptr<storage::FileSystemContext> file_system_context = new storage::FileSystemContext( - base::CreateSingleThreadTaskRunner({BrowserThread::IO}).get(), - g_fileapi_task_runner.Get().get(), + GetIOThreadTaskRunner({}).get(), g_fileapi_task_runner.Get().get(), BrowserContext::GetMountPoints(browser_context), browser_context->GetSpecialStoragePolicy(), quota_manager_proxy, std::move(additional_backends), url_request_auto_mount_handlers, @@ -168,16 +168,16 @@ void SyncGetPlatformPath(storage::FileSystemContext* context, if (!FileSystemURLIsValid(context, url)) { // Note: Posting a task here so this function always returns // before the callback is called no matter which path is taken. - base::PostTask(FROM_HERE, - base::BindOnce(std::move(callback), base::FilePath())); + base::ThreadPool::PostTask( + FROM_HERE, base::BindOnce(std::move(callback), base::FilePath())); return; } // Make sure if this file is ok to be read (in the current architecture // which means roughly same as the renderer is allowed to get the platform // path to the file). - base::PostTaskAndReplyWithResult( - FROM_HERE, {BrowserThread::UI}, + GetUIThreadTaskRunner({})->PostTaskAndReplyWithResult( + FROM_HERE, base::BindOnce(&CheckCanReadFileSystemFileOnUIThread, process_id, url), base::BindOnce(&GetPlatformPathOnFileThread, scoped_refptr<storage::FileSystemContext>(context), diff --git a/chromium/content/browser/file_system/file_system_browsertest.cc b/chromium/content/browser/file_system/file_system_browsertest.cc index 5a7136db57a..f9c12c7f847 100644 --- a/chromium/content/browser/file_system/file_system_browsertest.cc +++ b/chromium/content/browser/file_system/file_system_browsertest.cc @@ -10,7 +10,6 @@ #include "base/location.h" #include "base/memory/ref_counted.h" #include "base/single_thread_task_runner.h" -#include "base/task/post_task.h" #include "base/test/scoped_feature_list.h" #include "base/test/thread_test_helper.h" #include "content/browser/web_contents/web_contents_impl.h" @@ -84,8 +83,8 @@ class FileSystemBrowserTestWithLowQuota : public FileSystemBrowserTest { static void SetLowQuota(scoped_refptr<QuotaManager> qm) { if (!BrowserThread::CurrentlyOn(BrowserThread::IO)) { - base::PostTask( - FROM_HERE, {BrowserThread::IO}, + GetIOThreadTaskRunner({})->PostTask( + FROM_HERE, base::BindOnce(&FileSystemBrowserTestWithLowQuota::SetLowQuota, qm)); return; } diff --git a/chromium/content/browser/file_system/file_system_manager_impl.cc b/chromium/content/browser/file_system/file_system_manager_impl.cc index 5ae73b58c2d..15c028904b5 100644 --- a/chromium/content/browser/file_system/file_system_manager_impl.cc +++ b/chromium/content/browser/file_system/file_system_manager_impl.cc @@ -16,7 +16,6 @@ #include "base/notreached.h" #include "base/sequenced_task_runner.h" #include "base/strings/string_util.h" -#include "base/task/post_task.h" #include "base/threading/thread.h" #include "base/time/time.h" #include "build/build_config.h" @@ -851,8 +850,8 @@ void FileSystemManagerImpl::GetPlatformPathOnFileThread( [](base::WeakPtr<FileSystemManagerImpl> file_system_manager, GetPlatformPathCallback callback, const base::FilePath& platform_path) { - base::PostTask( - FROM_HERE, {BrowserThread::IO}, + GetIOThreadTaskRunner({})->PostTask( + FROM_HERE, base::BindOnce(&FileSystemManagerImpl::DidGetPlatformPath, std::move(file_system_manager), std::move(callback), platform_path)); diff --git a/chromium/content/browser/file_system/file_system_url_loader_factory.cc b/chromium/content/browser/file_system/file_system_url_loader_factory.cc index 88cd845d06a..8ed60351570 100644 --- a/chromium/content/browser/file_system/file_system_url_loader_factory.cc +++ b/chromium/content/browser/file_system/file_system_url_loader_factory.cc @@ -17,7 +17,6 @@ #include "base/memory/weak_ptr.h" #include "base/sequenced_task_runner.h" #include "base/strings/stringprintf.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "build/build_config.h" #include "components/services/filesystem/public/mojom/types.mojom.h" @@ -660,8 +659,7 @@ CreateFileSystemURLLoaderFactory( FactoryParams params = {render_process_host_id, frame_tree_node_id, file_system_context, storage_domain}; return std::make_unique<FileSystemURLLoaderFactory>( - std::move(params), - base::CreateSingleThreadTaskRunner({BrowserThread::IO})); + std::move(params), GetIOThreadTaskRunner({})); } } // namespace content diff --git a/chromium/content/browser/file_system/file_system_url_loader_factory_browsertest.cc b/chromium/content/browser/file_system/file_system_url_loader_factory_browsertest.cc index 774252be05e..7da8896b2c0 100644 --- a/chromium/content/browser/file_system/file_system_url_loader_factory_browsertest.cc +++ b/chromium/content/browser/file_system/file_system_url_loader_factory_browsertest.cc @@ -14,13 +14,13 @@ #include "base/files/scoped_temp_dir.h" #include "base/i18n/unicodestring.h" #include "base/rand_util.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/test/bind_test_util.h" #include "build/build_config.h" #include "content/browser/file_system/file_system_url_loader_factory.h" #include "content/browser/web_contents/web_contents_impl.h" #include "content/public/browser/browser_task_traits.h" +#include "content/public/browser/browser_thread.h" #include "content/public/test/browser_test.h" #include "content/public/test/browser_test_utils.h" #include "content/public/test/content_browser_test.h" @@ -170,7 +170,7 @@ class FileSystemURLLoaderFactoryTest bool IsIncognito() { return GetParam() == TestMode::kIncognito; } void SetUpOnMainThread() override { - io_task_runner_ = base::CreateSingleThreadTaskRunner({BrowserThread::IO}); + io_task_runner_ = GetIOThreadTaskRunner({}); blocking_task_runner_ = base::ThreadPool::CreateSequencedTaskRunner({base::MayBlock()}); |