BASELINE: Update Chromium to 73.0.3683.37

Change-Id: I08c9af2948b645f671e5d933aca1f7a90ea372f2
Reviewed-by: Michael Brüning <michael.bruning@qt.io>

4 files changed, 19 insertions, 16 deletions

diff --git a/chromium/components/domain_reliability/google_configs.cc b/chromium/components/domain_reliability/google_configs.cc
index 31ad3f170c8..9357e3c59c8 100644
--- a/chromium/components/domain_reliability/google_configs.cc
+++ b/chromium/components/domain_reliability/google_configs.cc
@@ -8,7 +8,7 @@
 
 #include <memory>
 
-#include "base/macros.h"
+#include "base/stl_util.h"
 #include "components/domain_reliability/config.h"
 
 namespace domain_reliability {
@@ -561,7 +561,7 @@ static std::unique_ptr<DomainReliabilityConfig> CreateGoogleConfig(
     config->collectors.push_back(
         std::make_unique<GURL>(config->origin.ReplaceComponents(replacements)));
   }
-  for (size_t i = 0; i < arraysize(kGoogleStandardCollectors); i++)
+  for (size_t i = 0; i < base::size(kGoogleStandardCollectors); i++)
     config->collectors.push_back(
         std::make_unique<GURL>(kGoogleStandardCollectors[i]));
   config->success_sample_rate = 0.05;
diff --git a/chromium/components/domain_reliability/quic_error_mapping.cc b/chromium/components/domain_reliability/quic_error_mapping.cc
index 80ffacebe50..42eedc824dc 100644
--- a/chromium/components/domain_reliability/quic_error_mapping.cc
+++ b/chromium/components/domain_reliability/quic_error_mapping.cc
@@ -4,6 +4,8 @@
 
 #include "components/domain_reliability/quic_error_mapping.h"
 
+#include "base/stl_util.h"
+
 namespace domain_reliability {
 
 namespace {
@@ -301,6 +303,7 @@ const struct QuicErrorMapping {
     {quic::QUIC_STREAM_ID_BLOCKED_ERROR,
      "quic.stream.id.in.stream_id_blocked.frame"},
     {quic::QUIC_MAX_STREAM_ID_ERROR, "quic.stream.id.in.max_stream_id.frame"},
+    {quic::QUIC_HTTP_DECODER_ERROR, "quic.http.decoder.error"},
 
     // No error. Used as bound while iterating.
     {quic::QUIC_LAST_ERROR, "quic.last_error"}};
@@ -311,7 +314,7 @@ const int kDeprecatedQuicErrorCount = 5;
 const int kActiveQuicErrorCount =
     quic::QUIC_LAST_ERROR - kDeprecatedQuicErrorCount;
 
-static_assert(arraysize(kQuicErrorMap) == kActiveQuicErrorCount,
+static_assert(base::size(kQuicErrorMap) == kActiveQuicErrorCount,
               "quic_error_map is not in sync with quic protocol!");
 
 }  // namespace
@@ -322,7 +325,7 @@ bool GetDomainReliabilityBeaconQuicError(quic::QuicErrorCode quic_error,
   if (quic_error != quic::QUIC_NO_ERROR) {
     // Convert a QUIC error.
     // TODO(juliatuttle): Consider sorting and using binary search?
-    for (size_t i = 0; i < arraysize(kQuicErrorMap); i++) {
+    for (size_t i = 0; i < base::size(kQuicErrorMap); i++) {
       if (kQuicErrorMap[i].quic_error == quic_error) {
         *beacon_quic_error_out = kQuicErrorMap[i].beacon_quic_error;
         return true;
diff --git a/chromium/components/domain_reliability/uploader_unittest.cc b/chromium/components/domain_reliability/uploader_unittest.cc
index 8a1680c2212..60f94918326 100644
--- a/chromium/components/domain_reliability/uploader_unittest.cc
+++ b/chromium/components/domain_reliability/uploader_unittest.cc
@@ -11,9 +11,10 @@
 
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
-#include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
+#include "base/test/scoped_task_environment.h"
 #include "base/test/test_simple_task_runner.h"
+#include "base/threading/thread_task_runner_handle.h"
 #include "components/domain_reliability/test_util.h"
 #include "net/base/load_flags.h"
 #include "net/http/http_response_headers.h"
@@ -107,9 +108,7 @@ class UploadInterceptor : public net::URLRequestInterceptor {
  public:
   UploadInterceptor() : request_count_(0), last_upload_depth_(-1) {}
 
-  ~UploadInterceptor() override {
-    EXPECT_TRUE(results_.empty());
-  }
+  ~UploadInterceptor() override { EXPECT_TRUE(results_.empty()); }
 
   net::URLRequestJob* MaybeInterceptRequest(
       net::URLRequest* request,
@@ -176,10 +175,11 @@ class DomainReliabilityUploaderTest : public testing::Test {
  protected:
   DomainReliabilityUploaderTest()
       : url_request_context_getter_(new net::TestURLRequestContextGetter(
-            message_loop_.task_runner())),
+            base::ThreadTaskRunnerHandle::Get())),
         interceptor_(new UploadInterceptor()),
-        uploader_(DomainReliabilityUploader::Create(
-            &time_, url_request_context_getter_)) {
+        uploader_(
+            DomainReliabilityUploader::Create(&time_,
+                                              url_request_context_getter_)) {
     net::URLRequestFilter::GetInstance()->AddUrlInterceptor(
         GURL(kUploadURL), base::WrapUnique(interceptor_));
     uploader_->SetDiscardUploads(false);
@@ -191,13 +191,13 @@ class DomainReliabilityUploaderTest : public testing::Test {
 
   DomainReliabilityUploader* uploader() const { return uploader_.get(); }
   UploadInterceptor* interceptor() const { return interceptor_; }
-  scoped_refptr<net::TestURLRequestContextGetter>
-      url_request_context_getter() {
+  scoped_refptr<net::TestURLRequestContextGetter> url_request_context_getter() {
     return url_request_context_getter_;
   }
 
  private:
-  base::MessageLoopForIO message_loop_;
+  base::test::ScopedTaskEnvironment task_environment_{
+      base::test::ScopedTaskEnvironment::MainThreadType::IO};
   scoped_refptr<net::TestURLRequestContextGetter> url_request_context_getter_;
   UploadInterceptor* interceptor_;
   MockTime time_;
diff --git a/chromium/components/domain_reliability/util.cc b/chromium/components/domain_reliability/util.cc
index ece9219f2a5..91d1b42467f 100644
--- a/chromium/components/domain_reliability/util.cc
+++ b/chromium/components/domain_reliability/util.cc
@@ -8,8 +8,8 @@
 
 #include "base/callback.h"
 #include "base/logging.h"
-#include "base/macros.h"
 #include "base/memory/weak_ptr.h"
+#include "base/stl_util.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
 #include "net/base/net_errors.h"
@@ -91,7 +91,7 @@ bool GetDomainReliabilityBeaconStatus(
   }
 
   // TODO(juliatuttle): Consider sorting and using binary search?
-  for (size_t i = 0; i < arraysize(net_error_map); i++) {
+  for (size_t i = 0; i < base::size(net_error_map); i++) {
     if (net_error_map[i].net_error == net_error) {
       *beacon_status_out = net_error_map[i].beacon_status;
       return true;