diff options
Diffstat (limited to 'chromium/extensions/browser/api/socket')
| -rw-r--r-- | chromium/extensions/browser/api/socket/socket_api.cc | 9 | ||||
| -rw-r--r-- | chromium/extensions/browser/api/socket/socket_api.h | 4 | ||||
| -rw-r--r-- | chromium/extensions/browser/api/socket/tcp_socket.cc | 9 |
3 files changed, 10 insertions, 12 deletions
diff --git a/chromium/extensions/browser/api/socket/socket_api.cc b/chromium/extensions/browser/api/socket/socket_api.cc index 5227ee331cd..6daca9a2902 100644 --- a/chromium/extensions/browser/api/socket/socket_api.cc +++ b/chromium/extensions/browser/api/socket/socket_api.cc @@ -9,7 +9,6 @@ #include <vector> #include "base/bind.h" -#include "base/task/post_task.h" #include "base/values.h" #include "build/build_config.h" #include "content/public/browser/browser_context.h" @@ -127,8 +126,8 @@ void SocketAsyncApiFunction::OpenFirewallHole(const std::string& address, ? AppFirewallHole::PortType::TCP : AppFirewallHole::PortType::UDP; - base::PostTask( - FROM_HERE, {BrowserThread::UI}, + content::GetUIThreadTaskRunner({})->PostTask( + FROM_HERE, base::BindOnce(&SocketAsyncApiFunction::OpenFirewallHoleOnUIThread, this, type, local_address.port(), socket_id)); return; @@ -148,8 +147,8 @@ void SocketAsyncApiFunction::OpenFirewallHoleOnUIThread( AppFirewallHoleManager::Get(browser_context()); std::unique_ptr<AppFirewallHole, BrowserThread::DeleteOnUIThread> hole( manager->Open(type, port, extension_id()).release()); - base::PostTask(FROM_HERE, {BrowserThread::IO}, - base::BindOnce(&SocketAsyncApiFunction::OnFirewallHoleOpened, + content::GetIOThreadTaskRunner({})->PostTask( + FROM_HERE, base::BindOnce(&SocketAsyncApiFunction::OnFirewallHoleOpened, this, socket_id, std::move(hole))); } diff --git a/chromium/extensions/browser/api/socket/socket_api.h b/chromium/extensions/browser/api/socket/socket_api.h index 8b2ac098706..c1c7904d8fd 100644 --- a/chromium/extensions/browser/api/socket/socket_api.h +++ b/chromium/extensions/browser/api/socket/socket_api.h @@ -72,7 +72,7 @@ class SocketResourceManagerInterface { template <typename T> class SocketResourceManager : public SocketResourceManagerInterface { public: - SocketResourceManager() : manager_(NULL) {} + SocketResourceManager() : manager_(nullptr) {} bool SetBrowserContext(content::BrowserContext* context) override { manager_ = ApiResourceManager<T>::Get(context); @@ -81,7 +81,7 @@ class SocketResourceManager : public SocketResourceManagerInterface { "If this assertion is failing during a test, then it is likely that " "TestExtensionSystem is failing to provide an instance of " "ApiResourceManager<Socket>."; - return manager_ != NULL; + return !!manager_; } int Add(Socket* socket) override { diff --git a/chromium/extensions/browser/api/socket/tcp_socket.cc b/chromium/extensions/browser/api/socket/tcp_socket.cc index b01331a2c09..9aafd37de0f 100644 --- a/chromium/extensions/browser/api/socket/tcp_socket.cc +++ b/chromium/extensions/browser/api/socket/tcp_socket.cc @@ -12,7 +12,6 @@ #include "base/logging.h" #include "base/macros.h" #include "base/memory/ptr_util.h" -#include "base/task/post_task.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h" @@ -139,8 +138,8 @@ void TCPSocket::Connect(const net::AddressList& address, base::BindOnce(&TCPSocket::OnConnectCompleteOnUIThread, task_runner_, std::move(completion_callback)); - base::PostTask(FROM_HERE, {content::BrowserThread::UI}, - base::BindOnce(&TCPSocket::ConnectOnUIThread, + content::GetUIThreadTaskRunner({})->PostTask( + FROM_HERE, base::BindOnce(&TCPSocket::ConnectOnUIThread, storage_partition_, browser_context_, address, client_socket_.BindNewPipeAndPassReceiver(), std::move(completion_callback_ui))); @@ -263,8 +262,8 @@ void TCPSocket::Listen(const std::string& address, base::BindOnce(&TCPSocket::OnListenCompleteOnUIThread, task_runner_, std::move(completion_callback)); - base::PostTask( - FROM_HERE, {content::BrowserThread::UI}, + content::GetUIThreadTaskRunner({})->PostTask( + FROM_HERE, base::BindOnce(&TCPSocket::ListenOnUIThread, storage_partition_, browser_context_, ip_end_point, backlog, server_socket_.BindNewPipeAndPassReceiver(), |