diff options
Diffstat (limited to 'chromium/chrome/browser/devtools/device')
9 files changed, 19 insertions, 34 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(); } diff --git a/chromium/chrome/browser/devtools/device/android_device_manager.cc b/chromium/chrome/browser/devtools/device/android_device_manager.cc index 02a50e12c56..e3716a6f5da 100644 --- a/chromium/chrome/browser/devtools/device/android_device_manager.cc +++ b/chromium/chrome/browser/devtools/device/android_device_manager.cc @@ -17,7 +17,6 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/thread.h" #include "base/threading/thread_task_runner_handle.h" @@ -382,8 +381,8 @@ class DevicesRequest : public base::RefCountedThreadSafe<DevicesRequest> { void OnCountDevices(const base::Callback<void(int)>& callback, int device_count) { - base::PostTask(FROM_HERE, {BrowserThread::UI}, - base::BindOnce(callback, device_count)); + content::GetUIThreadTaskRunner({})->PostTask( + FROM_HERE, base::BindOnce(callback, device_count)); } } // namespace diff --git a/chromium/chrome/browser/devtools/device/cast_device_provider.cc b/chromium/chrome/browser/devtools/device/cast_device_provider.cc index 8cae795aa7e..553d95dab45 100644 --- a/chromium/chrome/browser/devtools/device/cast_device_provider.cc +++ b/chromium/chrome/browser/devtools/device/cast_device_provider.cc @@ -14,7 +14,6 @@ #include "base/single_thread_task_runner.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" -#include "base/task/post_task.h" #include "base/threading/thread_task_runner_handle.h" #include "chrome/browser/local_discovery/service_discovery_shared_client.h" #include "content/public/browser/browser_task_traits.h" @@ -156,8 +155,8 @@ void CastDeviceProvider::QueryDevices(const SerialsCallback& callback) { if (!lister_delegate_) { lister_delegate_.reset(new DeviceListerDelegate( weak_factory_.GetWeakPtr(), base::ThreadTaskRunnerHandle::Get())); - base::PostTask(FROM_HERE, {content::BrowserThread::UI}, - base::BindOnce(&DeviceListerDelegate::StartDiscovery, + content::GetUIThreadTaskRunner({})->PostTask( + FROM_HERE, base::BindOnce(&DeviceListerDelegate::StartDiscovery, lister_delegate_->AsWeakPtr())); } std::set<net::HostPortPair> targets; diff --git a/chromium/chrome/browser/devtools/device/devtools_device_discovery.cc b/chromium/chrome/browser/devtools/device/devtools_device_discovery.cc index 952af2c6614..bd3cefdedef 100644 --- a/chromium/chrome/browser/devtools/device/devtools_device_discovery.cc +++ b/chromium/chrome/browser/devtools/device/devtools_device_discovery.cc @@ -16,7 +16,6 @@ #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/values.h" #include "chrome/browser/devtools/devtools_window.h" #include "content/public/browser/browser_task_traits.h" @@ -46,8 +45,8 @@ const char kPageReloadCommand[] = "{'method': 'Page.reload', id: 1}"; const char kWebViewSocketPrefix[] = "webview_devtools_remote"; static void ScheduleTaskDefault(const base::Closure& task) { - base::PostDelayedTask(FROM_HERE, {BrowserThread::UI}, task, - base::TimeDelta::FromMilliseconds(kPollingIntervalMs)); + content::GetUIThreadTaskRunner({})->PostDelayedTask( + FROM_HERE, task, base::TimeDelta::FromMilliseconds(kPollingIntervalMs)); } // ProtocolCommand ------------------------------------------------------------ diff --git a/chromium/chrome/browser/devtools/device/port_forwarding_controller.cc b/chromium/chrome/browser/devtools/device/port_forwarding_controller.cc index 65421861737..3b54c9d9c5c 100644 --- a/chromium/chrome/browser/devtools/device/port_forwarding_controller.cc +++ b/chromium/chrome/browser/devtools/device/port_forwarding_controller.cc @@ -17,7 +17,6 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" -#include "base/task/post_task.h" #include "base/threading/thread_checker.h" #include "base/threading/thread_task_runner_handle.h" #include "chrome/browser/profiles/profile.h" @@ -236,8 +235,8 @@ class SocketTunnel { adb_thread_runner_(base::ThreadTaskRunnerHandle::Get()) { ResolveHostCallback resolve_host_callback = base::BindOnce( &SocketTunnel::OnResolveHostComplete, base::Unretained(this)); - base::PostTask(FROM_HERE, {content::BrowserThread::UI}, - base::BindOnce(&ResolveHost, profile, host, port, + content::GetUIThreadTaskRunner({})->PostTask( + FROM_HERE, base::BindOnce(&ResolveHost, profile, host, port, std::move(resolve_host_callback))); } @@ -495,9 +494,6 @@ void PortForwardingController::Connection::SendCommand( pending_responses_[id] = base::Bind(&Connection::ProcessBindResponse, base::Unretained(this), port); -#if BUILDFLAG(DEBUG_DEVTOOLS) - port_status_[port] = kStatusConnecting; -#endif // BUILDFLAG(DEBUG_DEVTOOLS) } else { auto it = port_status_.find(port); if (it != port_status_.end() && it->second == kStatusError) { @@ -509,9 +505,6 @@ void PortForwardingController::Connection::SendCommand( pending_responses_[id] = base::Bind(&Connection::ProcessUnbindResponse, base::Unretained(this), port); -#if BUILDFLAG(DEBUG_DEVTOOLS) - port_status_[port] = kStatusDisconnecting; -#endif // BUILDFLAG(DEBUG_DEVTOOLS) } web_socket_->SendFrame(SerializeCommand(id, method, std::move(params))); diff --git a/chromium/chrome/browser/devtools/device/tcp_device_provider.cc b/chromium/chrome/browser/devtools/device/tcp_device_provider.cc index 52c3216c503..d1634123e61 100644 --- a/chromium/chrome/browser/devtools/device/tcp_device_provider.cc +++ b/chromium/chrome/browser/devtools/device/tcp_device_provider.cc @@ -12,12 +12,12 @@ #include "base/single_thread_task_runner.h" #include "base/stl_util.h" #include "base/strings/string_number_conversions.h" -#include "base/task/post_task.h" #include "base/threading/thread_task_runner_handle.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/devtools/device/adb/adb_client_socket.h" #include "chrome/browser/net/system_network_context_manager.h" #include "content/public/browser/browser_task_traits.h" +#include "content/public/browser/browser_thread.h" #include "mojo/public/cpp/bindings/receiver.h" #include "net/base/completion_repeating_callback.h" #include "net/base/net_errors.h" @@ -47,8 +47,8 @@ class ResolveHostAndOpenSocket final : public network::ResolveHostClientBase { const AdbClientSocket::SocketCallback& callback) : callback_(callback) { mojo::Remote<network::mojom::HostResolver> resolver; - base::PostTask(FROM_HERE, {content::BrowserThread::UI}, - base::BindOnce( + content::GetUIThreadTaskRunner({})->PostTask( + FROM_HERE, base::BindOnce( [](mojo::PendingReceiver<network::mojom::HostResolver> pending_receiver) { g_browser_process->system_network_context_manager() 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( |