BASELINE: Update Chromium to 70.0.3538.78

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

8 files changed, 41 insertions, 19 deletions

diff --git a/chromium/components/feedback/anonymizer_tool.cc b/chromium/components/feedback/anonymizer_tool.cc
index f9f1fd6a7d4..1d5c7933b17 100644
--- a/chromium/components/feedback/anonymizer_tool.cc
+++ b/chromium/components/feedback/anonymizer_tool.cc
@@ -55,6 +55,9 @@ constexpr const char* kCustomPatternsWithContext[] = {
 
     // Serial numbers
     "(?i-s)(serial\\s*(?:number)?\\s*[:=]\\s*)([0-9a-zA-Z\\-\"]+)()",
+
+    // usbguard-daemon
+    "(?-s)(usbguard-daemon.* serial \")(.*)(\" name \")",
 };
 
 // Helper macro: Non capturing group
diff --git a/chromium/components/feedback/anonymizer_tool_unittest.cc b/chromium/components/feedback/anonymizer_tool_unittest.cc
index ef800baf4f9..2333a77af12 100644
--- a/chromium/components/feedback/anonymizer_tool_unittest.cc
+++ b/chromium/components/feedback/anonymizer_tool_unittest.cc
@@ -165,6 +165,25 @@ TEST_F(AnonymizerToolTest, AnonymizeCustomPatterns) {
   // Test that "Android:" is not considered a schema with empty hier part.
   EXPECT_EQ("The following applies to Android:",
             AnonymizeCustomPatterns("The following applies to Android:"));
+
+  EXPECT_EQ(
+      "2000-01-01T01:00:00.123456-00:00 NOTICE usbguard-daemon[5000]: uid=0 "
+      "pid=5000 result='SUCCESS' device.rule='block id 13fe:5500 serial "
+      "\"1\" name \"Patriot Memory\" hash "
+      "\"nrP2FU5Q0KDHJvqT4OFjvpA4Mu/ITEF+fMCMuXsTBs4=\" parent-hash "
+      "\"++ZNvxSmqWP6SLayt9yJSIHqUn0PKkvTNT/TVw0OKDE=\" via-port \"2-5\" "
+      "with-interface 08:06:50' target.old='block' "
+      "device.system_name='/devices/pci0000:00/0000:00:15.0/usb2/2-5' "
+      "target.new='block' type='Policy.Device.Update'",
+      AnonymizeCustomPatterns(
+          "2000-01-01T01:00:00.123456-00:00 NOTICE usbguard-daemon[5000]: "
+          "uid=0 pid=5000 result='SUCCESS' device.rule='block id 13fe:5500 "
+          "serial \"0609911A1Z199991\" name \"Patriot Memory\" hash "
+          "\"nrP2FU5Q0KDHJvqT4OFjvpA4Mu/ITEF+fMCMuXsTBs4=\" parent-hash "
+          "\"++ZNvxSmqWP6SLayt9yJSIHqUn0PKkvTNT/TVw0OKDE=\" via-port \"2-5\" "
+          "with-interface 08:06:50' target.old='block' "
+          "device.system_name='/devices/pci0000:00/0000:00:15.0/usb2/2-5' "
+          "target.new='block' type='Policy.Device.Update'"));
 }
 
 TEST_F(AnonymizerToolTest, AnonymizeCustomPatternWithContext) {
diff --git a/chromium/components/feedback/feedback_data.cc b/chromium/components/feedback/feedback_data.cc
index 54b8c8a82fa..824d35b1456 100644
--- a/chromium/components/feedback/feedback_data.cc
+++ b/chromium/components/feedback/feedback_data.cc
@@ -12,7 +12,7 @@
 #include "base/memory/ref_counted_memory.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
-#include "base/task_scheduler/post_task.h"
+#include "base/task/post_task.h"
 #include "base/values.h"
 #include "components/feedback/feedback_util.h"
 #include "components/feedback/proto/extension.pb.h"
@@ -71,7 +71,7 @@ void FeedbackData::SetAndCompressSystemInfo(
     ++pending_op_count_;
     AddLogs(std::move(sys_info));
     base::PostTaskWithTraitsAndReply(
-        FROM_HERE, {base::MayBlock(), base::TaskPriority::BACKGROUND},
+        FROM_HERE, {base::MayBlock(), base::TaskPriority::BEST_EFFORT},
         base::BindOnce(&FeedbackData::CompressLogs, this),
         base::BindOnce(&FeedbackData::OnCompressComplete, this));
   }
@@ -85,7 +85,7 @@ void FeedbackData::SetAndCompressHistograms(
     return;
   ++pending_op_count_;
   base::PostTaskWithTraitsAndReply(
-      FROM_HERE, {base::MayBlock(), base::TaskPriority::BACKGROUND},
+      FROM_HERE, {base::MayBlock(), base::TaskPriority::BEST_EFFORT},
       base::BindOnce(&FeedbackData::CompressFile, this,
                      base::FilePath(kHistogramsFilename),
                      kHistogramsAttachmentName, std::move(histograms)),
@@ -102,7 +102,7 @@ void FeedbackData::AttachAndCompressFileData(
   base::FilePath attached_file =
                   base::FilePath::FromUTF8Unsafe(attached_filename_);
   base::PostTaskWithTraitsAndReply(
-      FROM_HERE, {base::MayBlock(), base::TaskPriority::BACKGROUND},
+      FROM_HERE, {base::MayBlock(), base::TaskPriority::BEST_EFFORT},
       base::BindOnce(&FeedbackData::CompressFile, this, attached_file,
                      std::string(), std::move(attached_filedata)),
       base::BindOnce(&FeedbackData::OnCompressComplete, this));
diff --git a/chromium/components/feedback/feedback_uploader_dispatch_unittest.cc b/chromium/components/feedback/feedback_uploader_dispatch_unittest.cc
index 41efba55b14..7e5186d72f3 100644
--- a/chromium/components/feedback/feedback_uploader_dispatch_unittest.cc
+++ b/chromium/components/feedback/feedback_uploader_dispatch_unittest.cc
@@ -9,8 +9,8 @@
 #include "base/macros.h"
 #include "base/metrics/field_trial.h"
 #include "base/run_loop.h"
-#include "base/task_scheduler/post_task.h"
-#include "base/task_scheduler/task_traits.h"
+#include "base/task/post_task.h"
+#include "base/task/task_traits.h"
 #include "base/test/bind_test_util.h"
 #include "components/feedback/feedback_uploader_factory.h"
 #include "components/variations/variations_associated_data.h"
diff --git a/chromium/components/feedback/feedback_uploader_factory.cc b/chromium/components/feedback/feedback_uploader_factory.cc
index f446d033ae1..187880744b1 100644
--- a/chromium/components/feedback/feedback_uploader_factory.cc
+++ b/chromium/components/feedback/feedback_uploader_factory.cc
@@ -6,8 +6,8 @@
 
 #include "base/memory/singleton.h"
 #include "base/single_thread_task_runner.h"
-#include "base/task_scheduler/post_task.h"
-#include "base/task_scheduler/task_traits.h"
+#include "base/task/post_task.h"
+#include "base/task/task_traits.h"
 #include "components/feedback/feedback_uploader.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
 #include "content/public/browser/browser_context.h"
@@ -33,7 +33,7 @@ FeedbackUploaderFactory::CreateUploaderTaskRunner() {
   // Uses a BLOCK_SHUTDOWN file task runner because we really don't want to
   // lose reports or corrupt their files.
   return base::CreateSingleThreadTaskRunnerWithTraits(
-      {base::MayBlock(), base::TaskPriority::BACKGROUND,
+      {base::MayBlock(), base::TaskPriority::BEST_EFFORT,
        base::TaskShutdownBehavior::BLOCK_SHUTDOWN});
 }
 
diff --git a/chromium/components/feedback/feedback_uploader_unittest.cc b/chromium/components/feedback/feedback_uploader_unittest.cc
index 356229e28b5..7fa32c2c8db 100644
--- a/chromium/components/feedback/feedback_uploader_unittest.cc
+++ b/chromium/components/feedback/feedback_uploader_unittest.cc
@@ -11,8 +11,8 @@
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "base/stl_util.h"
-#include "base/task_scheduler/post_task.h"
-#include "base/task_scheduler/task_traits.h"
+#include "base/task/post_task.h"
+#include "base/task/task_traits.h"
 #include "base/threading/sequenced_task_runner_handle.h"
 #include "components/feedback/feedback_report.h"
 #include "components/feedback/feedback_uploader_factory.h"
diff --git a/chromium/components/feedback/system_logs/system_logs_fetcher.cc b/chromium/components/feedback/system_logs/system_logs_fetcher.cc
index dbeb4756669..efeba4b4d86 100644
--- a/chromium/components/feedback/system_logs/system_logs_fetcher.cc
+++ b/chromium/components/feedback/system_logs/system_logs_fetcher.cc
@@ -9,8 +9,8 @@
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
-#include "base/task_scheduler/post_task.h"
-#include "base/task_scheduler/task_traits.h"
+#include "base/task/post_task.h"
+#include "base/task/task_traits.h"
 #include "content/public/browser/browser_thread.h"
 
 using content::BrowserThread;
@@ -79,9 +79,9 @@ void SystemLogsFetcher::Fetch(SysLogsFetcherCallback callback) {
   callback_ = std::move(callback);
   for (size_t i = 0; i < data_sources_.size(); ++i) {
     VLOG(1) << "Fetching SystemLogSource: " << data_sources_[i]->source_name();
-    data_sources_[i]->Fetch(base::Bind(&SystemLogsFetcher::OnFetched,
-                                       weak_ptr_factory_.GetWeakPtr(),
-                                       data_sources_[i]->source_name()));
+    data_sources_[i]->Fetch(base::BindOnce(&SystemLogsFetcher::OnFetched,
+                                           weak_ptr_factory_.GetWeakPtr(),
+                                           data_sources_[i]->source_name()));
   }
 }
 
diff --git a/chromium/components/feedback/tracing_manager.cc b/chromium/components/feedback/tracing_manager.cc
index 0342f00d39e..d5c3fc700e5 100644
--- a/chromium/components/feedback/tracing_manager.cc
+++ b/chromium/components/feedback/tracing_manager.cc
@@ -69,7 +69,7 @@ bool TracingManager::GetTraceData(int id, const TraceDataCallback& callback) {
 
     // Always return the data asychronously, so the behavior is consistant.
     base::ThreadTaskRunnerHandle::Get()->PostTask(
-        FROM_HERE, base::Bind(callback, data->second));
+        FROM_HERE, base::BindOnce(callback, data->second));
     return true;
   }
 }
@@ -120,8 +120,8 @@ void TracingManager::OnTraceDataCollected(
   // Tracing has to be restarted asynchronous, so the TracingController can
   // clean up.
   base::ThreadTaskRunnerHandle::Get()->PostTask(
-      FROM_HERE, base::Bind(&TracingManager::StartTracing,
-                            weak_ptr_factory_.GetWeakPtr()));
+      FROM_HERE, base::BindOnce(&TracingManager::StartTracing,
+                                weak_ptr_factory_.GetWeakPtr()));
 }
 
 // static