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/chrome/browser/devtools/device/usb | |
| 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/chrome/browser/devtools/device/usb')
| -rw-r--r-- | chromium/chrome/browser/devtools/device/usb/android_usb_browsertest.cc | 3 | ||||
| -rw-r--r-- | chromium/chrome/browser/devtools/device/usb/usb_device_manager_helper.cc | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/chromium/chrome/browser/devtools/device/usb/android_usb_browsertest.cc b/chromium/chrome/browser/devtools/device/usb/android_usb_browsertest.cc index 6d38d17048b..f5bede887f1 100644 --- a/chromium/chrome/browser/devtools/device/usb/android_usb_browsertest.cc +++ b/chromium/chrome/browser/devtools/device/usb/android_usb_browsertest.cc @@ -17,7 +17,6 @@ #include "base/run_loop.h" #include "base/single_thread_task_runner.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/threading/thread_task_runner_handle.h" #include "chrome/browser/devtools/device/adb/mock_adb_server.h" #include "chrome/browser/devtools/device/devtools_android_bridge.h" @@ -527,7 +526,7 @@ class AndroidUsbDiscoveryTest : public InProcessBrowserTest { void ScheduleDeviceCountRequest(const base::Closure& request) { DCHECK_CURRENTLY_ON(BrowserThread::UI); scheduler_invoked_++; - base::PostTask(FROM_HERE, {BrowserThread::UI}, request); + content::GetUIThreadTaskRunner({})->PostTask(FROM_HERE, request); } virtual std::unique_ptr<FakeUsbDeviceManager> CreateFakeUsbManager() { diff --git a/chromium/chrome/browser/devtools/device/usb/usb_device_manager_helper.cc b/chromium/chrome/browser/devtools/device/usb/usb_device_manager_helper.cc index fcc10845fc9..a6452ed6bf9 100644 --- a/chromium/chrome/browser/devtools/device/usb/usb_device_manager_helper.cc +++ b/chromium/chrome/browser/devtools/device/usb/usb_device_manager_helper.cc @@ -10,7 +10,6 @@ #include "base/bind.h" #include "base/no_destructor.h" #include "base/strings/utf_string_conversions.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/device_service.h" @@ -193,8 +192,8 @@ void UsbDeviceManagerHelper::EnsureUsbDeviceManagerConnection() { return; } - base::PostTask(FROM_HERE, {content::BrowserThread::UI}, - base::BindOnce(&BindDeviceServiceOnUIThread, + content::GetUIThreadTaskRunner({})->PostTask( + FROM_HERE, base::BindOnce(&BindDeviceServiceOnUIThread, device_manager_.BindNewPipeAndPassReceiver())); device_manager_.set_disconnect_handler( |