BASELINE: Update Chromium to 73.0.3683.37

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

2 files changed, 10 insertions, 28 deletions

diff --git a/chromium/ui/latency/histograms.h b/chromium/ui/latency/histograms.h
index fba71c12085..3d9545b6207 100644
--- a/chromium/ui/latency/histograms.h
+++ b/chromium/ui/latency/histograms.h
@@ -8,7 +8,7 @@
 #include <array>
 #include <memory>
 
-#include "base/macros.h"
+#include "base/stl_util.h"
 
 namespace ui {
 
@@ -19,7 +19,7 @@ namespace ui {
 // estimate.
 struct PercentileResults {
   static constexpr double kPercentiles[] = {.50, .99};
-  static constexpr size_t kCount = arraysize(kPercentiles);
+  static constexpr size_t kCount = base::size(kPercentiles);
 
   double values[kCount]{};
 };
diff --git a/chromium/ui/latency/latency_tracker.cc b/chromium/ui/latency/latency_tracker.cc
index 415327b5981..88d834645b4 100644
--- a/chromium/ui/latency/latency_tracker.cc
+++ b/chromium/ui/latency/latency_tracker.cc
@@ -195,15 +195,6 @@ void LatencyTracker::ComputeEndToEndLatencyHistograms(
             ".TimeToScrollUpdateSwapBegin4",
         original_timestamp, gpu_swap_begin_timestamp);
 
-    // This is the same metric as above. But due to a change in rebucketing,
-    // UMA pipeline cannot process this for the chirp alerts. Hence adding a
-    // newer version the this metric above. TODO(nzolghadr): Remove it in a
-    // future milesone like M70.
-    UMA_HISTOGRAM_INPUT_LATENCY_HIGH_RESOLUTION_MICROSECONDS(
-        "Event.Latency." + scroll_name + "." + input_modality +
-            ".TimeToScrollUpdateSwapBegin2",
-        original_timestamp, gpu_swap_begin_timestamp);
-
     if (input_modality == "Wheel") {
       RecordUmaEventLatencyScrollWheelTimeToScrollUpdateSwapBegin2Histogram(
           original_timestamp, gpu_swap_begin_timestamp);
@@ -232,15 +223,6 @@ void LatencyTracker::ComputeEndToEndLatencyHistograms(
             ".TimeToScrollUpdateSwapBegin4",
         original_timestamp, gpu_swap_begin_timestamp);
 
-    // This is the same metric as above. But due to a change in rebucketing,
-    // UMA pipeline cannot process this for the chirp alerts. Hence adding a
-    // newer version the this metric above. TODO(nzolghadr): Remove it in a
-    // future milesone like M70.
-    UMA_HISTOGRAM_INPUT_LATENCY_HIGH_RESOLUTION_MICROSECONDS(
-        "Event.Latency." + scroll_name + "." + input_modality +
-            ".TimeToScrollUpdateSwapBegin2",
-        original_timestamp, gpu_swap_begin_timestamp);
-
     if (input_modality == "Wheel") {
       RecordUmaEventLatencyScrollWheelTimeToScrollUpdateSwapBegin2Histogram(
           original_timestamp, gpu_swap_begin_timestamp);
@@ -455,19 +437,19 @@ void LatencyTracker::CalculateAverageLag(
 
       current_lag_report_->lag += pending_finger_move_lag + event_dispatch_lag;
 
-      // When current gpu_swap_time is larger than the |next_report_time_|,
-      // it means the we reach the 1 second gap, and we can filled in the
-      // timestamp and move it to |pending_finished_lag_report_|. We use
-      // the current|gpu_swap_begin_timestamp| as the report_time, so it can
-      // be align with gpu swaps.
-      if (gpu_swap_begin_timestamp >= next_report_time_) {
+      // When the |pending_finished_lag_report_| is finished, and the current
+      // gpu_swap_time is larger than the |next_report_time_|, it means the we
+      // reach the 1 second gap, and we can filled in the timestamp and move it
+      // to |pending_finished_lag_report_|. We use the
+      // current|gpu_swap_begin_timestamp| as the report_time, so it can be
+      // align with gpu swaps.
+      if (!pending_finished_lag_report_ &&
+          gpu_swap_begin_timestamp >= next_report_time_) {
         current_lag_report_->report_time = gpu_swap_begin_timestamp;
         // The next report time is 1 second away from this report time.
         next_report_time_ =
             gpu_swap_begin_timestamp + base::TimeDelta::FromSeconds(1);
-        DCHECK(!pending_finished_lag_report_);
         pending_finished_lag_report_ = std::move(current_lag_report_);
-        DCHECK(!current_lag_report_);
       }
     }
   }