BASELINE: Update Chromium to 80.0.3987.136

Change-Id: I98e1649aafae85ba3a83e67af00bb27ef301db7b
Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>

2 files changed, 8 insertions, 3 deletions

diff --git a/chromium/components/upload_list/text_log_upload_list_unittest.cc b/chromium/components/upload_list/text_log_upload_list_unittest.cc
index b92f464e6d2..ba2f8740bbd 100644
--- a/chromium/components/upload_list/text_log_upload_list_unittest.cc
+++ b/chromium/components/upload_list/text_log_upload_list_unittest.cc
@@ -44,9 +44,11 @@ class TextLogUploadListTest : public testing::Test {
   }
 
  private:
-  base::test::TaskEnvironment task_environment_;
   base::ScopedTempDir temp_dir_;
 
+ protected:
+  base::test::TaskEnvironment task_environment_;
+
   DISALLOW_COPY_AND_ASSIGN(TextLogUploadListTest);
 };
 
@@ -376,6 +378,9 @@ TEST_F(TextLogUploadListTest, SimultaneousAccess) {
     time_double = uploads[0].capture_time.ToDoubleT();
     EXPECT_STREQ(kTestCaptureTime, base::NumberToString(time_double).c_str());
   }
+
+  // Allow the remaining loads to complete.
+  task_environment_.RunUntilIdle();
 }
 
 }  // namespace
diff --git a/chromium/components/upload_list/upload_list.cc b/chromium/components/upload_list/upload_list.cc
index 78e67359d35..24729939b3a 100644
--- a/chromium/components/upload_list/upload_list.cc
+++ b/chromium/components/upload_list/upload_list.cc
@@ -65,8 +65,8 @@ void UploadList::Load(base::OnceClosure callback) {
   load_callback_ = std::move(callback);
   base::PostTaskAndReplyWithResult(
       FROM_HERE, kLoadingTaskTraits,
-      base::Bind(&UploadList::LoadUploadList, this),
-      base::Bind(&UploadList::OnLoadComplete, this));
+      base::BindOnce(&UploadList::LoadUploadList, this),
+      base::BindOnce(&UploadList::OnLoadComplete, this));
 }
 
 void UploadList::Clear(const base::Time& begin,