BASELINE: Update Chromium to 85.0.4183.14085-based

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

4 files changed, 24 insertions, 24 deletions

diff --git a/chromium/components/feedback/anonymizer_tool.cc b/chromium/components/feedback/anonymizer_tool.cc
index 4f535ccf9fb..e4b8b7f7cb1 100644
--- a/chromium/components/feedback/anonymizer_tool.cc
+++ b/chromium/components/feedback/anonymizer_tool.cc
@@ -127,7 +127,7 @@ std::string MaybeScrubIPAddress(const std::string& addr) {
     net::IPAddress ip_addr;
     int prefix_length;
     bool scrub;
-  } static const kWhitelistedIPRanges[] = {
+  } static const kNonIdentifyingIPRanges[] = {
       // Private.
       {net::IPAddress(10, 0, 0, 0), 8, true},
       {net::IPAddress(172, 16, 0, 0), 12, true},
@@ -172,7 +172,7 @@ std::string MaybeScrubIPAddress(const std::string& addr) {
   if (input_addr.AssignFromIPLiteral(addr) && input_addr.IsValid()) {
     bool mapped = MaybeUnmapAddress(&input_addr);
     bool translated = !mapped ? MaybeUntranslateAddress(&input_addr) : false;
-    for (const auto& range : kWhitelistedIPRanges) {
+    for (const auto& range : kNonIdentifyingIPRanges) {
       if (IPAddressMatchesPrefix(input_addr, range.ip_addr,
                                  range.prefix_length)) {
         std::string prefix;
@@ -631,15 +631,15 @@ std::string AnonymizerTool::AnonymizeCustomPatternWithContext(
   return result;
 }
 
-// This takes a |url| argument and returns true if the URL is whitelisted and
-// does NOT need to be redacted, returns false otherwise.
-bool IsUrlWhitelisted(re2::StringPiece url,
-                      const char* const* first_party_extension_ids) {
-  // We do not whitelist anything with a query parameter.
+// This takes a |url| argument and returns true if the URL is exempt from
+// redaction, returns false otherwise.
+bool IsUrlExempt(re2::StringPiece url,
+                 const char* const* first_party_extension_ids) {
+  // We do not exempt anything with a query parameter.
   if (url.contains("?"))
     return false;
 
-  // Check for whitelisting of chrome:// URLs.
+  // Check for chrome:// URLs that are exempt.
   if (url.starts_with("chrome://")) {
     // We allow everything in chrome://resources/.
     if (url.starts_with("chrome://resources/"))
@@ -652,11 +652,10 @@ bool IsUrlWhitelisted(re2::StringPiece url,
     return false;
   }
 
-  // If the whitelist is null, then don't check it.
   if (!first_party_extension_ids)
     return false;
 
-  // Whitelist URLs of the format chrome-extension://<first-party-id>/*.js
+  // Exempt URLs of the format chrome-extension://<first-party-id>/*.js
   if (!url.starts_with("chrome-extension://"))
     return false;
 
@@ -693,7 +692,7 @@ std::string AnonymizerTool::AnonymizeCustomPatternWithoutContext(
   re2::StringPiece skipped;
   re2::StringPiece matched_id;
   while (FindAndConsumeAndGetSkipped(&text, *re, &skipped, &matched_id)) {
-    if (IsUrlWhitelisted(matched_id, first_party_extension_ids_)) {
+    if (IsUrlExempt(matched_id, first_party_extension_ids_)) {
       skipped.AppendToString(&result);
       matched_id.AppendToString(&result);
       continue;
diff --git a/chromium/components/feedback/anonymizer_tool_unittest.cc b/chromium/components/feedback/anonymizer_tool_unittest.cc
index 91c9f4a8c6d..88e13e56fbe 100644
--- a/chromium/components/feedback/anonymizer_tool_unittest.cc
+++ b/chromium/components/feedback/anonymizer_tool_unittest.cc
@@ -430,11 +430,11 @@ TEST_F(AnonymizerToolTest, AnonymizeChunk) {
      "<IPv6: 18>"},
     {"aa:aa:aa:aa:aa:aa",  // MAC address (BSSID).
      "[MAC OUI=aa:aa:aa IFACE=1]"},
-    {"chrome://resources/foo",  // Secure chrome resource, whitelisted.
+    {"chrome://resources/foo",  // Secure chrome resource, exempt.
      "chrome://resources/foo"},
-    {"chrome://settings/crisper.js",  // Whitelisted settings URLs.
+    {"chrome://settings/crisper.js",  // Exempt settings URLs.
      "chrome://settings/crisper.js"},
-    // Whitelisted first party extension.
+    // Exempt first party extension.
     {"chrome-extension://nkoccljplnhpfnfiajclkommnmllphnl/foobar.js",
      "chrome-extension://nkoccljplnhpfnfiajclkommnmllphnl/foobar.js"},
     {"chrome://resources/f?user=bar",  // Potentially PII in parameter.
diff --git a/chromium/components/feedback/feedback_report.cc b/chromium/components/feedback/feedback_report.cc
index 9cddff32518..9c49839f28e 100644
--- a/chromium/components/feedback/feedback_report.cc
+++ b/chromium/components/feedback/feedback_report.cc
@@ -97,8 +97,7 @@ void FeedbackReport::LoadReportsAndQueue(const base::FilePath& user_dir,
 
 void FeedbackReport::DeleteReportOnDisk() {
   reports_task_runner_->PostTask(
-      FROM_HERE,
-      base::BindOnce(base::IgnoreResult(&base::DeleteFile), file_, false));
+      FROM_HERE, base::BindOnce(base::GetDeleteFileCallback(), file_));
 }
 
 FeedbackReport::~FeedbackReport() {}
diff --git a/chromium/components/feedback/system_logs/system_logs_fetcher.cc b/chromium/components/feedback/system_logs/system_logs_fetcher.cc
index 794a19f59d0..79d30eb8b5d 100644
--- a/chromium/components/feedback/system_logs/system_logs_fetcher.cc
+++ b/chromium/components/feedback/system_logs/system_logs_fetcher.cc
@@ -22,15 +22,17 @@ namespace {
 
 // List of keys in the SystemLogsResponse map whose corresponding values will
 // not be anonymized.
-constexpr const char* const kWhitelistedKeysOfUUIDs[] = {
-    "CHROMEOS_BOARD_APPID", "CHROMEOS_CANARY_APPID", "CHROMEOS_RELEASE_APPID",
+constexpr const char* const kExemptKeysOfUUIDs[] = {
+    "CHROMEOS_BOARD_APPID",
+    "CHROMEOS_CANARY_APPID",
+    "CHROMEOS_RELEASE_APPID",
 };
 
-// Returns true if the given |key| is anonymizer-whitelisted and whose
-// corresponding value should not be anonymized.
-bool IsKeyWhitelisted(const std::string& key) {
-  for (auto* const whitelisted_key : kWhitelistedKeysOfUUIDs) {
-    if (key == whitelisted_key)
+// Returns true if the given |key| is anonymizer-exempt and whose corresponding
+// value should not be anonymized.
+bool IsKeyExempt(const std::string& key) {
+  for (auto* const exempt_key : kExemptKeysOfUUIDs) {
+    if (key == exempt_key)
       return true;
   }
   return false;
@@ -40,7 +42,7 @@ bool IsKeyWhitelisted(const std::string& key) {
 void Anonymize(feedback::AnonymizerTool* anonymizer,
                SystemLogsResponse* response) {
   for (auto& element : *response) {
-    if (!IsKeyWhitelisted(element.first))
+    if (!IsKeyExempt(element.first))
       element.second = anonymizer->Anonymize(element.second);
   }
 }