BASELINE: Update Chromium to 85.0.4183.14085-based

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

7 files changed, 19 insertions, 29 deletions

diff --git a/chromium/chrome/browser/renderer_host/pepper/device_id_fetcher.cc b/chromium/chrome/browser/renderer_host/pepper/device_id_fetcher.cc
index 93799f8adbf..892dbd660ea 100644
--- a/chromium/chrome/browser/renderer_host/pepper/device_id_fetcher.cc
+++ b/chromium/chrome/browser/renderer_host/pepper/device_id_fetcher.cc
@@ -8,7 +8,6 @@
 #include "base/files/file_util.h"
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
-#include "base/task/post_task.h"
 #include "base/task/thread_pool.h"
 #include "build/build_config.h"
 #include "chrome/browser/profiles/profile.h"
@@ -77,8 +76,8 @@ bool DeviceIDFetcher::Start(const IDCallback& callback) {
   in_progress_ = true;
   callback_ = callback;
 
-  base::PostTask(FROM_HERE, {BrowserThread::UI},
-                 base::BindOnce(&DeviceIDFetcher::CheckPrefsOnUIThread, this));
+  content::GetUIThreadTaskRunner({})->PostTask(
+      FROM_HERE, base::BindOnce(&DeviceIDFetcher::CheckPrefsOnUIThread, this));
   return true;
 }
 
@@ -191,8 +190,8 @@ void DeviceIDFetcher::LegacyComputeAsync(const base::FilePath& profile_path,
   }
   // If we didn't find an ID, get the machine ID and call the new code path to
   // generate an ID.
