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/adb | |
| 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/adb')
| -rw-r--r-- | chromium/chrome/browser/devtools/device/adb/adb_client_socket_browsertest.cc | 1 | ||||
| -rw-r--r-- | chromium/chrome/browser/devtools/device/adb/mock_adb_server.cc | 12 |
2 files changed, 5 insertions, 8 deletions
diff --git a/chromium/chrome/browser/devtools/device/adb/adb_client_socket_browsertest.cc b/chromium/chrome/browser/devtools/device/adb/adb_client_socket_browsertest.cc index c0bcc02d0c2..b425918e39d 100644 --- a/chromium/chrome/browser/devtools/device/adb/adb_client_socket_browsertest.cc +++ b/chromium/chrome/browser/devtools/device/adb/adb_client_socket_browsertest.cc @@ -3,7 +3,6 @@ // found in the LICENSE file. #include "base/run_loop.h" -#include "base/logging.h" #include "chrome/browser/devtools/device/adb/adb_device_provider.h" #include "chrome/browser/devtools/device/adb/mock_adb_server.h" #include "chrome/browser/devtools/device/devtools_android_bridge.h" diff --git a/chromium/chrome/browser/devtools/device/adb/mock_adb_server.cc b/chromium/chrome/browser/devtools/device/adb/mock_adb_server.cc index 816aebdd877..489f125562d 100644 --- a/chromium/chrome/browser/devtools/device/adb/mock_adb_server.cc +++ b/chromium/chrome/browser/devtools/device/adb/mock_adb_server.cc @@ -18,7 +18,6 @@ #include "base/strings/string_split.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" -#include "base/task/post_task.h" #include "base/threading/thread_task_runner_handle.h" #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h" @@ -651,17 +650,16 @@ void MockAndroidConnection::SendHTTPResponse(const std::string& body) { void StartMockAdbServer(FlushMode flush_mode) { base::RunLoop run_loop; - base::PostTaskAndReply( - FROM_HERE, {BrowserThread::IO}, - base::BindOnce(&StartMockAdbServerOnIOThread, flush_mode), + content::GetIOThreadTaskRunner({})->PostTaskAndReply( + FROM_HERE, base::BindOnce(&StartMockAdbServerOnIOThread, flush_mode), run_loop.QuitClosure()); run_loop.Run(); } void StopMockAdbServer() { base::RunLoop run_loop; - base::PostTaskAndReply(FROM_HERE, {BrowserThread::IO}, - base::BindOnce(&StopMockAdbServerOnIOThread), - run_loop.QuitClosure()); + content::GetIOThreadTaskRunner({})->PostTaskAndReply( + FROM_HERE, base::BindOnce(&StopMockAdbServerOnIOThread), + run_loop.QuitClosure()); run_loop.Run(); } |