BASELINE: Update Chromium to 68.0.3440.125

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

1 files changed, 34 insertions, 27 deletions

diff --git a/chromium/third_party/blink/renderer/platform/ukm_time_aggregator_test.cc b/chromium/third_party/blink/renderer/platform/ukm_time_aggregator_test.cc
index 51814e94989..d2c8e2a5d8c 100644
--- a/chromium/third_party/blink/renderer/platform/ukm_time_aggregator_test.cc
+++ b/chromium/third_party/blink/renderer/platform/ukm_time_aggregator_test.cc
@@ -10,6 +10,15 @@
 namespace blink {
 namespace {
 
+// These tests must use metrics defined in ukm.xml
+const char* kEvent = "Blink.UpdateTime";
+const char* kMetric1 = "Compositing";
+const char* kMetric1Average = "Compositing.Average";
+const char* kMetric1WorstCase = "Compositing.WorstCase";
+const char* kMetric2 = "Paint";
+const char* kMetric2Average = "Paint.Average";
+const char* kMetric2WorstCase = "Paint.WorstCase";
+
 struct Timer {
   static double GetTime() { return fake_time; }
   static double fake_time;
@@ -24,8 +33,8 @@ TEST(UkmTimeAggregatorTest, EmptyEventsNotRecorded) {
   ukm::TestUkmRecorder recorder;
   int64_t source_id = ukm::UkmRecorder::GetNewSourceID();
   std::unique_ptr<UkmTimeAggregator> aggregator(
-      new UkmTimeAggregator("event", source_id, &recorder,
-                            {"metric1", "metric2"}, TimeDelta::FromSeconds(1)));
+      new UkmTimeAggregator(kEvent, source_id, &recorder, {kMetric1, kMetric2},
+                            TimeDelta::FromSeconds(1)));
   Timer::fake_time += 10.;
   aggregator.reset();
 
@@ -41,8 +50,8 @@ TEST(UkmTimeAggregatorTest, EventsRecordedPerSecond) {
   ukm::TestUkmRecorder recorder;
   int64_t source_id = ukm::UkmRecorder::GetNewSourceID();
   std::unique_ptr<UkmTimeAggregator> aggregator(
-      new UkmTimeAggregator("event", source_id, &recorder,
-                            {"metric1", "metric2"}, TimeDelta::FromSeconds(1)));
+      new UkmTimeAggregator(kEvent, source_id, &recorder, {kMetric1, kMetric2},
+                            TimeDelta::FromSeconds(1)));
   // Have 100 events 99ms each; if the records are recorded once per second, we
   // should expect 9 records to be recorded while the timer ticks. 0-1, 1-2,
   // ..., 8-9 seconds.
@@ -58,30 +67,28 @@ TEST(UkmTimeAggregatorTest, EventsRecordedPerSecond) {
   aggregator.reset();
 
   EXPECT_EQ(recorder.entries_count(), 10u);
-  auto entries = recorder.GetEntriesByName("event");
+  auto entries = recorder.GetEntriesByName(kEvent);
   EXPECT_EQ(entries.size(), 10u);
 
   for (auto* entry : entries) {
-    EXPECT_TRUE(ukm::TestUkmRecorder::EntryHasMetric(entry, "metric1.Average"));
+    EXPECT_TRUE(ukm::TestUkmRecorder::EntryHasMetric(entry, kMetric1Average));
     const int64_t* metric1_average =
-        ukm::TestUkmRecorder::GetEntryMetric(entry, "metric1.Average");
+        ukm::TestUkmRecorder::GetEntryMetric(entry, kMetric1Average);
     EXPECT_NEAR(*metric1_average / 1e6, 0.099, 0.0001);
 
-    EXPECT_TRUE(
-        ukm::TestUkmRecorder::EntryHasMetric(entry, "metric1.WorstCase"));
+    EXPECT_TRUE(ukm::TestUkmRecorder::EntryHasMetric(entry, kMetric1WorstCase));
     const int64_t* metric1_worst =
-        ukm::TestUkmRecorder::GetEntryMetric(entry, "metric1.WorstCase");
+        ukm::TestUkmRecorder::GetEntryMetric(entry, kMetric1WorstCase);
     EXPECT_NEAR(*metric1_worst / 1e6, 0.099, 0.0001);
 
-    EXPECT_TRUE(ukm::TestUkmRecorder::EntryHasMetric(entry, "metric2.Average"));
+    EXPECT_TRUE(ukm::TestUkmRecorder::EntryHasMetric(entry, kMetric2Average));
     const int64_t* metric2_average =
-        ukm::TestUkmRecorder::GetEntryMetric(entry, "metric2.Average");
+        ukm::TestUkmRecorder::GetEntryMetric(entry, kMetric2Average);
     EXPECT_NEAR(*metric2_average / 1e6, 0.099, 0.0001);
 
-    EXPECT_TRUE(
-        ukm::TestUkmRecorder::EntryHasMetric(entry, "metric2.WorstCase"));
+    EXPECT_TRUE(ukm::TestUkmRecorder::EntryHasMetric(entry, kMetric2WorstCase));
     const int64_t* metric2_worst =
-        ukm::TestUkmRecorder::GetEntryMetric(entry, "metric2.WorstCase");
+        ukm::TestUkmRecorder::GetEntryMetric(entry, kMetric2WorstCase);
     EXPECT_NEAR(*metric2_worst / 1e6, 0.099, 0.0001);
   }
 
@@ -94,9 +101,9 @@ TEST(UkmTimeAggregatorTest, EventsAveragedCorrectly) {
 
   ukm::TestUkmRecorder recorder;
   int64_t source_id = ukm::UkmRecorder::GetNewSourceID();
-  std::unique_ptr<UkmTimeAggregator> aggregator(new UkmTimeAggregator(
-      "event", source_id, &recorder, {"metric1", "metric2"},
-      TimeDelta::FromSeconds(10000)));
+  std::unique_ptr<UkmTimeAggregator> aggregator(
+      new UkmTimeAggregator(kEvent, source_id, &recorder, {kMetric1, kMetric2},
+                            TimeDelta::FromSeconds(10000)));
   // 1, 2, and 3 seconds.
   for (int i = 1; i <= 3; ++i) {
     auto timer = aggregator->GetScopedTimer(0);
@@ -114,31 +121,31 @@ TEST(UkmTimeAggregatorTest, EventsAveragedCorrectly) {
   }
 
   aggregator.reset();
-  auto entries = recorder.GetEntriesByName("event");
+  auto entries = recorder.GetEntriesByName(kEvent);
   EXPECT_EQ(entries.size(), 1u);
   auto* entry = entries[0];
 
-  EXPECT_TRUE(ukm::TestUkmRecorder::EntryHasMetric(entry, "metric1.Average"));
+  EXPECT_TRUE(ukm::TestUkmRecorder::EntryHasMetric(entry, kMetric1Average));
   const int64_t* metric1_average =
-      ukm::TestUkmRecorder::GetEntryMetric(entry, "metric1.Average");
+      ukm::TestUkmRecorder::GetEntryMetric(entry, kMetric1Average);
   // metric1 (1, 2, 3) average is 2
   EXPECT_NEAR(*metric1_average / 1e6, 2.0, 0.0001);
 
-  EXPECT_TRUE(ukm::TestUkmRecorder::EntryHasMetric(entry, "metric1.WorstCase"));
+  EXPECT_TRUE(ukm::TestUkmRecorder::EntryHasMetric(entry, kMetric1WorstCase));
   const int64_t* metric1_worst =
-      ukm::TestUkmRecorder::GetEntryMetric(entry, "metric1.WorstCase");
+      ukm::TestUkmRecorder::GetEntryMetric(entry, kMetric1WorstCase);
   // metric1 (1, 2, 3) worst case is 3
   EXPECT_NEAR(*metric1_worst / 1e6, 3.0, 0.0001);
 
-  EXPECT_TRUE(ukm::TestUkmRecorder::EntryHasMetric(entry, "metric2.Average"));
+  EXPECT_TRUE(ukm::TestUkmRecorder::EntryHasMetric(entry, kMetric2Average));
   const int64_t* metric2_average =
-      ukm::TestUkmRecorder::GetEntryMetric(entry, "metric2.Average");
+      ukm::TestUkmRecorder::GetEntryMetric(entry, kMetric2Average);
   // metric1 (3, 3, 3, 1) average is 2.5
   EXPECT_NEAR(*metric2_average / 1e6, 2.5, 0.0001);
 
-  EXPECT_TRUE(ukm::TestUkmRecorder::EntryHasMetric(entry, "metric2.WorstCase"));
+  EXPECT_TRUE(ukm::TestUkmRecorder::EntryHasMetric(entry, kMetric2WorstCase));
   const int64_t* metric2_worst =
-      ukm::TestUkmRecorder::GetEntryMetric(entry, "metric2.WorstCase");
+      ukm::TestUkmRecorder::GetEntryMetric(entry, kMetric2WorstCase);
   // metric1 (3, 3, 3, 1) worst case is 3
   EXPECT_NEAR(*metric2_worst / 1e6, 3.0, 0.0001);