BASELINE: Update Chromium to 77.0.3865.59

Change-Id: I1e89a5f3b009a9519a6705102ad65c92fe736f21
Reviewed-by: Michael Brüning <michael.bruning@qt.io>

4 files changed, 14 insertions, 14 deletions

diff --git a/chromium/components/upload_list/text_log_upload_list.cc b/chromium/components/upload_list/text_log_upload_list.cc
index ee3245a9179..e18b8f55560 100644
--- a/chromium/components/upload_list/text_log_upload_list.cc
+++ b/chromium/components/upload_list/text_log_upload_list.cc
@@ -34,11 +34,6 @@ TextLogUploadList::TextLogUploadList(const base::FilePath& upload_log_path)
 
 TextLogUploadList::~TextLogUploadList() = default;
 
-base::TaskTraits TextLogUploadList::LoadingTaskTraits() {
-  return {base::MayBlock(), base::TaskPriority::BEST_EFFORT,
-          base::TaskShutdownBehavior::CONTINUE_ON_SHUTDOWN};
-}
-
 std::vector<UploadList::UploadInfo> TextLogUploadList::LoadUploadList() {
   std::vector<UploadInfo> uploads;
 
diff --git a/chromium/components/upload_list/text_log_upload_list.h b/chromium/components/upload_list/text_log_upload_list.h
index d5ae02ae672..98ac18320a2 100644
--- a/chromium/components/upload_list/text_log_upload_list.h
+++ b/chromium/components/upload_list/text_log_upload_list.h
@@ -30,7 +30,6 @@ class TextLogUploadList : public UploadList {
   ~TextLogUploadList() override;
 
   // UploadList:
-  base::TaskTraits LoadingTaskTraits() override;
   std::vector<UploadList::UploadInfo> LoadUploadList() override;
   void ClearUploadList(const base::Time& begin, const base::Time& end) override;
 
diff --git a/chromium/components/upload_list/upload_list.cc b/chromium/components/upload_list/upload_list.cc
index 75f7f050002..18e49bcfd03 100644
--- a/chromium/components/upload_list/upload_list.cc
+++ b/chromium/components/upload_list/upload_list.cc
@@ -10,6 +10,17 @@
 
 #include "base/bind.h"
 #include "base/task/post_task.h"
+#include "base/task/task_traits.h"
+
+namespace {
+
+// USER_VISIBLE because loading uploads blocks chrome://crashes,
+// chrome://webrtc-logs and the feedback UI. See https://crbug.com/972526.
+constexpr base::TaskTraits kLoadingTaskTraits = {
+    base::MayBlock(), base::TaskPriority::USER_BLOCKING,
+    base::TaskShutdownBehavior::CONTINUE_ON_SHUTDOWN};
+
+}  // namespace
 
 UploadList::UploadInfo::UploadInfo(const std::string& upload_id,
                                    const base::Time& upload_time,
@@ -53,7 +64,7 @@ void UploadList::Load(base::OnceClosure callback) {
   DCHECK(sequence_checker_.CalledOnValidSequence());
   load_callback_ = std::move(callback);
   base::PostTaskWithTraitsAndReplyWithResult(
-      FROM_HERE, LoadingTaskTraits(),
+      FROM_HERE, kLoadingTaskTraits,
       base::Bind(&UploadList::LoadUploadList, this),
       base::Bind(&UploadList::OnLoadComplete, this));
 }
@@ -64,7 +75,7 @@ void UploadList::Clear(const base::Time& begin,
   DCHECK(sequence_checker_.CalledOnValidSequence());
   clear_callback_ = std::move(callback);
   base::PostTaskWithTraitsAndReply(
-      FROM_HERE, LoadingTaskTraits(),
+      FROM_HERE, kLoadingTaskTraits,
       base::BindOnce(&UploadList::ClearUploadList, this, begin, end),
       base::BindOnce(&UploadList::OnClearComplete, this));
 }
@@ -76,7 +87,7 @@ void UploadList::CancelLoadCallback() {
 void UploadList::RequestSingleUploadAsync(const std::string& local_id) {
   DCHECK(sequence_checker_.CalledOnValidSequence());
   base::PostTaskWithTraits(
-      FROM_HERE, LoadingTaskTraits(),
+      FROM_HERE, kLoadingTaskTraits,
       base::BindOnce(&UploadList::RequestSingleUpload, this, local_id));
 }
 
diff --git a/chromium/components/upload_list/upload_list.h b/chromium/components/upload_list/upload_list.h
index e7cff3fda10..7a1a7eae312 100644
--- a/chromium/components/upload_list/upload_list.h
+++ b/chromium/components/upload_list/upload_list.h
@@ -14,7 +14,6 @@
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/sequence_checker.h"
-#include "base/task/task_traits.h"
 #include "base/time/time.h"
 
 // An UploadList is an abstraction over a list of client-side data files that
@@ -91,10 +90,6 @@ class UploadList : public base::RefCountedThreadSafe<UploadList> {
  protected:
   virtual ~UploadList();
 
-  // Returns the TaskTraits that should be used for LoadUploadList() and
-  // RequestSingleUpload().
-  virtual base::TaskTraits LoadingTaskTraits() = 0;
-
   // Reads the upload log and stores the entries in |uploads|.
   virtual std::vector<UploadInfo> LoadUploadList() = 0;