BASELINE: Update Chromium to 106.0.5249.126

Change-Id: Ib0bb21c437a7d1686e21c33f2d329f2ac425b7ab
Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/438936
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

3 files changed, 52 insertions, 50 deletions

diff --git a/chromium/components/tracing/common/background_tracing_state_manager_unittest.cc b/chromium/components/tracing/common/background_tracing_state_manager_unittest.cc
index 260c3e250f3..1b1deb0c9ce 100644
--- a/chromium/components/tracing/common/background_tracing_state_manager_unittest.cc
+++ b/chromium/components/tracing/common/background_tracing_state_manager_unittest.cc
@@ -34,11 +34,11 @@ class BackgroundTracingStateManagerTest : public testing::Test {
   }
 
   std::string GetSessionStateJson() {
-    const base::Value* state =
-        pref_service_->GetDictionary(tracing::kBackgroundTracingSessionState);
+    const base::Value::Dict& state =
+        pref_service_->GetValueDict(tracing::kBackgroundTracingSessionState);
 
     std::string json;
-    EXPECT_TRUE(base::JSONWriter::Write(*state, &json));
+    EXPECT_TRUE(base::JSONWriter::Write(state, &json));
     return json;
   }
 
@@ -54,41 +54,44 @@ TEST_F(BackgroundTracingStateManagerTest, InitializeEmptyPrefs) {
 }
 
 TEST_F(BackgroundTracingStateManagerTest, InitializeInvalidState) {
-  base::Value dict(base::Value::Type::DICTIONARY);
-  dict.SetIntKey("state",
-                 static_cast<int>(tracing::BackgroundTracingState::LAST) + 1);
-  pref_service_->Set(tracing::kBackgroundTracingSessionState, std::move(dict));
+  base::Value::Dict dict;
+  dict.Set("state",
+           static_cast<int>(tracing::BackgroundTracingState::LAST) + 1);
+  pref_service_->Set(tracing::kBackgroundTracingSessionState,
+                     base::Value(std::move(dict)));
 
   tracing::BackgroundTracingStateManager::GetInstance().Initialize(nullptr);
   EXPECT_EQ(GetSessionStateJson(), R"({"state":0,"upload_times":[]})");
 }
 
 TEST_F(BackgroundTracingStateManagerTest, InitializeNoScenario) {
-  base::Value dict(base::Value::Type::DICTIONARY);
-  dict.SetIntKey("state", static_cast<int>(
-                              tracing::BackgroundTracingState::NOT_ACTIVATED));
-  base::Value upload_times(base::Value::Type::LIST);
-  base::Value scenario(base::Value::Type::DICTIONARY);
-  scenario.SetKey("time", base::TimeToValue(base::Time::Now()));
+  base::Value::Dict dict;
+  dict.Set("state",
+           static_cast<int>(tracing::BackgroundTracingState::NOT_ACTIVATED));
+  base::Value::List upload_times;
+  base::Value::Dict scenario;
+  scenario.Set("time", base::TimeToValue(base::Time::Now()));
   upload_times.Append(std::move(scenario));
-  dict.SetKey("upload_times", std::move(upload_times));
-  pref_service_->Set(tracing::kBackgroundTracingSessionState, std::move(dict));
+  dict.Set("upload_times", std::move(upload_times));
+  pref_service_->Set(tracing::kBackgroundTracingSessionState,
+                     base::Value(std::move(dict)));
 
   tracing::BackgroundTracingStateManager::GetInstance().Initialize(nullptr);
   EXPECT_EQ(GetSessionStateJson(), R"({"state":0,"upload_times":[]})");
 }
 
 TEST_F(BackgroundTracingStateManagerTest, InitializeValidPrefs) {
-  base::Value dict(base::Value::Type::DICTIONARY);
-  dict.SetIntKey("state", static_cast<int>(
-                              tracing::BackgroundTracingState::NOT_ACTIVATED));
-  base::Value upload_times(base::Value::Type::LIST);
-  base::Value scenario(base::Value::Type::DICTIONARY);
-  scenario.SetStringKey("scenario", "TestScenario");
-  scenario.SetKey("time", base::TimeToValue(base::Time::Now()));
+  base::Value::Dict dict;
+  dict.Set("state",
+           static_cast<int>(tracing::BackgroundTracingState::NOT_ACTIVATED));
+  base::Value::List upload_times;
+  base::Value::Dict scenario;
+  scenario.Set("scenario", "TestScenario");
+  scenario.Set("time", base::TimeToValue(base::Time::Now()));
   upload_times.Append(std::move(scenario));
-  dict.SetKey("upload_times", std::move(upload_times));
-  pref_service_->Set(tracing::kBackgroundTracingSessionState, std::move(dict));
+  dict.Set("upload_times", std::move(upload_times));
+  pref_service_->Set(tracing::kBackgroundTracingSessionState,
+                     base::Value(std::move(dict)));
 
   tracing::BackgroundTracingStateManager::GetInstance().Initialize(nullptr);
   EXPECT_TRUE(base::MatchPattern(
@@ -126,20 +129,20 @@ TEST_F(BackgroundTracingStateManagerTest, NotUploadedRecently) {
       tracing::BackgroundTracingState::NOT_ACTIVATED);
   tracing::BackgroundTracingStateManager::GetInstance().Initialize(nullptr);
 
-  base::Value dict(base::Value::Type::DICTIONARY);
-  dict.SetStringKey("scenario_name", "TestScenario");
-  dict.SetStringKey("mode", "PREEMPTIVE_TRACING_MODE");
-  dict.SetStringKey("custom_categories", "toplevel");
-  base::Value rules_list(base::Value::Type::LIST);
+  base::Value::Dict dict;
+  dict.Set("scenario_name", "TestScenario");
+  dict.Set("mode", "PREEMPTIVE_TRACING_MODE");
+  dict.Set("custom_categories", "toplevel");
+  base::Value::List rules_list;
 
   {
-    base::Value rules_dict(base::Value::Type::DICTIONARY);
-    rules_dict.SetStringKey("rule", "MONITOR_AND_DUMP_WHEN_TRIGGER_NAMED");
-    rules_dict.SetStringKey("trigger_name", "test");
+    base::Value::Dict rules_dict;
+    rules_dict.Set("rule", "MONITOR_AND_DUMP_WHEN_TRIGGER_NAMED");
+    rules_dict.Set("trigger_name", "test");
     rules_list.Append(std::move(rules_dict));
   }
 
-  dict.SetKey("configs", std::move(rules_list));
+  dict.Set("configs", std::move(rules_list));
   std::unique_ptr<content::BackgroundTracingConfig> config(
       content::BackgroundTracingConfig::FromDict(std::move(dict)));
 
@@ -153,20 +156,20 @@ TEST_F(BackgroundTracingStateManagerTest, UploadedRecently) {
       tracing::BackgroundTracingState::NOT_ACTIVATED);
   tracing::BackgroundTracingStateManager::GetInstance().Initialize(nullptr);
 
-  base::Value dict(base::Value::Type::DICTIONARY);
-  dict.SetStringKey("scenario_name", "TestScenario");
-  dict.SetStringKey("mode", "PREEMPTIVE_TRACING_MODE");
-  dict.SetStringKey("custom_categories", "toplevel");
-  base::Value rules_list(base::Value::Type::LIST);
+  base::Value::Dict dict;
+  dict.Set("scenario_name", "TestScenario");
+  dict.Set("mode", "PREEMPTIVE_TRACING_MODE");
+  dict.Set("custom_categories", "toplevel");
+  base::Value::List rules_list;
 
   {
-    base::Value rules_dict(base::Value::Type::DICTIONARY);
-    rules_dict.SetStringKey("rule", "MONITOR_AND_DUMP_WHEN_TRIGGER_NAMED");
-    rules_dict.SetStringKey("trigger_name", "test");
+    base::Value::Dict rules_dict;
+    rules_dict.Set("rule", "MONITOR_AND_DUMP_WHEN_TRIGGER_NAMED");
+    rules_dict.Set("trigger_name", "test");
     rules_list.Append(std::move(rules_dict));
   }
 
-  dict.SetKey("configs", std::move(rules_list));
+  dict.Set("configs", std::move(rules_list));
   std::unique_ptr<content::BackgroundTracingConfig> config(
       content::BackgroundTracingConfig::FromDict(std::move(dict)));
 
diff --git a/chromium/components/tracing/common/background_tracing_utils.cc b/chromium/components/tracing/common/background_tracing_utils.cc
index 24a417553c7..b982d6c8330 100644
--- a/chromium/components/tracing/common/background_tracing_utils.cc
+++ b/chromium/components/tracing/common/background_tracing_utils.cc
@@ -61,22 +61,21 @@ GetBackgroundTracingConfigFromFile(const base::FilePath& config_file) {
     return nullptr;
   }
 
-  base::JSONReader::ValueWithError value_with_error =
-      base::JSONReader::ReadAndReturnValueWithError(
-          config_text, base::JSON_ALLOW_TRAILING_COMMAS);
-  if (!value_with_error.value) {
+  auto value_with_error = base::JSONReader::ReadAndReturnValueWithError(
+      config_text, base::JSON_ALLOW_TRAILING_COMMAS);
+  if (!value_with_error.has_value()) {
     LOG(ERROR) << "Background tracing has incorrect config: "
-               << value_with_error.error_message;
+               << value_with_error.error().message;
     return nullptr;
   }
 
-  if (!value_with_error.value->is_dict()) {
+  if (!value_with_error->is_dict()) {
     LOG(ERROR) << "Background tracing config is not a dict";
     return nullptr;
   }
 
   auto config = content::BackgroundTracingConfig::FromDict(
-      std::move(*(value_with_error.value)));
+      std::move(value_with_error->GetDict()));
 
   if (!config) {
     LOG(ERROR) << "Background tracing config dict has invalid contents";
diff --git a/chromium/components/tracing/common/tracing_switches.cc b/chromium/components/tracing/common/tracing_switches.cc
index c3ae3827b37..e2635857bc5 100644
--- a/chromium/components/tracing/common/tracing_switches.cc
+++ b/chromium/components/tracing/common/tracing_switches.cc
@@ -58,7 +58,7 @@ const char kTraceStartupFile[] = "trace-startup-file";
 const char kEnableTracingOutput[] = "enable-tracing-output";
 
 // Sets the output format for the trace, valid values are "json" and "proto".
-// If not set, the current default is "json".
+// If not set, the current default is "proto".
 // "proto", unlike json, supports writing the trace into the output file
 // incrementally and is more likely to retain more data if the browser process
 // unexpectedly terminates.