diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/extensions/browser/api/display_source | |
parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
download | qtwebengine-chromium-85-based.tar.gz |
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/extensions/browser/api/display_source')
-rw-r--r-- | chromium/extensions/browser/api/display_source/display_source_apitestbase.cc | 17 | ||||
-rw-r--r-- | chromium/extensions/browser/api/display_source/wifi_display/wifi_display_media_service_impl.cc | 5 |
2 files changed, 10 insertions, 12 deletions
diff --git a/chromium/extensions/browser/api/display_source/display_source_apitestbase.cc b/chromium/extensions/browser/api/display_source/display_source_apitestbase.cc index b9a4e9e5b2f..a230c358c3f 100644 --- a/chromium/extensions/browser/api/display_source/display_source_apitestbase.cc +++ b/chromium/extensions/browser/api/display_source/display_source_apitestbase.cc @@ -10,7 +10,6 @@ #include "base/bind.h" #include "base/memory/ptr_util.h" -#include "base/task/post_task.h" #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h" #include "net/base/ip_address.h" @@ -339,8 +338,8 @@ void MockDisplaySourceConnectionDelegate::Connect( // And store udp port to udp_port_ string in order to be used // In a message exchange. Then make a base::PostTask // on UI thread and call OnSinkConnected() to proceed with the test - base::PostTask( - FROM_HERE, {BrowserThread::IO}, + content::GetIOThreadTaskRunner({})->PostTask( + FROM_HERE, base::BindOnce(&MockDisplaySourceConnectionDelegate::BindToUdpSocket, base::Unretained(this))); } @@ -432,8 +431,8 @@ EnqueueSinkMessage(std::string message) { AdaptMessagePattern(found_clientport_key, kClientPortKey, kUdpPortLength, udp_port_, message); - base::PostTask(FROM_HERE, {BrowserThread::UI}, - base::BindOnce(message_received_cb_, message)); + content::GetUIThreadTaskRunner({})->PostTask( + FROM_HERE, base::BindOnce(message_received_cb_, message)); } void MockDisplaySourceConnectionDelegate:: @@ -488,8 +487,8 @@ void MockDisplaySourceConnectionDelegate::BindToUdpSocket() { udp_port_ = std::to_string(port); // When we got an udp socket established and udp port is known // Change sink's status to connected and proceed with the test. - base::PostTask( - FROM_HERE, {BrowserThread::UI}, + content::GetUIThreadTaskRunner({})->PostTask( + FROM_HERE, base::BindOnce(&MockDisplaySourceConnectionDelegate::OnSinkConnected, base::Unretained(this))); break; @@ -526,8 +525,8 @@ void MockDisplaySourceConnectionDelegate::OnMediaPacketReceived( // We received at least one media packet. // Test is completed. socket_->Close(); - base::PostTask( - FROM_HERE, {BrowserThread::UI}, + content::GetUIThreadTaskRunner({})->PostTask( + FROM_HERE, base::BindOnce(&MockDisplaySourceConnectionDelegate::Disconnect, base::Unretained(this), StringCallback())); return; diff --git a/chromium/extensions/browser/api/display_source/wifi_display/wifi_display_media_service_impl.cc b/chromium/extensions/browser/api/display_source/wifi_display/wifi_display_media_service_impl.cc index 49fbd813d15..6da57bb3cb1 100644 --- a/chromium/extensions/browser/api/display_source/wifi_display/wifi_display_media_service_impl.cc +++ b/chromium/extensions/browser/api/display_source/wifi_display/wifi_display_media_service_impl.cc @@ -10,7 +10,6 @@ #include "base/big_endian.h" #include "base/bind.h" #include "base/memory/ptr_util.h" -#include "base/task/post_task.h" #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h" #include "mojo/public/cpp/bindings/strong_binding.h" @@ -56,8 +55,8 @@ void WiFiDisplayMediaServiceImpl::Create( void WiFiDisplayMediaServiceImpl::BindToReceiver( mojo::PendingReceiver<mojom::WiFiDisplayMediaService> receiver, content::RenderFrameHost* render_frame_host) { - base::PostTask( - FROM_HERE, {BrowserThread::IO}, + content::GetIOThreadTaskRunner({})->PostTask( + FROM_HERE, base::BindOnce(WiFiDisplayMediaServiceImpl::Create, std::move(receiver))); } |