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>

12 files changed, 70 insertions, 52 deletions

diff --git a/chromium/net/reporting/reporting_cache_impl.cc b/chromium/net/reporting/reporting_cache_impl.cc
index f3405d3baea..c9765152f14 100644
--- a/chromium/net/reporting/reporting_cache_impl.cc
+++ b/chromium/net/reporting/reporting_cache_impl.cc
@@ -389,8 +389,8 @@ void ReportingCacheImpl::OnParsedHeader(
 
     // Consistency check: the new client should have the same NIK and origin as
     // all groups parsed from this header.
-    DCHECK_EQ(new_group.group_key.network_isolation_key,
-              new_client.network_isolation_key);
+    DCHECK(new_group.group_key.network_isolation_key ==
+           new_client.network_isolation_key);
     DCHECK_EQ(new_group.group_key.origin, new_client.origin);
 
     for (const auto& parsed_endpoint_info : parsed_endpoint_group.endpoints) {
@@ -867,8 +867,8 @@ void ReportingCacheImpl::SetV1EndpointForTesting(
   DCHECK(!reporting_source.is_empty());
   DCHECK(group_key.IsDocumentEndpoint());
   DCHECK_EQ(reporting_source, group_key.reporting_source.value());
-  DCHECK_EQ(group_key.network_isolation_key,
-            isolation_info.network_isolation_key());
+  DCHECK(group_key.network_isolation_key ==
+         isolation_info.network_isolation_key());
 
   ReportingEndpoint::EndpointInfo info;
   info.url = url;
diff --git a/chromium/net/reporting/reporting_cache_impl.h b/chromium/net/reporting/reporting_cache_impl.h
index 7e14df6631d..4ffac185bb5 100644
--- a/chromium/net/reporting/reporting_cache_impl.h
+++ b/chromium/net/reporting/reporting_cache_impl.h
@@ -35,7 +35,7 @@ namespace net {
 
 class ReportingCacheImpl : public ReportingCache {
  public:
-  ReportingCacheImpl(ReportingContext* context);
+  explicit ReportingCacheImpl(ReportingContext* context);
 
   ReportingCacheImpl(const ReportingCacheImpl&) = delete;
   ReportingCacheImpl& operator=(const ReportingCacheImpl&) = delete;
diff --git a/chromium/net/reporting/reporting_delegate.cc b/chromium/net/reporting/reporting_delegate.cc
index e246d443f20..e2f676d4b6c 100644
--- a/chromium/net/reporting/reporting_delegate.cc
+++ b/chromium/net/reporting/reporting_delegate.cc
@@ -14,7 +14,7 @@ namespace {
 
 class ReportingDelegateImpl : public ReportingDelegate {
  public:
-  ReportingDelegateImpl(URLRequestContext* request_context)
+  explicit ReportingDelegateImpl(URLRequestContext* request_context)
       : request_context_(request_context) {
     DCHECK(request_context);
   }
diff --git a/chromium/net/reporting/reporting_delivery_agent.cc b/chromium/net/reporting/reporting_delivery_agent.cc
index edc9f2a1104..149681a8949 100644
--- a/chromium/net/reporting/reporting_delivery_agent.cc
+++ b/chromium/net/reporting/reporting_delivery_agent.cc
@@ -135,13 +135,12 @@ class Delivery {
                   const ReportList::const_iterator reports_begin,
                   const ReportList::const_iterator reports_end) {
     DCHECK(reports_begin != reports_end);
-    DCHECK_EQ(endpoint.group_key.network_isolation_key,
-              network_isolation_key());
+    DCHECK(endpoint.group_key.network_isolation_key == network_isolation_key());
     DCHECK(IsSubdomainOf(target_.origin.host() /* subdomain */,
                          endpoint.group_key.origin.host() /* superdomain */));
     for (auto it = reports_begin; it != reports_end; ++it) {
       DCHECK_EQ((*reports_begin)->GetGroupKey(), (*it)->GetGroupKey());
-      DCHECK_EQ((*it)->network_isolation_key, network_isolation_key());
+      DCHECK((*it)->network_isolation_key == network_isolation_key());
       DCHECK_EQ(url::Origin::Create((*it)->url), target_.origin);
       DCHECK_EQ((*it)->group, endpoint.group_key.group_name);
       // Report origin is equal to, or a subdomain of, the endpoint
diff --git a/chromium/net/reporting/reporting_delivery_agent_unittest.cc b/chromium/net/reporting/reporting_delivery_agent_unittest.cc
index 5d38ffe241f..5042b35284f 100644
--- a/chromium/net/reporting/reporting_delivery_agent_unittest.cc
+++ b/chromium/net/reporting/reporting_delivery_agent_unittest.cc
@@ -160,15 +160,16 @@ TEST_F(ReportingDeliveryAgentTest, SuccessfulImmediateUpload) {
     ASSERT_TRUE(value->is_list());
     ASSERT_EQ(1u, value->GetList().size());
 
-    base::Value& report = value->GetList()[0];
+    const base::Value& report = value->GetList()[0];
     ASSERT_TRUE(report.is_dict());
-    EXPECT_EQ(5u, report.GetDict().size());
-
-    ExpectDictIntegerValue(0, report, "age");
-    ExpectDictStringValue(kType_, report, "type");
-    ExpectDictStringValue(kUrl_.spec(), report, "url");
-    ExpectDictStringValue(kUserAgent_, report, "user_agent");
-    const base::Value::Dict* body = report.GetDict().FindDict("body");
+    const base::Value::Dict& report_dict = report.GetDict();
+    EXPECT_EQ(5u, report_dict.size());
+
+    ExpectDictIntegerValue(0, report_dict, "age");
+    ExpectDictStringValue(kType_, report_dict, "type");
+    ExpectDictStringValue(kUrl_.spec(), report_dict, "url");
+    ExpectDictStringValue(kUserAgent_, report_dict, "user_agent");
+    const base::Value::Dict* body = report_dict.FindDict("body");
     EXPECT_EQ("value", *body->FindString("key"));
   }
   pending_uploads()[0]->Complete(ReportingUploader::Outcome::SUCCESS);
@@ -238,12 +239,13 @@ TEST_F(ReportingDeliveryAgentTest, SuccessfulImmediateUploadDocumentReport) {
 
     const base::Value& report = value->GetList()[0];
     ASSERT_TRUE(report.is_dict());
+    const base::Value::Dict& report_dict = report.GetDict();
 
-    ExpectDictIntegerValue(0, report, "age");
-    ExpectDictStringValue(kType_, report, "type");
-    ExpectDictStringValue(kUrl_.spec(), report, "url");
-    ExpectDictStringValue(kUserAgent_, report, "user_agent");
-    const base::Value::Dict* body = report.GetDict().FindDict("body");
+    ExpectDictIntegerValue(0, report_dict, "age");
+    ExpectDictStringValue(kType_, report_dict, "type");
+    ExpectDictStringValue(kUrl_.spec(), report_dict, "url");
+    ExpectDictStringValue(kUserAgent_, report_dict, "user_agent");
+    const base::Value::Dict* body = report_dict.FindDict("body");
     EXPECT_EQ("value", *body->FindString("key"));
   }
   pending_uploads()[0]->Complete(ReportingUploader::Outcome::SUCCESS);
@@ -314,15 +316,16 @@ TEST_F(ReportingDeliveryAgentTest, SuccessfulImmediateSubdomainUpload) {
     ASSERT_TRUE(value->is_list());
     ASSERT_EQ(1u, value->GetList().size());
 
-    base::Value& report = value->GetList()[0];
+    const base::Value& report = value->GetList()[0];
     ASSERT_TRUE(report.is_dict());
-    EXPECT_EQ(5u, report.GetDict().size());
-
-    ExpectDictIntegerValue(0, report, "age");
-    ExpectDictStringValue(kType_, report, "type");
-    ExpectDictStringValue(kSubdomainUrl_.spec(), report, "url");
-    ExpectDictStringValue(kUserAgent_, report, "user_agent");
-    const base::Value::Dict* body = report.GetDict().FindDict("body");
+    const base::Value::Dict& report_dict = report.GetDict();
+    EXPECT_EQ(5u, report_dict.size());
+
+    ExpectDictIntegerValue(0, report_dict, "age");
+    ExpectDictStringValue(kType_, report_dict, "type");
+    ExpectDictStringValue(kSubdomainUrl_.spec(), report_dict, "url");
+    ExpectDictStringValue(kUserAgent_, report_dict, "user_agent");
+    const base::Value::Dict* body = report_dict.FindDict("body");
     EXPECT_EQ("value", *body->FindString("key"));
   }
   pending_uploads()[0]->Complete(ReportingUploader::Outcome::SUCCESS);
@@ -393,15 +396,16 @@ TEST_F(ReportingDeliveryAgentTest, SuccessfulDelayedUpload) {
     ASSERT_TRUE(value->is_list());
     ASSERT_EQ(1u, value->GetList().size());
 
-    base::Value& report = value->GetList()[0];
+    const base::Value& report = value->GetList()[0];
     ASSERT_TRUE(report.is_dict());
-    EXPECT_EQ(5u, report.GetDict().size());
-
-    ExpectDictIntegerValue(0, report, "age");
-    ExpectDictStringValue(kType_, report, "type");
-    ExpectDictStringValue(kUrl_.spec(), report, "url");
-    ExpectDictStringValue(kUserAgent_, report, "user_agent");
-    const base::Value::Dict* body = report.GetDict().FindDict("body");
+    const base::Value::Dict& report_dict = report.GetDict();
+    EXPECT_EQ(5u, report_dict.size());
+
+    ExpectDictIntegerValue(0, report_dict, "age");
+    ExpectDictStringValue(kType_, report_dict, "type");
+    ExpectDictStringValue(kUrl_.spec(), report_dict, "url");
+    ExpectDictStringValue(kUserAgent_, report_dict, "user_agent");
+    const base::Value::Dict* body = report_dict.FindDict("body");
     EXPECT_EQ("value", *body->FindString("key"));
   }
   pending_uploads()[0]->Complete(ReportingUploader::Outcome::SUCCESS);
@@ -559,7 +563,16 @@ TEST_F(ReportingDeliveryAgentTest, ConcurrentRemove) {
   EXPECT_TRUE(reports.empty());
 }
 
-TEST_F(ReportingDeliveryAgentTest, ConcurrentRemoveDuringPermissionsCheck) {
+// Flaky on ChromeOS: https://crbug.com/1348434
+#if defined(CHROMEOS)
+#define MAYBE_ConcurrentRemoveDuringPermissionsCheck \
+  DISABLED_ConcurrentRemoveDuringPermissionsCheck
+#else
+#define MAYBE_ConcurrentRemoveDuringPermissionsCheck \
+  ConcurrentRemoveDuringPermissionsCheck
+#endif
+TEST_F(ReportingDeliveryAgentTest,
+       MAYBE_ConcurrentRemoveDuringPermissionsCheck) {
   // Pause the permissions check, so that we can try to remove some reports
   // while we're in the middle of verifying that we can upload them.  (This is
   // similar to the previous test, but removes the reports during a different
diff --git a/chromium/net/reporting/reporting_endpoint_manager.cc b/chromium/net/reporting/reporting_endpoint_manager.cc
index f3ad603e01b..12a2a549cfd 100644
--- a/chromium/net/reporting/reporting_endpoint_manager.cc
+++ b/chromium/net/reporting/reporting_endpoint_manager.cc
@@ -112,8 +112,7 @@ class ReportingEndpointManagerImpl : public ReportingEndpointManager {
 
     int random_index = rand_callback_.Run(0, total_weight - 1);
     int weight_so_far = 0;
-    for (size_t i = 0; i < available_endpoints.size(); ++i) {
-      const ReportingEndpoint& endpoint = available_endpoints[i];
+    for (const auto& endpoint : available_endpoints) {
       weight_so_far += endpoint.info.weight;
       if (random_index < weight_so_far) {
         return endpoint;
diff --git a/chromium/net/reporting/reporting_garbage_collector.cc b/chromium/net/reporting/reporting_garbage_collector.cc
index 463f76ebcee..b7b3809de6a 100644
--- a/chromium/net/reporting/reporting_garbage_collector.cc
+++ b/chromium/net/reporting/reporting_garbage_collector.cc
@@ -26,7 +26,7 @@ namespace {
 class ReportingGarbageCollectorImpl : public ReportingGarbageCollector,
                                       public ReportingCacheObserver {
  public:
-  ReportingGarbageCollectorImpl(ReportingContext* context)
+  explicit ReportingGarbageCollectorImpl(ReportingContext* context)
       : context_(context), timer_(std::make_unique<base::OneShotTimer>()) {
     context_->AddCacheObserver(this);
   }
diff --git a/chromium/net/reporting/reporting_network_change_observer.cc b/chromium/net/reporting/reporting_network_change_observer.cc
index adbbc291713..f77dee50e6f 100644
--- a/chromium/net/reporting/reporting_network_change_observer.cc
+++ b/chromium/net/reporting/reporting_network_change_observer.cc
@@ -19,7 +19,7 @@ class ReportingNetworkChangeObserverImpl
     : public ReportingNetworkChangeObserver,
       public NetworkChangeNotifier::NetworkChangeObserver {
  public:
-  ReportingNetworkChangeObserverImpl(ReportingContext* context)
+  explicit ReportingNetworkChangeObserverImpl(ReportingContext* context)
       : context_(context) {
     NetworkChangeNotifier::AddNetworkChangeObserver(this);
   }
diff --git a/chromium/net/reporting/reporting_service.h b/chromium/net/reporting/reporting_service.h
index de9fe0cd824..a473073a5bb 100644
--- a/chromium/net/reporting/reporting_service.h
+++ b/chromium/net/reporting/reporting_service.h
@@ -139,7 +139,7 @@ class NET_EXPORT ReportingService {
   virtual ReportingContext* GetContextForTesting() const = 0;
 
  protected:
-  ReportingService() {}
+  ReportingService() = default;
 };
 
 }  // namespace net
diff --git a/chromium/net/reporting/reporting_service_unittest.cc b/chromium/net/reporting/reporting_service_unittest.cc
index d7c85e2e2c5..4307df3fbfa 100644
--- a/chromium/net/reporting/reporting_service_unittest.cc
+++ b/chromium/net/reporting/reporting_service_unittest.cc
@@ -325,7 +325,12 @@ TEST_P(ReportingServiceTest, SendReportsAndRemoveSourceWithPendingReports) {
       context()->cache()->GetExpiredSources().contains(kReportingSource_));
 }
 
-TEST_P(ReportingServiceTest, ProcessReportingEndpointsHeaderPathAbsolute) {
+#if BUILDFLAG(IS_CHROMEOS)
+#define MAYBE_ProcessReportingEndpointsHeaderPathAbsolute DISABLED_ProcessReportingEndpointsHeaderPathAbsolute
+#else
+#define MAYBE_ProcessReportingEndpointsHeaderPathAbsolute ProcessReportingEndpointsHeaderPathAbsolute
+#endif
+TEST_P(ReportingServiceTest, MAYBE_ProcessReportingEndpointsHeaderPathAbsolute) {
   base::test::ScopedFeatureList feature_list;
   feature_list.InitAndEnableFeature(net::features::kDocumentReporting);
   auto parsed_header = ParseReportingEndpoints(kGroup_ + "=\"/path-absolute\"");
diff --git a/chromium/net/reporting/reporting_test_util.cc b/chromium/net/reporting/reporting_test_util.cc
index 08cf719231c..f39c2820f46 100644
--- a/chromium/net/reporting/reporting_test_util.cc
+++ b/chromium/net/reporting/reporting_test_util.cc
@@ -178,12 +178,13 @@ TestReportingContext::TestReportingContext(
                        TestReportingRandIntCallback(),
                        std::make_unique<TestReportingUploader>(),
                        std::make_unique<TestReportingDelegate>(),
-                       store),
-      delivery_timer_(new base::MockOneShotTimer()),
-      garbage_collection_timer_(new base::MockOneShotTimer()) {
-  garbage_collector()->SetTimerForTesting(
-      base::WrapUnique(garbage_collection_timer_.get()));
-  delivery_agent()->SetTimerForTesting(base::WrapUnique(delivery_timer_.get()));
+                       store) {
+  auto delivery_timer = std::make_unique<base::MockOneShotTimer>();
+  delivery_timer_ = delivery_timer.get();
+  auto garbage_collection_timer = std::make_unique<base::MockOneShotTimer>();
+  garbage_collection_timer_ = garbage_collection_timer.get();
+  garbage_collector()->SetTimerForTesting(std::move(garbage_collection_timer));
+  delivery_agent()->SetTimerForTesting(std::move(delivery_timer));
 }
 
 TestReportingContext::~TestReportingContext() {
diff --git a/chromium/net/reporting/reporting_uploader.cc b/chromium/net/reporting/reporting_uploader.cc
index 0f978deb858..3aa46ce7a8e 100644
--- a/chromium/net/reporting/reporting_uploader.cc
+++ b/chromium/net/reporting/reporting_uploader.cc
@@ -109,7 +109,8 @@ struct PendingUpload {
 
 class ReportingUploaderImpl : public ReportingUploader, URLRequest::Delegate {
  public:
-  ReportingUploaderImpl(const URLRequestContext* context) : context_(context) {
+  explicit ReportingUploaderImpl(const URLRequestContext* context)
+      : context_(context) {
     DCHECK(context_);
   }