-  base::PostTask(FROM_HERE, {BrowserThread::UI},
-                 base::BindOnce(&GetMachineIDAsync,
+  content::GetUIThreadTaskRunner({})->PostTask(
+      FROM_HERE, base::BindOnce(&GetMachineIDAsync,
                                 base::Bind(&DeviceIDFetcher::ComputeOnUIThread,
                                            this, salt)));
 }
@@ -200,8 +199,8 @@ void DeviceIDFetcher::LegacyComputeAsync(const base::FilePath& profile_path,
 void DeviceIDFetcher::RunCallbackOnIOThread(const std::string& id,
                                             int32_t result) {
   if (!BrowserThread::CurrentlyOn(BrowserThread::IO)) {
-    base::PostTask(FROM_HERE, {BrowserThread::IO},
-                   base::BindOnce(&DeviceIDFetcher::RunCallbackOnIOThread, this,
+    content::GetIOThreadTaskRunner({})->PostTask(
+        FROM_HERE, base::BindOnce(&DeviceIDFetcher::RunCallbackOnIOThread, this,
                                   id, result));
     return;
   }
diff --git a/chromium/chrome/browser/renderer_host/pepper/monitor_finder_mac.mm b/chromium/chrome/browser/renderer_host/pepper/monitor_finder_mac.mm
index 41f0611dbc2..e64fbfcfb06 100644
--- a/chromium/chrome/browser/renderer_host/pepper/monitor_finder_mac.mm
+++ b/chromium/chrome/browser/renderer_host/pepper/monitor_finder_mac.mm
@@ -7,7 +7,6 @@
 #import <Cocoa/Cocoa.h>
 
 #include "base/bind.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/render_frame_host.h"
@@ -30,8 +29,8 @@ int64_t MonitorFinder::GetMonitor() {
     request_sent_ = true;
   }
 
-  base::PostTask(FROM_HERE, {content::BrowserThread::UI},
-                 base::BindOnce(&MonitorFinder::FetchMonitorFromWidget, this));
+  content::GetUIThreadTaskRunner({})->PostTask(
+      FROM_HERE, base::BindOnce(&MonitorFinder::FetchMonitorFromWidget, this));
   return display_id_;
 }
 
diff --git a/chromium/chrome/browser/renderer_host/pepper/pepper_broker_message_filter.cc b/chromium/chrome/browser/renderer_host/pepper/pepper_broker_message_filter.cc
index d72a867594a..82fa5b7026e 100644
--- a/chromium/chrome/browser/renderer_host/pepper/pepper_broker_message_filter.cc
+++ b/chromium/chrome/browser/renderer_host/pepper/pepper_broker_message_filter.cc
@@ -6,7 +6,6 @@
 
 #include <string>
 
-#include "base/task/post_task.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
@@ -37,7 +36,7 @@ PepperBrokerMessageFilter::~PepperBrokerMessageFilter() {}
 scoped_refptr<base::SequencedTaskRunner>
 PepperBrokerMessageFilter::OverrideTaskRunnerForMessage(
     const IPC::Message& message) {
-  return base::CreateSingleThreadTaskRunner({BrowserThread::UI});
+  return content::GetUIThreadTaskRunner({});
 }
 
 int32_t PepperBrokerMessageFilter::OnResourceMessageReceived(
diff --git a/chromium/chrome/browser/renderer_host/pepper/pepper_flash_browser_host.cc b/chromium/chrome/browser/renderer_host/pepper/pepper_flash_browser_host.cc
index c1fdd9dd86e..839b95e6a27 100644
--- a/chromium/chrome/browser/renderer_host/pepper/pepper_flash_browser_host.cc
+++ b/chromium/chrome/browser/renderer_host/pepper/pepper_flash_browser_host.cc
@@ -5,7 +5,6 @@
 #include "chrome/browser/renderer_host/pepper/pepper_flash_browser_host.h"
 
 #include "base/bind.h"
-#include "base/task/post_task.h"
 #include "base/time/time.h"
 #include "build/build_config.h"
 #include "chrome/browser/content_settings/cookie_settings_factory.h"
@@ -132,9 +131,8 @@ int32_t PepperFlashBrowserHost::OnGetLocalDataRestrictions(
                              plugin_url,
                              cookie_settings_);
   } else {
-    base::PostTaskAndReplyWithResult(
-        FROM_HERE, {BrowserThread::UI},
-        base::BindOnce(&GetCookieSettings, render_process_id_),
+    content::GetUIThreadTaskRunner({})->PostTaskAndReplyWithResult(
+        FROM_HERE, base::BindOnce(&GetCookieSettings, render_process_id_),
         base::BindOnce(&PepperFlashBrowserHost::GetLocalDataRestrictions,
                        weak_factory_.GetWeakPtr(),
                        context->MakeReplyMessageContext(), document_url,
@@ -178,8 +176,8 @@ device::mojom::WakeLock* PepperFlashBrowserHost::GetWakeLock() {
     return wake_lock_.get();
 
   mojo::Remote<device::mojom::WakeLockProvider> wake_lock_provider;
-  base::PostTask(
-      FROM_HERE, {BrowserThread::UI},
+  content::GetUIThreadTaskRunner({})->PostTask(
+      FROM_HERE,
       base::BindOnce(&BindWakeLockProviderOnUIThread,
                      wake_lock_provider.BindNewPipeAndPassReceiver()));
   wake_lock_provider->GetWakeLockWithoutContext(
diff --git a/chromium/chrome/browser/renderer_host/pepper/pepper_flash_clipboard_message_filter.cc b/chromium/chrome/browser/renderer_host/pepper/pepper_flash_clipboard_message_filter.cc
index 8147eb02d87..6ae4b9beee8 100644
--- a/chromium/chrome/browser/renderer_host/pepper/pepper_flash_clipboard_message_filter.cc
+++ b/chromium/chrome/browser/renderer_host/pepper/pepper_flash_clipboard_message_filter.cc
@@ -8,7 +8,6 @@
 
 #include "base/pickle.h"
 #include "base/strings/utf_string_conversions.h"
-#include "base/task/post_task.h"
 #include "build/build_config.h"
 #include "content/public/browser/browser_task_traits.h"
 #include "content/public/browser/browser_thread.h"
@@ -23,8 +22,6 @@
 #include "ppapi/proxy/resource_message_params.h"
 #include "ui/base/clipboard/scoped_clipboard_writer.h"
 
-using content::BrowserThread;
-
 namespace {
 
 const size_t kMaxClipboardWriteSize = 1000000;
@@ -106,16 +103,16 @@ PepperFlashClipboardMessageFilter::OverrideTaskRunnerForMessage(
   // restrictions of various platform APIs. In general, the clipboard is not
   // thread-safe, so all clipboard calls should be serviced from the UI thread.
   if (msg.type() == PpapiHostMsg_FlashClipboard_WriteData::ID)
-    return base::CreateSingleThreadTaskRunner({BrowserThread::UI});
+    return content::GetUIThreadTaskRunner({});
 
 // Windows needs clipboard reads to be serviced from the IO thread because
 // these are sync IPCs which can result in deadlocks with plugins if serviced
 // from the UI thread. Note that Windows clipboard calls ARE thread-safe so it
 // is ok for reads and writes to be serviced from different threads.
 #if !defined(OS_WIN)
-  return base::CreateSingleThreadTaskRunner({BrowserThread::UI});
+  return content::GetUIThreadTaskRunner({});
 #else
-  return base::CreateSingleThreadTaskRunner({BrowserThread::IO});
+  return content::GetIOThreadTaskRunner({});
 #endif
 }
 
diff --git a/chromium/chrome/browser/renderer_host/pepper/pepper_flash_drm_host.cc b/chromium/chrome/browser/renderer_host/pepper/pepper_flash_drm_host.cc
index 7c8c292d6d4..7b774366e2e 100644
--- a/chromium/chrome/browser/renderer_host/pepper/pepper_flash_drm_host.cc
+++ b/chromium/chrome/browser/renderer_host/pepper/pepper_flash_drm_host.cc
@@ -13,7 +13,6 @@
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/notreached.h"
-#include "base/task/post_task.h"
 #include "build/build_config.h"
 #include "content/public/browser/browser_ppapi_host.h"
 #include "content/public/browser/browser_task_traits.h"
@@ -62,8 +61,8 @@ class MonitorFinder : public base::RefCountedThreadSafe<MonitorFinder> {
     // do this because we don't know how often our client is going
     // to call and we can't cache the |monitor_| value.
     if (InterlockedCompareExchange(&request_sent_, 1, 0) == 0) {
-      base::PostTask(
-          FROM_HERE, {content::BrowserThread::UI},
+      content::GetUIThreadTaskRunner({})->PostTask(
+          FROM_HERE,
           base::BindOnce(&MonitorFinder::FetchMonitorFromWidget, this));
     }
     return reinterpret_cast<int64_t>(monitor_);
diff --git a/chromium/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.cc b/chromium/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.cc
index c94e1947dc1..0a04a1e0ec5 100644
--- a/chromium/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.cc
+++ b/chromium/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.cc
@@ -7,7 +7,6 @@
 #include <stddef.h>
 
 #include "base/stl_util.h"
-#include "base/task/post_task.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
@@ -81,7 +80,7 @@ PepperIsolatedFileSystemMessageFilter::OverrideTaskRunnerForMessage(
     const IPC::Message& msg) {
   // In order to reach ExtensionSystem, we need to get ProfileManager first.
   // ProfileManager lives in UI thread, so we need to do this in UI thread.
-  return base::CreateSingleThreadTaskRunner({content::BrowserThread::UI});
+  return content::GetUIThreadTaskRunner({});
 }
 
 int32_t PepperIsolatedFileSystemMessageFilter::OnResourceMessageReceived(