BASELINE: Update Chromium to 96.0.4664.181

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

6 files changed, 17 insertions, 14 deletions

diff --git a/chromium/components/scheduling_metrics/task_duration_metric_reporter.h b/chromium/components/scheduling_metrics/task_duration_metric_reporter.h
index a48db9edced..df16f3063de 100644
--- a/chromium/components/scheduling_metrics/task_duration_metric_reporter.h
+++ b/chromium/components/scheduling_metrics/task_duration_metric_reporter.h
@@ -37,6 +37,10 @@ class TaskDurationMetricReporter {
             1000 * 1000,
             base::HistogramBase::kUmaTargetedHistogramFlag)) {}
 
+  TaskDurationMetricReporter(const TaskDurationMetricReporter&) = delete;
+  TaskDurationMetricReporter& operator=(const TaskDurationMetricReporter&) =
+      delete;
+
   void RecordTask(TaskClass task_class, base::TimeDelta duration) {
     DCHECK_LT(static_cast<int>(task_class),
               static_cast<int>(TaskClass::kMaxValue) + 1);
@@ -54,8 +58,6 @@ class TaskDurationMetricReporter {
 
  private:
   std::unique_ptr<base::ScaledLinearHistogram> value_per_type_histogram_;
-
-  DISALLOW_COPY_AND_ASSIGN(TaskDurationMetricReporter);
 };
 
 }  // namespace scheduling_metrics
diff --git a/chromium/components/scheduling_metrics/thread_metrics.cc b/chromium/components/scheduling_metrics/thread_metrics.cc
index f84c100559d..21a7fdd7704 100644
--- a/chromium/components/scheduling_metrics/thread_metrics.cc
+++ b/chromium/components/scheduling_metrics/thread_metrics.cc
@@ -11,8 +11,7 @@ namespace {
 // Threshold for discarding ultra-long tasks. It is assumed that ultra-long
 // tasks are reporting glitches (e.g. system falling asleep on the middle of the
 // task).
-constexpr base::TimeDelta kLongTaskDiscardingThreshold =
-    base::TimeDelta::FromSeconds(30);
+constexpr base::TimeDelta kLongTaskDiscardingThreshold = base::Seconds(30);
 
 }  // namespace
 
diff --git a/chromium/components/scheduling_metrics/thread_metrics.h b/chromium/components/scheduling_metrics/thread_metrics.h
index b3fa0965ad3..525d73e92ba 100644
--- a/chromium/components/scheduling_metrics/thread_metrics.h
+++ b/chromium/components/scheduling_metrics/thread_metrics.h
@@ -20,6 +20,10 @@ namespace scheduling_metrics {
 class COMPONENT_EXPORT(SCHEDULING_METRICS) ThreadMetrics {
  public:
   ThreadMetrics(ThreadType thread_type, bool has_cpu_timing_for_each_task);
+
+  ThreadMetrics(const ThreadMetrics&) = delete;
+  ThreadMetrics& operator=(const ThreadMetrics&) = delete;
+
   ~ThreadMetrics();
 
   bool ShouldDiscardTask(
@@ -42,8 +46,6 @@ class COMPONENT_EXPORT(SCHEDULING_METRICS) ThreadMetrics {
   TaskDurationMetricReporter<ThreadType> thread_task_cpu_duration_reporter_;
   TaskDurationMetricReporter<ThreadType> tracked_cpu_duration_reporter_;
   TaskDurationMetricReporter<ThreadType> non_tracked_cpu_duration_reporter_;
-
-  DISALLOW_COPY_AND_ASSIGN(ThreadMetrics);
 };
 
 }  // namespace scheduling_metrics
diff --git a/chromium/components/scheduling_metrics/thread_metrics_unittest.cc b/chromium/components/scheduling_metrics/thread_metrics_unittest.cc
index 987020fdcf9..5ad08d4fbfa 100644
--- a/chromium/components/scheduling_metrics/thread_metrics_unittest.cc
+++ b/chromium/components/scheduling_metrics/thread_metrics_unittest.cc
@@ -20,11 +20,11 @@ using base::sequence_manager::FakeTask;
 using base::sequence_manager::FakeTaskTiming;
 
 base::TimeTicks Seconds(int seconds) {
-  return base::TimeTicks() + base::TimeDelta::FromSeconds(seconds);
+  return base::TimeTicks() + base::Seconds(seconds);
 }
 
 base::ThreadTicks ThreadSeconds(int seconds) {
-  return base::ThreadTicks() + base::TimeDelta::FromSeconds(seconds);
+  return base::ThreadTicks() + base::Seconds(seconds);
 }
 
 }  // namespace
diff --git a/chromium/components/scheduling_metrics/total_duration_metric_reporter.cc b/chromium/components/scheduling_metrics/total_duration_metric_reporter.cc
index 40b66d6e099..8560718e06c 100644
--- a/chromium/components/scheduling_metrics/total_duration_metric_reporter.cc
+++ b/chromium/components/scheduling_metrics/total_duration_metric_reporter.cc
@@ -8,8 +8,8 @@ namespace scheduling_metrics {
 
 namespace {
 
-constexpr base::TimeDelta kMinimalValue = base::TimeDelta::FromSeconds(1);
-constexpr base::TimeDelta kMaximalValue = base::TimeDelta::FromHours(1);
+constexpr base::TimeDelta kMinimalValue = base::Seconds(1);
+constexpr base::TimeDelta kMaximalValue = base::Hours(1);
 constexpr int kBucketCount = 50;
 
 }  // namespace
diff --git a/chromium/components/scheduling_metrics/total_duration_metric_reporter_unittest.cc b/chromium/components/scheduling_metrics/total_duration_metric_reporter_unittest.cc
index 0b99a6d8643..e9175124a77 100644
--- a/chromium/components/scheduling_metrics/total_duration_metric_reporter_unittest.cc
+++ b/chromium/components/scheduling_metrics/total_duration_metric_reporter_unittest.cc
@@ -15,13 +15,13 @@ TEST(TotalDurationMetricReporterTest, Test) {
   TotalDurationMetricReporter metric_reporter("TestHistogram.Positive",
                                               "TestHistogram.Negative");
 
-  metric_reporter.RecordAdditionalDuration(base::TimeDelta::FromSeconds(1));
-  metric_reporter.RecordAdditionalDuration(base::TimeDelta::FromSeconds(2));
-  metric_reporter.RecordAdditionalDuration(base::TimeDelta::FromSeconds(5));
+  metric_reporter.RecordAdditionalDuration(base::Seconds(1));
+  metric_reporter.RecordAdditionalDuration(base::Seconds(2));
+  metric_reporter.RecordAdditionalDuration(base::Seconds(5));
 
   metric_reporter.Reset();
 
-  metric_reporter.RecordAdditionalDuration(base::TimeDelta::FromSeconds(10));
+  metric_reporter.RecordAdditionalDuration(base::Seconds(10));
 
   std::map<base::Histogram::Sample, base::HistogramBase::Count> result;