diff options
Diffstat (limited to 'chromium/content/browser/renderer_host/pepper')
13 files changed, 61 insertions, 73 deletions
diff --git a/chromium/content/browser/renderer_host/pepper/pepper_file_io_host.cc b/chromium/content/browser/renderer_host/pepper/pepper_file_io_host.cc index bd68358ddb4..28fba2fc56d 100644 --- a/chromium/content/browser/renderer_host/pepper/pepper_file_io_host.cc +++ b/chromium/content/browser/renderer_host/pepper/pepper_file_io_host.cc @@ -205,8 +205,8 @@ int32_t PepperFileIOHost::OnHostMsgOpen( if (!CanOpenFileSystemURLWithPepperFlags( open_flags, render_process_id_, file_system_url_)) return PP_ERROR_NOACCESS; - base::PostTaskAndReplyWithResult( - FROM_HERE, {BrowserThread::UI}, + GetUIThreadTaskRunner({})->PostTaskAndReplyWithResult( + FROM_HERE, base::BindOnce(&GetUIThreadStuffForInternalFileSystems, render_process_id_), base::BindOnce( @@ -217,8 +217,8 @@ int32_t PepperFileIOHost::OnHostMsgOpen( base::FilePath path = file_ref_host->GetExternalFilePath(); if (!CanOpenWithPepperFlags(open_flags, render_process_id_, path)) return PP_ERROR_NOACCESS; - base::PostTaskAndReplyWithResult( - FROM_HERE, {BrowserThread::UI}, + GetUIThreadTaskRunner({})->PostTaskAndReplyWithResult( + FROM_HERE, base::BindOnce(&GetResolvedRenderProcessId, render_process_id_), base::BindOnce(&PepperFileIOHost::GotResolvedRenderProcessId, AsWeakPtr(), context->MakeReplyMessageContext(), path, @@ -395,8 +395,8 @@ int32_t PepperFileIOHost::OnHostMsgRequestOSFileHandle( GURL document_url = browser_ppapi_host_->GetDocumentURLForInstance(pp_instance()); - base::PostTaskAndReplyWithResult( - FROM_HERE, {BrowserThread::UI}, + GetUIThreadTaskRunner({})->PostTaskAndReplyWithResult( + FROM_HERE, base::BindOnce(&GetPluginAllowedToCallRequestOSFileHandle, render_process_id_, document_url), base::BindOnce( diff --git a/chromium/content/browser/renderer_host/pepper/pepper_file_system_browser_host.cc b/chromium/content/browser/renderer_host/pepper/pepper_file_system_browser_host.cc index 79c7375ff33..5bc0d12b6c7 100644 --- a/chromium/content/browser/renderer_host/pepper/pepper_file_system_browser_host.cc +++ b/chromium/content/browser/renderer_host/pepper/pepper_file_system_browser_host.cc @@ -105,8 +105,8 @@ void PepperFileSystemBrowserHost::OpenExisting(const GURL& root_url, called_open_ = true; // Get the file system context asynchronously, and then complete the Open // operation by calling |callback|. - base::PostTaskAndReplyWithResult( - FROM_HERE, {BrowserThread::UI}, + GetUIThreadTaskRunner({})->PostTaskAndReplyWithResult( + FROM_HERE, base::BindOnce(&GetFileSystemContextFromRenderId, render_process_id), base::BindOnce(&PepperFileSystemBrowserHost::OpenExistingFileSystem, weak_factory_.GetWeakPtr(), std::move(callback))); @@ -187,8 +187,8 @@ int32_t PepperFileSystemBrowserHost::OnHostMsgOpen( return PP_ERROR_FAILED; } - base::PostTaskAndReplyWithResult( - FROM_HERE, {BrowserThread::UI}, + GetUIThreadTaskRunner({})->PostTaskAndReplyWithResult( + FROM_HERE, base::BindOnce(&GetFileSystemContextFromRenderId, render_process_id), base::BindOnce(&PepperFileSystemBrowserHost::OpenFileSystem, weak_factory_.GetWeakPtr(), @@ -353,8 +353,8 @@ int32_t PepperFileSystemBrowserHost::OnHostMsgInitIsolatedFileSystem( fsid, ppapi::IsolatedFileSystemTypeToRootName(type))); - base::PostTaskAndReplyWithResult( - FROM_HERE, {BrowserThread::UI}, + GetUIThreadTaskRunner({})->PostTaskAndReplyWithResult( + FROM_HERE, base::BindOnce(&GetFileSystemContextFromRenderId, render_process_id), base::BindOnce(&PepperFileSystemBrowserHost::OpenIsolatedFileSystem, weak_factory_.GetWeakPtr(), diff --git a/chromium/content/browser/renderer_host/pepper/pepper_host_resolver_message_filter.cc b/chromium/content/browser/renderer_host/pepper/pepper_host_resolver_message_filter.cc index 4504ed06d41..ed36e45f6bb 100644 --- a/chromium/content/browser/renderer_host/pepper/pepper_host_resolver_message_filter.cc +++ b/chromium/content/browser/renderer_host/pepper/pepper_host_resolver_message_filter.cc @@ -12,7 +12,6 @@ #include "base/bind.h" #include "base/check_op.h" #include "base/notreached.h" -#include "base/task/post_task.h" #include "content/browser/renderer_host/pepper/browser_ppapi_host_impl.h" #include "content/browser/renderer_host/pepper/pepper_socket_utils.h" #include "content/public/browser/browser_context.h" @@ -105,7 +104,7 @@ scoped_refptr<base::SequencedTaskRunner> PepperHostResolverMessageFilter::OverrideTaskRunnerForMessage( const IPC::Message& message) { if (message.type() == PpapiHostMsg_HostResolver_Resolve::ID) - return base::CreateSingleThreadTaskRunner({BrowserThread::UI}); + return GetUIThreadTaskRunner({}); return nullptr; } @@ -173,8 +172,8 @@ void PepperHostResolverMessageFilter::OnComplete( DCHECK_CURRENTLY_ON(BrowserThread::UI); receiver_.reset(); - base::PostTask( - FROM_HERE, {BrowserThread::IO}, + GetIOThreadTaskRunner({})->PostTask( + FROM_HERE, base::BindOnce(&PepperHostResolverMessageFilter::OnLookupFinished, this, resolve_error_info.error, std::move(resolved_addresses), host_resolve_context_)); diff --git a/chromium/content/browser/renderer_host/pepper/pepper_network_monitor_host.cc b/chromium/content/browser/renderer_host/pepper/pepper_network_monitor_host.cc index 9b444bb0b4c..bd55cb259d1 100644 --- a/chromium/content/browser/renderer_host/pepper/pepper_network_monitor_host.cc +++ b/chromium/content/browser/renderer_host/pepper/pepper_network_monitor_host.cc @@ -9,7 +9,6 @@ #include "base/bind.h" #include "base/bind_helpers.h" -#include "base/task/post_task.h" #include "base/task_runner_util.h" #include "content/browser/renderer_host/pepper/browser_ppapi_host_impl.h" #include "content/browser/renderer_host/pepper/pepper_socket_utils.h" @@ -43,8 +42,8 @@ void OnGetNetworkList( base::OnceCallback<void(const net::NetworkInterfaceList&)> callback, const base::Optional<net::NetworkInterfaceList>& networks) { DCHECK_CURRENTLY_ON(BrowserThread::UI); - base::PostTask( - FROM_HERE, {BrowserThread::IO}, + GetIOThreadTaskRunner({})->PostTask( + FROM_HERE, base::BindOnce(std::move(callback), networks.has_value() ? *networks : net::NetworkInterfaceList())); @@ -70,8 +69,8 @@ PepperNetworkMonitorHost::PepperNetworkMonitorHost(BrowserPpapiHostImpl* host, host->GetRenderFrameIDsForInstance( instance, &render_process_id, &render_frame_id); - base::PostTaskAndReplyWithResult( - FROM_HERE, {BrowserThread::UI}, + GetUIThreadTaskRunner({})->PostTaskAndReplyWithResult( + FROM_HERE, base::BindOnce(&CanUseNetworkMonitor, host->external_plugin(), render_process_id, render_frame_id), base::BindOnce(&PepperNetworkMonitorHost::OnPermissionCheckResult, @@ -100,9 +99,8 @@ void PepperNetworkMonitorHost::OnPermissionCheckResult( return; } - base::PostTaskAndReplyWithResult( - FROM_HERE, {BrowserThread::UI}, - base::BindOnce(&content::GetNetworkConnectionTracker), + GetUIThreadTaskRunner({})->PostTaskAndReplyWithResult( + FROM_HERE, base::BindOnce(&content::GetNetworkConnectionTracker), base::BindOnce(&PepperNetworkMonitorHost::SetNetworkConnectionTracker, weak_factory_.GetWeakPtr())); GetAndSendNetworkList(); @@ -117,8 +115,8 @@ void PepperNetworkMonitorHost::SetNetworkConnectionTracker( void PepperNetworkMonitorHost::GetAndSendNetworkList() { DCHECK_CURRENTLY_ON(BrowserThread::IO); - base::PostTask( - FROM_HERE, {BrowserThread::UI}, + GetUIThreadTaskRunner({})->PostTask( + FROM_HERE, base::BindOnce(&GetNetworkList, base::BindOnce(&PepperNetworkMonitorHost::SendNetworkList, weak_factory_.GetWeakPtr()))); diff --git a/chromium/content/browser/renderer_host/pepper/pepper_network_proxy_host.cc b/chromium/content/browser/renderer_host/pepper/pepper_network_proxy_host.cc index 37ec5a3af97..b3a236cae2e 100644 --- a/chromium/content/browser/renderer_host/pepper/pepper_network_proxy_host.cc +++ b/chromium/content/browser/renderer_host/pepper/pepper_network_proxy_host.cc @@ -5,7 +5,6 @@ #include "content/browser/renderer_host/pepper/pepper_network_proxy_host.h" #include "base/bind.h" -#include "base/task/post_task.h" #include "content/browser/renderer_host/pepper/browser_ppapi_host_impl.h" #include "content/browser/renderer_host/pepper/pepper_proxy_lookup_helper.h" #include "content/browser/renderer_host/pepper/pepper_socket_utils.h" @@ -46,9 +45,9 @@ bool LookUpProxyForURLCallback( StoragePartition* storage_partition = BrowserContext::GetStoragePartition( site_instance->GetBrowserContext(), site_instance); - // TODO(https://crbug.com/1021661): Pass in a non-empty NetworkIsolationKey. storage_partition->GetNetworkContext()->LookUpProxyForURL( - url, net::NetworkIsolationKey::Todo(), std::move(proxy_lookup_client)); + url, render_frame_host->GetNetworkIsolationKey(), + std::move(proxy_lookup_client)); return true; } @@ -64,8 +63,8 @@ PepperNetworkProxyHost::PepperNetworkProxyHost(BrowserPpapiHostImpl* host, waiting_for_ui_thread_data_(true) { host->GetRenderFrameIDsForInstance(instance, &render_process_id_, &render_frame_id_); - base::PostTaskAndReplyWithResult( - FROM_HERE, {BrowserThread::UI}, + GetUIThreadTaskRunner({})->PostTaskAndReplyWithResult( + FROM_HERE, base::BindOnce(&GetUIThreadDataOnUIThread, render_process_id_, render_frame_id_, host->external_plugin()), base::BindOnce(&PepperNetworkProxyHost::DidGetUIThreadData, diff --git a/chromium/content/browser/renderer_host/pepper/pepper_print_settings_manager.cc b/chromium/content/browser/renderer_host/pepper/pepper_print_settings_manager.cc index 6a7e4f5eff7..46539874af9 100644 --- a/chromium/content/browser/renderer_host/pepper/pepper_print_settings_manager.cc +++ b/chromium/content/browser/renderer_host/pepper/pepper_print_settings_manager.cc @@ -4,7 +4,6 @@ #include "content/browser/renderer_host/pepper/pepper_print_settings_manager.h" -#include "base/task/post_task.h" #include "build/build_config.h" #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h" @@ -126,9 +125,9 @@ PepperPrintSettingsManagerImpl::ComputeDefaultPrintSettings() { void PepperPrintSettingsManagerImpl::GetDefaultPrintSettings( PepperPrintSettingsManager::Callback callback) { - base::PostTaskAndReplyWithResult(FROM_HERE, {BrowserThread::UI}, - base::BindOnce(ComputeDefaultPrintSettings), - std::move(callback)); + GetUIThreadTaskRunner({})->PostTaskAndReplyWithResult( + FROM_HERE, base::BindOnce(ComputeDefaultPrintSettings), + std::move(callback)); } } // namespace content diff --git a/chromium/content/browser/renderer_host/pepper/pepper_proxy_lookup_helper.cc b/chromium/content/browser/renderer_host/pepper/pepper_proxy_lookup_helper.cc index e00862f55d7..afc11223ef5 100644 --- a/chromium/content/browser/renderer_host/pepper/pepper_proxy_lookup_helper.cc +++ b/chromium/content/browser/renderer_host/pepper/pepper_proxy_lookup_helper.cc @@ -9,7 +9,6 @@ #include "base/location.h" #include "base/memory/ref_counted.h" #include "base/sequenced_task_runner.h" -#include "base/task/post_task.h" #include "base/threading/sequenced_task_runner_handle.h" #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h" @@ -30,8 +29,8 @@ class PepperProxyLookupHelper::UIThreadHelper LookUpCompleteCallback look_up_complete_callback) : look_up_complete_callback_(std::move(look_up_complete_callback)), callback_task_runner_(base::SequencedTaskRunnerHandle::Get()) { - base::PostTask( - FROM_HERE, {BrowserThread::UI}, + GetUIThreadTaskRunner({})->PostTask( + FROM_HERE, base::BindOnce(&UIThreadHelper::StartLookup, base::Unretained(this), url, std::move(look_up_proxy_for_url_callback))); } @@ -78,8 +77,8 @@ PepperProxyLookupHelper::PepperProxyLookupHelper() {} PepperProxyLookupHelper::~PepperProxyLookupHelper() { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); - base::DeleteSoon(FROM_HERE, {BrowserThread::UI}, - std::move(ui_thread_helper_)); + GetUIThreadTaskRunner({})->DeleteSoon(FROM_HERE, + std::move(ui_thread_helper_)); } void PepperProxyLookupHelper::Start( diff --git a/chromium/content/browser/renderer_host/pepper/pepper_proxy_lookup_helper_unittest.cc b/chromium/content/browser/renderer_host/pepper/pepper_proxy_lookup_helper_unittest.cc index df616d801d7..d16d8d32676 100644 --- a/chromium/content/browser/renderer_host/pepper/pepper_proxy_lookup_helper_unittest.cc +++ b/chromium/content/browser/renderer_host/pepper/pepper_proxy_lookup_helper_unittest.cc @@ -14,7 +14,6 @@ #include "base/memory/weak_ptr.h" #include "base/optional.h" #include "base/run_loop.h" -#include "base/task/post_task.h" #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h" #include "content/public/test/browser_task_environment.h" @@ -41,8 +40,8 @@ class PepperProxyLookupHelperTest : public testing::Test { DCHECK_CURRENTLY_ON(BrowserThread::UI); base::RunLoop run_loop; - base::PostTask( - FROM_HERE, {BrowserThread::IO}, + GetIOThreadTaskRunner({})->PostTask( + FROM_HERE, base::BindOnce(&PepperProxyLookupHelperTest::StartLookupOnIOThread, base::Unretained(this), run_loop.QuitClosure())); run_loop.Run(); @@ -64,8 +63,8 @@ class PepperProxyLookupHelperTest : public testing::Test { DCHECK_CURRENTLY_ON(BrowserThread::UI); base::RunLoop run_loop; - base::PostTaskAndReply( - FROM_HERE, {BrowserThread::IO}, + GetIOThreadTaskRunner({})->PostTaskAndReply( + FROM_HERE, base::BindOnce( &PepperProxyLookupHelperTest::DestroyLookupHelperOnIOThread, base::Unretained(this)), diff --git a/chromium/content/browser/renderer_host/pepper/pepper_tcp_server_socket_message_filter.cc b/chromium/content/browser/renderer_host/pepper/pepper_tcp_server_socket_message_filter.cc index 87a4150faa0..4197106c166 100644 --- a/chromium/content/browser/renderer_host/pepper/pepper_tcp_server_socket_message_filter.cc +++ b/chromium/content/browser/renderer_host/pepper/pepper_tcp_server_socket_message_filter.cc @@ -10,7 +10,6 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/logging.h" -#include "base/task/post_task.h" #include "build/build_config.h" #include "content/browser/renderer_host/pepper/browser_ppapi_host_impl.h" #include "content/browser/renderer_host/pepper/content_browser_pepper_host_factory.h" @@ -99,8 +98,8 @@ void PepperTCPServerSocketMessageFilter::OnFilterDestroyed() { // also ensures that future messages will be ignored, so the mojo pipes won't // be re-created, so after Close() runs, |this| can be safely deleted on the // IO thread. - base::PostTask( - FROM_HERE, {BrowserThread::UI}, + GetUIThreadTaskRunner({})->PostTask( + FROM_HERE, base::BindOnce(&PepperTCPServerSocketMessageFilter::Close, this)); } @@ -111,7 +110,7 @@ PepperTCPServerSocketMessageFilter::OverrideTaskRunnerForMessage( case PpapiHostMsg_TCPServerSocket_Listen::ID: case PpapiHostMsg_TCPServerSocket_Accept::ID: case PpapiHostMsg_TCPServerSocket_StopListening::ID: - return base::CreateSingleThreadTaskRunner({BrowserThread::UI}); + return GetUIThreadTaskRunner({}); } return nullptr; } @@ -328,8 +327,8 @@ void PepperTCPServerSocketMessageFilter::OnAcceptCompleted( return; } - base::PostTask( - FROM_HERE, {BrowserThread::IO}, + GetIOThreadTaskRunner({})->PostTask( + FROM_HERE, base::BindOnce( &PepperTCPServerSocketMessageFilter::OnAcceptCompletedOnIOThread, this, context, std::move(connected_socket), diff --git a/chromium/content/browser/renderer_host/pepper/pepper_tcp_socket_message_filter.cc b/chromium/content/browser/renderer_host/pepper/pepper_tcp_socket_message_filter.cc index f2835886fa9..1d1104ed5e4 100644 --- a/chromium/content/browser/renderer_host/pepper/pepper_tcp_socket_message_filter.cc +++ b/chromium/content/browser/renderer_host/pepper/pepper_tcp_socket_message_filter.cc @@ -12,7 +12,6 @@ #include "base/logging.h" #include "base/memory/ptr_util.h" #include "base/metrics/histogram_macros.h" -#include "base/task/post_task.h" #include "build/build_config.h" #include "content/browser/renderer_host/pepper/content_browser_pepper_host_factory.h" #include "content/browser/renderer_host/pepper/pepper_socket_utils.h" @@ -114,8 +113,8 @@ void PepperTCPSocketMessageFilter::SetConnectedSocket( // thread to prevent the object from being deleted before this method returns. DCHECK(HasOneRef()); - base::PostTask( - FROM_HERE, {BrowserThread::UI}, + GetUIThreadTaskRunner({})->PostTask( + FROM_HERE, base::BindOnce( &PepperTCPSocketMessageFilter::SetConnectedSocketOnUIThread, this, std::move(connected_socket), std::move(socket_observer_receiver), @@ -129,7 +128,7 @@ PepperTCPSocketMessageFilter::~PepperTCPSocketMessageFilter() { #if defined(OS_CHROMEOS) // Close the firewall hole on UI thread if there is one. if (firewall_hole_) { - base::DeleteSoon(FROM_HERE, {BrowserThread::UI}, std::move(firewall_hole_)); + GetUIThreadTaskRunner({})->DeleteSoon(FROM_HERE, std::move(firewall_hole_)); } #endif // defined(OS_CHROMEOS) --g_num_tcp_filter_instances; @@ -171,8 +170,8 @@ void PepperTCPSocketMessageFilter::OnFilterDestroyed() { // also ensures that future messages will be ignored, so the mojo pipes won't // be re-created, so after Close() runs, |this| can be safely deleted on the // IO thread. - base::PostTask(FROM_HERE, {BrowserThread::UI}, - base::BindOnce(&PepperTCPSocketMessageFilter::Close, this)); + GetUIThreadTaskRunner({})->PostTask( + FROM_HERE, base::BindOnce(&PepperTCPSocketMessageFilter::Close, this)); } scoped_refptr<base::SequencedTaskRunner> @@ -189,7 +188,7 @@ PepperTCPSocketMessageFilter::OverrideTaskRunnerForMessage( case PpapiHostMsg_TCPSocket_Accept::ID: case PpapiHostMsg_TCPSocket_Close::ID: case PpapiHostMsg_TCPSocket_SetOption::ID: - return base::CreateSingleThreadTaskRunner({BrowserThread::UI}); + return GetUIThreadTaskRunner({}); } return nullptr; } @@ -221,8 +220,8 @@ int32_t PepperTCPSocketMessageFilter::OnResourceMessageReceived( } void PepperTCPSocketMessageFilter::OnThrottleStateChanged(bool is_throttled) { - base::PostTask( - FROM_HERE, {BrowserThread::UI}, + GetUIThreadTaskRunner({})->PostTask( + FROM_HERE, base::BindOnce( &PepperTCPSocketMessageFilter::ThrottleStateChangedOnUIThread, this, is_throttled)); @@ -1123,8 +1122,8 @@ void PepperTCPSocketMessageFilter::OnAcceptCompleted( // already. DCHECK(success); - base::PostTask( - FROM_HERE, {BrowserThread::IO}, + GetIOThreadTaskRunner({})->PostTask( + FROM_HERE, base::BindOnce(&PepperTCPSocketMessageFilter::OnAcceptCompletedOnIOThread, this, context, std::move(connected_socket), std::move(socket_observer_receiver), diff --git a/chromium/content/browser/renderer_host/pepper/pepper_udp_socket_message_filter.cc b/chromium/content/browser/renderer_host/pepper/pepper_udp_socket_message_filter.cc index 7cc8709182a..5c2711aabd2 100644 --- a/chromium/content/browser/renderer_host/pepper/pepper_udp_socket_message_filter.cc +++ b/chromium/content/browser/renderer_host/pepper/pepper_udp_socket_message_filter.cc @@ -12,7 +12,6 @@ #include "base/compiler_specific.h" #include "base/logging.h" #include "base/metrics/histogram_macros.h" -#include "base/task/post_task.h" #include "build/build_config.h" #include "content/browser/renderer_host/pepper/browser_ppapi_host_impl.h" #include "content/browser/renderer_host/pepper/pepper_socket_utils.h" @@ -128,8 +127,8 @@ void PepperUDPSocketMessageFilter::OnFilterDestroyed() { // that future messages will be ignored, so the mojo pipes won't be // re-created, so after Close() runs, |this| can be safely deleted on the IO // thread. - base::PostTask(FROM_HERE, {BrowserThread::UI}, - base::BindOnce(&PepperUDPSocketMessageFilter::Close, this)); + GetUIThreadTaskRunner({})->PostTask( + FROM_HERE, base::BindOnce(&PepperUDPSocketMessageFilter::Close, this)); } scoped_refptr<base::SequencedTaskRunner> @@ -143,7 +142,7 @@ PepperUDPSocketMessageFilter::OverrideTaskRunnerForMessage( case PpapiHostMsg_UDPSocket_SendTo::ID: case PpapiHostMsg_UDPSocket_JoinGroup::ID: case PpapiHostMsg_UDPSocket_LeaveGroup::ID: - return base::CreateSingleThreadTaskRunner({BrowserThread::UI}); + return GetUIThreadTaskRunner({}); } return nullptr; } @@ -714,8 +713,8 @@ void PepperUDPSocketMessageFilter::SendRecvFromResult( const PP_NetAddress_Private& addr) { // Unlike SendReply, which is safe to call on any thread, SendUnsolicitedReply // calls are only safe to make on the IO thread. - base::PostTask( - FROM_HERE, {BrowserThread::IO}, + GetIOThreadTaskRunner({})->PostTask( + FROM_HERE, base::BindOnce( &PepperUDPSocketMessageFilter::SendRecvFromResultOnIOThread, this, result, data, addr)); diff --git a/chromium/content/browser/renderer_host/pepper/pepper_vpn_provider_message_filter_chromeos.cc b/chromium/content/browser/renderer_host/pepper/pepper_vpn_provider_message_filter_chromeos.cc index c97315580bb..f2134959abb 100644 --- a/chromium/content/browser/renderer_host/pepper/pepper_vpn_provider_message_filter_chromeos.cc +++ b/chromium/content/browser/renderer_host/pepper/pepper_vpn_provider_message_filter_chromeos.cc @@ -5,7 +5,6 @@ #include "content/browser/renderer_host/pepper/pepper_vpn_provider_message_filter_chromeos.h" #include "base/bind.h" -#include "base/task/post_task.h" #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/content_browser_client.h" @@ -96,7 +95,7 @@ PepperVpnProviderMessageFilter::OverrideTaskRunnerForMessage( case PpapiHostMsg_VpnProvider_Bind::ID: case PpapiHostMsg_VpnProvider_SendPacket::ID: case PpapiHostMsg_VpnProvider_OnPacketReceivedReply::ID: - return base::CreateSingleThreadTaskRunner({BrowserThread::UI}); + return GetUIThreadTaskRunner({}); } return nullptr; } diff --git a/chromium/content/browser/renderer_host/pepper/quota_reservation.cc b/chromium/content/browser/renderer_host/pepper/quota_reservation.cc index 545df15897b..9441b0c6757 100644 --- a/chromium/content/browser/renderer_host/pepper/quota_reservation.cc +++ b/chromium/content/browser/renderer_host/pepper/quota_reservation.cc @@ -8,7 +8,6 @@ #include "base/bind.h" #include "base/callback.h" -#include "base/task/post_task.h" #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h" #include "storage/browser/file_system/file_system_operation_runner.h" @@ -122,8 +121,8 @@ void QuotaReservation::GotReservedQuota(ReserveQuotaCallback callback, file_sizes[it->first] = it->second->GetMaxWrittenOffset(); if (file_system_context_) { - base::PostTask( - FROM_HERE, {BrowserThread::IO}, + GetIOThreadTaskRunner({})->PostTask( + FROM_HERE, base::BindOnce(std::move(callback), quota_reservation_->remaining_quota(), file_sizes)); } else { |