BASELINE: Update Chromium to 92.0.4515.166

Change-Id: I42a050486714e9e54fc271f2a8939223a02ae364

6 files changed, 16 insertions, 12 deletions

diff --git a/chromium/components/feedback/BUILD.gn b/chromium/components/feedback/BUILD.gn
index f108f6e054c..7dd3bcb211e 100644
--- a/chromium/components/feedback/BUILD.gn
+++ b/chromium/components/feedback/BUILD.gn
@@ -28,8 +28,9 @@ static_library("feedback") {
     "tracing_manager.h",
   ]
 
+  public_deps = [ "//base" ]
+
   deps = [
-    "//base",
     "//build:chromeos_buildflags",
     "//components/feedback/proto",
     "//components/keyed_service/core",
diff --git a/chromium/components/feedback/content/content_tracing_manager.cc b/chromium/components/feedback/content/content_tracing_manager.cc
index fb40e22b789..fbbe9b09fa9 100644
--- a/chromium/components/feedback/content/content_tracing_manager.cc
+++ b/chromium/components/feedback/content/content_tracing_manager.cc
@@ -10,6 +10,7 @@
 #include "base/memory/ref_counted_memory.h"
 #include "base/single_thread_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
+#include "base/trace_event/trace_config.h"
 #include "components/feedback/feedback_util.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/tracing_controller.h"
diff --git a/chromium/components/feedback/content/content_tracing_manager.h b/chromium/components/feedback/content/content_tracing_manager.h
index 31d9f1ace30..19c1d0f9ff3 100644
--- a/chromium/components/feedback/content/content_tracing_manager.h
+++ b/chromium/components/feedback/content/content_tracing_manager.h
@@ -13,7 +13,6 @@
 
 #include "base/memory/weak_ptr.h"
 #include "base/sequence_checker.h"
-#include "base/values.h"
 
 // This class is used to manage performance metrics that can be attached to
 // feedback reports.  This class is a Singleton that is owned by the preference
diff --git a/chromium/components/feedback/content/feedback_uploader_factory.cc b/chromium/components/feedback/content/feedback_uploader_factory.cc
index 916b7c911a4..131e70df210 100644
--- a/chromium/components/feedback/content/feedback_uploader_factory.cc
+++ b/chromium/components/feedback/content/feedback_uploader_factory.cc
@@ -19,7 +19,7 @@ namespace {
 // be expensive, this is delayed so that it does not happen during startup.
 scoped_refptr<network::SharedURLLoaderFactory>
 CreateURLLoaderFactoryForBrowserContext(content::BrowserContext* context) {
-  return content::BrowserContext::GetDefaultStoragePartition(context)
+  return context->GetDefaultStoragePartition()
       ->GetURLLoaderFactoryForBrowserProcess();
 }
 
diff --git a/chromium/components/feedback/redaction_tool.cc b/chromium/components/feedback/redaction_tool.cc
index e34262f8e5e..deaad295bad 100644
--- a/chromium/components/feedback/redaction_tool.cc
+++ b/chromium/components/feedback/redaction_tool.cc
@@ -484,9 +484,9 @@ std::string RedactionTool::RedactMACAddresses(const std::string& input) {
   while (FindAndConsumeAndGetSkipped(&text, *mac_re, &skipped, &oui, &nic)) {
     // Look up the MAC address in the hash. Force the separator to be a colon
     // so that the same MAC with a different format will match in all cases.
-    std::string oui_string = base::ToLowerASCII(oui.as_string());
+    std::string oui_string = base::ToLowerASCII(std::string(oui));
     base::ReplaceChars(oui_string, kMacSeparatorChars, ":", &oui_string);
-    std::string nic_string = base::ToLowerASCII(nic.as_string());
+    std::string nic_string = base::ToLowerASCII(std::string(nic));
     base::ReplaceChars(nic_string, kMacSeparatorChars, ":", &nic_string);
     std::string mac = oui_string + ":" + nic_string;
     std::string replacement_mac = mac_addresses_[mac];
@@ -541,9 +541,9 @@ std::string RedactionTool::RedactHashes(const std::string& input) {
 
     // Look up the hash value address in the map of replacements.
     std::string hash_prefix_string =
-        base::ToLowerASCII(hash_prefix.as_string());
+        base::ToLowerASCII(std::string(hash_prefix));
     std::string hash =
-        hash_prefix_string + base::ToLowerASCII(hash_suffix.as_string());
+        hash_prefix_string + base::ToLowerASCII(std::string(hash_suffix));
     std::string replacement_hash = hashes_[hash];
     if (replacement_hash.empty()) {
       // If not found, build up a replacement value.
@@ -644,7 +644,7 @@ std::string RedactionTool::RedactCustomPatternWithContext(
   re2::StringPiece pre_match, pre_matched_id, matched_id, post_matched_id;
   while (FindAndConsumeAndGetSkipped(&text, *re, &skipped, &pre_matched_id,
                                      &matched_id, &post_matched_id)) {
-    std::string matched_id_as_string = matched_id.as_string();
+    std::string matched_id_as_string(matched_id);
     std::string replacement_id;
     if (identifier_space->count(matched_id_as_string) == 0) {
       // The weird NumberToString trick is because Windows does not like
@@ -732,7 +732,7 @@ std::string RedactionTool::RedactCustomPatternWithoutContext(
       matched_id.AppendToString(&result);
       continue;
     }
-    std::string matched_id_as_string = matched_id.as_string();
+    std::string matched_id_as_string(matched_id);
     std::string replacement_id;
     if (identifier_space->count(matched_id_as_string) == 0) {
       replacement_id = MaybeScrubIPAddress(matched_id_as_string);
diff --git a/chromium/components/feedback/redaction_tool.h b/chromium/components/feedback/redaction_tool.h
index f08d8c62717..7159caa66e4 100644
--- a/chromium/components/feedback/redaction_tool.h
+++ b/chromium/components/feedback/redaction_tool.h
@@ -10,7 +10,6 @@
 #include <string>
 #include <vector>
 
-#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/sequence_checker.h"
 #include "base/sequenced_task_runner.h"
@@ -35,6 +34,12 @@ struct CustomPatternWithAlias {
 // using custom patterns.
 class RedactionTool {
  public:
+  // Disallow copy or move
+  RedactionTool(const RedactionTool&) = delete;
+  RedactionTool& operator=(const RedactionTool&) = delete;
+  RedactionTool(RedactionTool&&) = delete;
+  RedactionTool& operator=(RedactionTool&&) = delete;
+
   // |first_party_extension_ids| is a null terminated array of all the 1st
   // party extension IDs whose URLs won't be redacted. It is OK to pass null for
   // that value if it's OK to redact those URLs or they won't be present.
@@ -96,8 +101,6 @@ class RedactionTool {
   std::map<std::string, std::unique_ptr<re2::RE2>> regexp_cache_;
 
   SEQUENCE_CHECKER(sequence_checker_);
-
-  DISALLOW_COPY_AND_ASSIGN(RedactionTool);
 };
 
 // A container for a RedactionTool that is thread-safely ref-countable.