BASELINE: Update Chromium to 94.0.4606.111

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

5 files changed, 23 insertions, 6 deletions

diff --git a/chromium/components/tracing/child/DEPS b/chromium/components/tracing/child/DEPS
deleted file mode 100644
index 066911705ed..00000000000
--- a/chromium/components/tracing/child/DEPS
+++ /dev/null
@@ -1,3 +0,0 @@
-include_rules = [
-  "+mojo",
-]
diff --git a/chromium/components/tracing/common/graphics_memory_dump_provider_android.cc b/chromium/components/tracing/common/graphics_memory_dump_provider_android.cc
index 9927d06cf92..bf0c58f4e37 100644
--- a/chromium/components/tracing/common/graphics_memory_dump_provider_android.cc
+++ b/chromium/components/tracing/common/graphics_memory_dump_provider_android.cc
@@ -15,7 +15,6 @@
 #include "base/files/scoped_file.h"
 #include "base/logging.h"
 #include "base/posix/eintr_wrapper.h"
-#include "base/stl_util.h"
 #include "base/strings/strcat.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_piece.h"
diff --git a/chromium/components/tracing/common/trace_startup_config.cc b/chromium/components/tracing/common/trace_startup_config.cc
index b1a779ce856..9a4a39fb8e0 100644
--- a/chromium/components/tracing/common/trace_startup_config.cc
+++ b/chromium/components/tracing/common/trace_startup_config.cc
@@ -15,6 +15,7 @@
 #include "base/logging.h"
 #include "base/memory/singleton.h"
 #include "base/strings/string_number_conversions.h"
+#include "base/trace_event/memory_dump_manager.h"
 #include "base/trace_event/trace_log.h"
 #include "base/values.h"
 #include "build/build_config.h"
@@ -197,6 +198,15 @@ bool TraceStartupConfig::EnableFromCommandLine() {
       categories,
       command_line->GetSwitchValueASCII(switches::kTraceStartupRecordMode));
 
+  if (trace_config_.IsCategoryGroupEnabled(
+          base::trace_event::MemoryDumpManager::kTraceCategory)) {
+    base::trace_event::TraceConfig::MemoryDumpConfig memory_config;
+    memory_config.triggers.push_back(
+        {10000, base::trace_event::MemoryDumpLevelOfDetail::DETAILED,
+         base::trace_event::MemoryDumpType::PERIODIC_INTERVAL});
+    trace_config_.ResetMemoryDumpConfig(memory_config);
+  }
+
   result_file_ = command_line->GetSwitchValuePath(switches::kTraceStartupFile);
 
   is_enabled_ = true;
diff --git a/chromium/components/tracing/common/tracing_switches.cc b/chromium/components/tracing/common/tracing_switches.cc
index 6b2d8137cfe..6ab13e64964 100644
--- a/chromium/components/tracing/common/tracing_switches.cc
+++ b/chromium/components/tracing/common/tracing_switches.cc
@@ -96,9 +96,18 @@ const char kTraceStartupEnablePrivacyFiltering[] =
 const char kPerfettoDisableInterning[] = "perfetto-disable-interning";
 
 // Sends a pretty-printed version of tracing info to the console.
-const char kTraceToConsole[]                = "trace-to-console";
+const char kTraceToConsole[] = "trace-to-console";
 
 // Sets the target URL for uploading tracing data.
-const char kTraceUploadURL[]                = "trace-upload-url";
+const char kTraceUploadURL[] = "trace-upload-url";
+
+// Sets a local file destination for tracing data. This is only used if
+// kEnableBackgroundTracing is also specified.
+const char kBackgroundTracingOutputFile[] = "background-tracing-output-file";
+
+// Configures the size of the shared memory buffer used for tracing. Value is
+// provided in kB. Defaults to 4096. Should be a multiple of the SMB page size
+// (currently 32kB on Desktop or 4kB on Android).
+const char kTraceSmbSize[] = "trace-smb-size";
 
 }  // namespace switches
diff --git a/chromium/components/tracing/common/tracing_switches.h b/chromium/components/tracing/common/tracing_switches.h
index d0ae956c8e9..f9301e94950 100644
--- a/chromium/components/tracing/common/tracing_switches.h
+++ b/chromium/components/tracing/common/tracing_switches.h
@@ -24,6 +24,8 @@ TRACING_EXPORT extern const char kTraceStartupEnablePrivacyFiltering[];
 TRACING_EXPORT extern const char kPerfettoDisableInterning[];
 TRACING_EXPORT extern const char kTraceToConsole[];
 TRACING_EXPORT extern const char kTraceUploadURL[];
+TRACING_EXPORT extern const char kBackgroundTracingOutputFile[];
+TRACING_EXPORT extern const char kTraceSmbSize[];
 
 }  // namespace switches