BASELINE: Update Chromium to 85.0.4183.14085-based

Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

2 files changed, 7 insertions, 7 deletions

diff --git a/chromium/extensions/browser/api/sockets_tcp/sockets_tcp_api.cc b/chromium/extensions/browser/api/sockets_tcp/sockets_tcp_api.cc
index 73597138d33..1cd59b1f01f 100644
--- a/chromium/extensions/browser/api/sockets_tcp/sockets_tcp_api.cc
+++ b/chromium/extensions/browser/api/sockets_tcp/sockets_tcp_api.cc
@@ -163,7 +163,7 @@ void SocketsTcpUpdateFunction::Work() {
 }
 
 SocketsTcpSetPausedFunction::SocketsTcpSetPausedFunction()
-    : socket_event_dispatcher_(NULL) {}
+    : socket_event_dispatcher_(nullptr) {}
 
 SocketsTcpSetPausedFunction::~SocketsTcpSetPausedFunction() {}
 
@@ -177,7 +177,7 @@ bool SocketsTcpSetPausedFunction::Prepare() {
          "If this assertion is failing during a test, then it is likely that "
          "TestExtensionSystem is failing to provide an instance of "
          "TCPSocketEventDispatcher.";
-  return socket_event_dispatcher_ != NULL;
+  return !!socket_event_dispatcher_;
 }
 
 void SocketsTcpSetPausedFunction::Work() {
@@ -264,7 +264,7 @@ void SocketsTcpSetNoDelayFunction::OnCompleted(bool success) {
 }
 
 SocketsTcpConnectFunction::SocketsTcpConnectFunction()
-    : socket_event_dispatcher_(NULL) {}
+    : socket_event_dispatcher_(nullptr) {}
 
 SocketsTcpConnectFunction::~SocketsTcpConnectFunction() {}
 
@@ -278,7 +278,7 @@ bool SocketsTcpConnectFunction::Prepare() {
          "If this assertion is failing during a test, then it is likely that "
          "TestExtensionSystem is failing to provide an instance of "
          "TCPSocketEventDispatcher.";
-  return socket_event_dispatcher_ != NULL;
+  return !!socket_event_dispatcher_;
 }
 
 void SocketsTcpConnectFunction::AsyncWorkStart() {
@@ -457,7 +457,7 @@ bool SocketsTcpGetSocketsFunction::Prepare() { return true; }
 void SocketsTcpGetSocketsFunction::Work() {
   std::vector<sockets_tcp::SocketInfo> socket_infos;
   std::unordered_set<int>* resource_ids = GetSocketIds();
-  if (resource_ids != NULL) {
+  if (resource_ids) {
     for (int socket_id : *resource_ids) {
       ResumableTCPSocket* socket = GetTcpSocket(socket_id);
       if (socket) {
diff --git a/chromium/extensions/browser/api/sockets_tcp/tcp_socket_event_dispatcher.cc b/chromium/extensions/browser/api/sockets_tcp/tcp_socket_event_dispatcher.cc
index 69f7e9c1be8..8bab3a92a30 100644
--- a/chromium/extensions/browser/api/sockets_tcp/tcp_socket_event_dispatcher.cc
+++ b/chromium/extensions/browser/api/sockets_tcp/tcp_socket_event_dispatcher.cc
@@ -183,8 +183,8 @@ void TCPSocketEventDispatcher::PostEvent(const ReadParams& params,
                                          std::unique_ptr<Event> event) {
   DCHECK_CURRENTLY_ON(params.thread_id);
 
-  base::PostTask(FROM_HERE, {BrowserThread::UI},
-                 base::BindOnce(&DispatchEvent, params.browser_context_id,
+  content::GetUIThreadTaskRunner({})->PostTask(
+      FROM_HERE, base::BindOnce(&DispatchEvent, params.browser_context_id,
                                 params.extension_id, std::move(event)));
 }