diff options
Diffstat (limited to 'chromium/content/browser/blob_storage')
4 files changed, 21 insertions, 23 deletions
diff --git a/chromium/content/browser/blob_storage/blob_registry_wrapper.cc b/chromium/content/browser/blob_storage/blob_registry_wrapper.cc index 314b05d0e65..784f00c5cba 100644 --- a/chromium/content/browser/blob_storage/blob_registry_wrapper.cc +++ b/chromium/content/browser/blob_storage/blob_registry_wrapper.cc @@ -5,7 +5,6 @@ #include "content/browser/blob_storage/blob_registry_wrapper.h" #include "base/bind.h" -#include "base/task/post_task.h" #include "content/browser/blob_storage/chrome_blob_storage_context.h" #include "content/browser/child_process_security_policy_impl.h" #include "content/public/browser/browser_task_traits.h" @@ -45,8 +44,8 @@ scoped_refptr<BlobRegistryWrapper> BlobRegistryWrapper::Create( scoped_refptr<ChromeBlobStorageContext> blob_storage_context, scoped_refptr<storage::FileSystemContext> file_system_context) { scoped_refptr<BlobRegistryWrapper> result(new BlobRegistryWrapper()); - base::PostTask(FROM_HERE, {BrowserThread::IO}, - base::BindOnce(&BlobRegistryWrapper::InitializeOnIOThread, + GetIOThreadTaskRunner({})->PostTask( + FROM_HERE, base::BindOnce(&BlobRegistryWrapper::InitializeOnIOThread, result, std::move(blob_storage_context), std::move(file_system_context))); return result; diff --git a/chromium/content/browser/blob_storage/blob_storage_browsertest.cc b/chromium/content/browser/blob_storage/blob_storage_browsertest.cc index c81215a7c12..9b60db7a47b 100644 --- a/chromium/content/browser/blob_storage/blob_storage_browsertest.cc +++ b/chromium/content/browser/blob_storage/blob_storage_browsertest.cc @@ -6,7 +6,6 @@ #include "base/bind.h" #include "base/run_loop.h" -#include "base/task/post_task.h" #include "base/test/bind_test_util.h" #include "content/browser/blob_storage/chrome_blob_storage_context.h" #include "content/public/browser/browser_context.h" @@ -63,8 +62,8 @@ class BlobStorageBrowserTest : public ContentBrowserTest { } void SetBlobLimits() { - base::PostTask(FROM_HERE, {BrowserThread::IO}, - base::BindOnce(&SetBlobLimitsOnIO, GetBlobContext(), + GetIOThreadTaskRunner({})->PostTask( + FROM_HERE, base::BindOnce(&SetBlobLimitsOnIO, GetBlobContext(), std::cref(limits_))); } @@ -101,8 +100,8 @@ IN_PROC_BROWSER_TEST_F(BlobStorageBrowserTest, BlobCombinations) { auto blob_context = GetBlobContext(); base::RunLoop loop; - base::PostTask( - FROM_HERE, {BrowserThread::IO}, base::BindLambdaForTesting([&]() { + GetIOThreadTaskRunner({})->PostTask( + FROM_HERE, base::BindLambdaForTesting([&]() { const storage::BlobMemoryController& memory_controller = blob_context->context()->memory_controller(); // Our exact usages depend on IPC message ordering & garbage collection. diff --git a/chromium/content/browser/blob_storage/blob_storage_context_wrapper.h b/chromium/content/browser/blob_storage/blob_storage_context_wrapper.h index 996ae584f4c..33e2117f27d 100644 --- a/chromium/content/browser/blob_storage/blob_storage_context_wrapper.h +++ b/chromium/content/browser/blob_storage/blob_storage_context_wrapper.h @@ -8,11 +8,11 @@ #include <string> #include "base/macros.h" +#include "components/services/storage/public/mojom/blob_storage_context.mojom.h" #include "content/common/content_export.h" #include "content/public/browser/browser_thread.h" #include "mojo/public/cpp/bindings/pending_remote.h" #include "mojo/public/cpp/bindings/remote.h" -#include "storage/browser/blob/mojom/blob_storage_context.mojom.h" namespace content { diff --git a/chromium/content/browser/blob_storage/chrome_blob_storage_context.cc b/chromium/content/browser/blob_storage/chrome_blob_storage_context.cc index f90e9fce067..12d84e3d4a0 100644 --- a/chromium/content/browser/blob_storage/chrome_blob_storage_context.cc +++ b/chromium/content/browser/blob_storage/chrome_blob_storage_context.cc @@ -16,7 +16,6 @@ #include "base/metrics/histogram_macros.h" #include "base/single_thread_task_runner.h" #include "base/supports_user_data.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/task_runner.h" #include "content/public/browser/blob_handle.h" @@ -129,8 +128,8 @@ ChromeBlobStorageContext* ChromeBlobStorageContext::GetFor( } if (io_thread_valid) { - base::PostTask( - FROM_HERE, {BrowserThread::IO}, + GetIOThreadTaskRunner({})->PostTask( + FROM_HERE, base::BindOnce(&ChromeBlobStorageContext::InitializeOnIOThread, blob_storage_context, context->GetPath(), std::move(blob_storage_dir), @@ -148,8 +147,8 @@ ChromeBlobStorageContext::GetRemoteFor(BrowserContext* browser_context) { DCHECK(browser_context); mojo::PendingRemote<storage::mojom::BlobStorageContext> remote; auto receiver = remote.InitWithNewPipeAndPassReceiver(); - base::PostTask( - FROM_HERE, {BrowserThread::IO}, + GetIOThreadTaskRunner({})->PostTask( + FROM_HERE, base::BindOnce( [](scoped_refptr<ChromeBlobStorageContext> blob_storage_context, mojo::PendingReceiver<storage::mojom::BlobStorageContext> @@ -170,9 +169,10 @@ void ChromeBlobStorageContext::InitializeOnIOThread( std::move(file_task_runner))); // Signal the BlobMemoryController when it's appropriate to calculate its // storage limits. - base::PostTask( - FROM_HERE, {content::BrowserThread::IO, base::TaskPriority::BEST_EFFORT}, - base::BindOnce(&storage::BlobMemoryController::CalculateBlobStorageLimits, + content::GetIOThreadTaskRunner({base::TaskPriority::BEST_EFFORT}) + ->PostTask(FROM_HERE, + base::BindOnce( + &storage::BlobMemoryController::CalculateBlobStorageLimits, context_->mutable_memory_controller()->GetWeakPtr())); } @@ -216,8 +216,8 @@ ChromeBlobStorageContext::URLLoaderFactoryForToken( DCHECK_CURRENTLY_ON(BrowserThread::UI); mojo::PendingRemote<network::mojom::URLLoaderFactory> blob_url_loader_factory_remote; - base::PostTask( - FROM_HERE, {BrowserThread::IO}, + GetIOThreadTaskRunner({})->PostTask( + FROM_HERE, base::BindOnce( [](scoped_refptr<ChromeBlobStorageContext> context, mojo::PendingReceiver<network::mojom::URLLoaderFactory> receiver, @@ -241,8 +241,8 @@ ChromeBlobStorageContext::URLLoaderFactoryForUrl( DCHECK_CURRENTLY_ON(BrowserThread::UI); mojo::PendingRemote<network::mojom::URLLoaderFactory> blob_url_loader_factory_remote; - base::PostTask( - FROM_HERE, {BrowserThread::IO}, + GetIOThreadTaskRunner({})->PostTask( + FROM_HERE, base::BindOnce( [](scoped_refptr<ChromeBlobStorageContext> context, mojo::PendingReceiver<network::mojom::URLLoaderFactory> receiver, @@ -265,8 +265,8 @@ mojo::PendingRemote<blink::mojom::Blob> ChromeBlobStorageContext::GetBlobRemote( const std::string& uuid) { DCHECK_CURRENTLY_ON(BrowserThread::UI); mojo::PendingRemote<blink::mojom::Blob> blob_remote; - base::PostTask( - FROM_HERE, {BrowserThread::IO}, + GetIOThreadTaskRunner({})->PostTask( + FROM_HERE, base::BindOnce( [](scoped_refptr<ChromeBlobStorageContext> context, mojo::PendingReceiver<blink::mojom::Blob> receiver, |