1 files changed, 15 insertions, 19 deletions

diff --git a/chromium/third_party/blink/renderer/core/frame/local_frame_ukm_aggregator_test.cc b/chromium/third_party/blink/renderer/core/frame/local_frame_ukm_aggregator_test.cc
index 16930532541..a9bef6dfc77 100644
--- a/chromium/third_party/blink/renderer/core/frame/local_frame_ukm_aggregator_test.cc
+++ b/chromium/third_party/blink/renderer/core/frame/local_frame_ukm_aggregator_test.cc
@@ -36,19 +36,15 @@ class LocalFrameUkmAggregatorTest : public testing::Test {
   void ResetAggregator() { aggregator_.reset(); }
 
   std::string GetPrimaryMetricName() {
-    return std::string(
-        LocalFrameUkmAggregator::primary_metric_name().Utf8().data());
+    return LocalFrameUkmAggregator::primary_metric_name().Utf8();
   }
 
   std::string GetMetricName(int index) {
-    return std::string(
-        LocalFrameUkmAggregator::metrics_data()[index].name.Utf8().data());
+    return LocalFrameUkmAggregator::metrics_data()[index].name.Utf8();
   }
 
   std::string GetPercentageMetricName(int index) {
-    return std::string(LocalFrameUkmAggregator::metrics_data()[index]
-                           .name.Utf8()
-                           .data()) +
+    return LocalFrameUkmAggregator::metrics_data()[index].name.Utf8() +
            "Percentage";
   }
 
@@ -104,7 +100,7 @@ TEST_F(LocalFrameUkmAggregatorTest, EmptyEventsNotRecorded) {
     return;
 
   // There is no BeginMainFrame, so no metrics get recorded.
-  test_task_runner_->FastForwardBy(TimeDelta::FromSeconds(10));
+  test_task_runner_->FastForwardBy(base::TimeDelta::FromSeconds(10));
   ResetAggregator();
 
   EXPECT_EQ(recorder().sources_count(), 0u);
@@ -128,7 +124,7 @@ TEST_F(LocalFrameUkmAggregatorTest, FirstFrameIsRecorded) {
     auto timer =
         aggregator().GetScopedTimer(i % LocalFrameUkmAggregator::kCount);
     test_task_runner_->FastForwardBy(
-        TimeDelta::FromMilliseconds(millisecond_for_step));
+        base::TimeDelta::FromMilliseconds(millisecond_for_step));
   }
   aggregator().RecordEndOfFrameMetrics(start_time, Now());
 
@@ -171,10 +167,10 @@ TEST_F(LocalFrameUkmAggregatorTest, EventsRecordedAtIntervals) {
   for (int i = 0; i < LocalFrameUkmAggregator::kCount; ++i) {
     auto timer = aggregator().GetScopedTimer(i);
     test_task_runner_->FastForwardBy(
-        TimeDelta::FromMilliseconds(millisecond_per_step));
+        base::TimeDelta::FromMilliseconds(millisecond_per_step));
   }
   test_task_runner_->FastForwardBy(
-      TimeDelta::FromMilliseconds(millisecond_per_step));
+      base::TimeDelta::FromMilliseconds(millisecond_per_step));
   aggregator().RecordEndOfFrameMetrics(start_time, Now());
 
   // We should have a sample after the very first step, regardless of the
@@ -190,10 +186,10 @@ TEST_F(LocalFrameUkmAggregatorTest, EventsRecordedAtIntervals) {
   for (int i = 0; i < LocalFrameUkmAggregator::kCount; ++i) {
     auto timer = aggregator().GetScopedTimer(i);
     test_task_runner_->FastForwardBy(
-        TimeDelta::FromMilliseconds(millisecond_per_step));
+        base::TimeDelta::FromMilliseconds(millisecond_per_step));
   }
   test_task_runner_->FastForwardBy(
-      TimeDelta::FromMilliseconds(millisecond_per_step));
+      base::TimeDelta::FromMilliseconds(millisecond_per_step));
   aggregator().RecordEndOfFrameMetrics(start_time, Now());
 
   VerifyEntries(1u, millisecond_per_frame, millisecond_per_step,
@@ -207,10 +203,10 @@ TEST_F(LocalFrameUkmAggregatorTest, EventsRecordedAtIntervals) {
   for (int i = 0; i < LocalFrameUkmAggregator::kCount; ++i) {
     auto timer = aggregator().GetScopedTimer(i);
     test_task_runner_->FastForwardBy(
-        TimeDelta::FromMilliseconds(millisecond_per_step));
+        base::TimeDelta::FromMilliseconds(millisecond_per_step));
   }
   test_task_runner_->FastForwardBy(
-      TimeDelta::FromMilliseconds(millisecond_per_step));
+      base::TimeDelta::FromMilliseconds(millisecond_per_step));
   aggregator().RecordEndOfFrameMetrics(start_time, Now());
 
   VerifyEntries(2u, millisecond_per_frame, millisecond_per_step,
@@ -222,10 +218,10 @@ TEST_F(LocalFrameUkmAggregatorTest, EventsRecordedAtIntervals) {
   for (int i = 0; i < LocalFrameUkmAggregator::kCount; ++i) {
     auto timer = aggregator().GetScopedTimer(i);
     test_task_runner_->FastForwardBy(
-        TimeDelta::FromMilliseconds(millisecond_per_step));
+        base::TimeDelta::FromMilliseconds(millisecond_per_step));
   }
   test_task_runner_->FastForwardBy(
-      TimeDelta::FromMilliseconds(millisecond_per_step));
+      base::TimeDelta::FromMilliseconds(millisecond_per_step));
   aggregator().RecordEndOfFrameMetrics(start_time, Now());
 
   // Should be no more samples.
@@ -238,10 +234,10 @@ TEST_F(LocalFrameUkmAggregatorTest, EventsRecordedAtIntervals) {
   for (int i = 0; i < LocalFrameUkmAggregator::kCount; ++i) {
     auto timer = aggregator().GetScopedTimer(i);
     test_task_runner_->FastForwardBy(
-        TimeDelta::FromMilliseconds(millisecond_per_step));
+        base::TimeDelta::FromMilliseconds(millisecond_per_step));
   }
   test_task_runner_->FastForwardBy(
-      TimeDelta::FromMilliseconds(millisecond_per_step));
+      base::TimeDelta::FromMilliseconds(millisecond_per_step));
   aggregator().RecordEndOfFrameMetrics(start_time, Now());
 
   // We should have 3 more events, once for the prior interval and 2 for the